diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a9e90c175..7f4f6c87e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -163,7 +163,7 @@ jobs: # which collapses the wall-clock time from ~1h to that of the slowest single example. build-examples: if: github.event_name == 'pull_request' - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 strategy: fail-fast: false matrix: @@ -196,7 +196,7 @@ jobs: # main: build all examples in release and publish them to GitHub Pages. build-examples-deploy: if: github.event_name == 'push' && github.ref == 'refs/heads/main' - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v7 - uses: ./.github/actions/install-swift diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index df8c589ea..3197f559c 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -213,10 +213,11 @@ public class ExportSwift { func liftParameter(param: Parameter) throws { parameters.append(param) + let escapedName = param.escapedSwiftIdentifier let liftingInfo = try param.type.liftParameterInfo() let argumentsToLift: [String] if liftingInfo.parameters.count == 1 { - argumentsToLift = [param.name] + argumentsToLift = [escapedName] } else { argumentsToLift = liftingInfo.parameters.map { (name, _) in param.name + name.capitalizedFirstLetter } } @@ -227,7 +228,9 @@ public class ExportSwift { switch param.type { case .closure(let signature, _): typeNameForIntrinsic = param.type.swiftType - liftingExpr = ExprSyntax("_BJS_Closure_\(raw: signature.mangleName).bridgeJSLift(\(raw: param.name))") + liftingExpr = ExprSyntax( + "_BJS_Closure_\(raw: signature.mangleName).bridgeJSLift(\(raw: escapedName))" + ) case .swiftStruct(let structName): typeNameForIntrinsic = structName liftingExpr = ExprSyntax("\(raw: structName).bridgeJSLiftParameter()") @@ -252,7 +255,7 @@ public class ExportSwift { ) } - parameterBindings.insert("let \(raw: param.name) = \(liftingExpr)", at: 0) + parameterBindings.insert("let \(raw: param.escapedSwiftBindingIdentifier) = \(liftingExpr)", at: 0) for (name, type) in zip(argumentsToLift, liftingInfo.parameters.map { $0.type }) { abiParameterSignatures.append((name, type)) } @@ -268,14 +271,14 @@ public class ExportSwift { } private func removeFirstLiftedParameter() -> String { - return parameters.removeFirst().name + return parameters.removeFirst().escapedSwiftIdentifier } private func renderCallStatement(callee: ExprSyntax, returnType: BridgeType) -> CodeBlockItemSyntax { let labeledParams = parameters.map { param in LabeledExprSyntax( label: param.label, - expression: DeclReferenceExprSyntax(baseName: .identifier(param.name)) + expression: DeclReferenceExprSyntax(baseName: .identifier(param.escapedSwiftIdentifier)) ) } var callExpr: ExprSyntax = @@ -1439,7 +1442,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 841c0409c..504b955d2 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift @@ -143,7 +143,8 @@ public struct ImportTS { } func lowerParameter(param: Parameter) throws { - if let genericPush = param.type.genericStackPushStatement(value: param.name) { + let escapedName = param.escapedSwiftIdentifier + if let genericPush = param.type.genericStackPushStatement(value: escapedName) { stackLoweringStmts.insert(genericPush, at: 0) return } @@ -153,10 +154,10 @@ public struct ImportTS { switch param.type { case .closure(let signature, useJSTypedClosure: false): let jsTypedClosureType = BridgeType.closure(signature, useJSTypedClosure: true).swiftType - body.write("let \(param.name) = \(jsTypedClosureType)(\(param.name))") + body.write("let \(param.escapedSwiftBindingIdentifier) = \(jsTypedClosureType)(\(escapedName))") // 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(param.name) + valuesToExtendLifetimeDuringCall.append(escapedName) default: break } @@ -177,7 +178,7 @@ public struct ImportTS { if loweringInfo.useBorrowing { let returnVariableName = "ret\(borrowedArguments.count)" let assign = needsReturnVariable ? "let \(returnVariableName) = " : "" - body.write("\(assign)\(param.name).bridgeJSWithLoweredParameter { \(pattern) in") + body.write("\(assign)\(escapedName).bridgeJSWithLoweredParameter { \(pattern) in") body.indent() borrowedArguments.append( BorrowedArgument( @@ -190,10 +191,10 @@ public struct ImportTS { ) } else if case .nullable(.swiftProtocol(let protocolName), _) = param.type, context == .exportSwift { body.write("let \(pattern): (Int32, Int32)") - body.write("if let \(param.name) {") + body.write("if let \(param.escapedSwiftBindingIdentifier) {") body.indent { body.write( - "\(pattern) = (1, _bridgeJSUnwrapProtocolExportable(\(param.name), \"\(protocolName)\").bridgeJSLowerAsProtocolReturn())" + "\(pattern) = (1, _bridgeJSUnwrapProtocolExportable(\(escapedName), \"\(protocolName)\").bridgeJSLowerAsProtocolReturn())" ) } body.write("} else {") @@ -205,10 +206,10 @@ public struct ImportTS { let initializerExpr: ExprSyntax if case .swiftProtocol(let protocolName) = param.type, context == .exportSwift { initializerExpr = ExprSyntax( - "_bridgeJSUnwrapProtocolExportable(\(raw: param.name), \"\(raw: protocolName)\").bridgeJSLowerAsProtocolReturn()" + "_bridgeJSUnwrapProtocolExportable(\(raw: escapedName), \"\(raw: protocolName)\").bridgeJSLowerAsProtocolReturn()" ) } else { - initializerExpr = ExprSyntax("\(raw: param.name).bridgeJSLowerParameter()") + initializerExpr = ExprSyntax("\(raw: escapedName).bridgeJSLowerParameter()") } let binding = loweringInfo.loweredParameters.isEmpty ? "_" : pattern @@ -218,10 +219,10 @@ public struct ImportTS { // 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 + // For single parameter, use the escaped name; for multiple, use constructed name let abiParamName: String if loweringInfo.loweredParameters.count == 1 { - abiParamName = param.name + abiParamName = escapedName } else { abiParamName = "\(param.name)\(paramName.capitalizedFirstLetter)" } @@ -723,20 +724,21 @@ struct SwiftSignatureBuilder { var out = "(" out += parameters.map { param in let label = param.label ?? param.name + let escapedName = param.escapedSwiftIdentifier let paramType = buildParameterTypeSyntax(from: param.type) if useWildcardLabels { // Always use wildcard labels: "_ name: Type" - return "_ \(param.name): \(paramType)" - } else if label == param.name { + return "_ \(escapedName): \(paramType)" + } else if SwiftToSkeleton.normalizeIdentifier(label) == param.name { // External label same as parameter name: "count: Int" - return "\(param.name): \(paramType)" + return "\(escapedName): \(paramType)" } else if param.label == nil { // No label specified: use wildcard "_ name: Type" - return "_ \(param.name): \(paramType)" + return "_ \(escapedName): \(paramType)" } else { // External label differs: "label count: Int" - return "\(label) \(param.name): \(paramType)" + return "\(label) \(escapedName): \(paramType)" } }.joined(separator: ", ") out += ")" @@ -1065,3 +1067,13 @@ extension String { return self.isValidSwiftIdentifier(for: .variableName) ? self : "`\(self)`" } } + +extension Parameter { + var escapedSwiftIdentifier: String { + name == "self" ? name : name.backtickIfNeeded() + } + + var escapedSwiftBindingIdentifier: String { + name.backtickIfNeeded() + } +} diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift index 0f9f79c06..7e075a8af 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift @@ -436,6 +436,21 @@ public final class SwiftToSkeleton { return lookupType(for: attributedType.baseType, errors: &errors) } + // any P + if let existentialType = type.as(SomeOrAnyTypeSyntax.self), + existentialType.someOrAnySpecifier.tokenKind == .keyword(.any) + { + return lookupType(for: existentialType.constraint, errors: &errors) + } + + // (T) + if let tupleType = type.as(TupleTypeSyntax.self), + tupleType.elements.count == 1, + let element = tupleType.elements.first + { + return lookupType(for: element.type, errors: &errors) + } + // JSTypedArray if let identifierType = type.as(IdentifierTypeSyntax.self), identifierType.name.text == "JSTypedArray", @@ -1572,7 +1587,7 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { continue } - let name = param.secondName?.text ?? param.firstName.text + let name = SwiftToSkeleton.normalizeIdentifier(param.secondName?.text ?? param.firstName.text) let label = param.firstName.text let defaultValue: DefaultValue? @@ -1971,6 +1986,14 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { guard let effects = collectEffects(signature: node.signature) else { return .skipChildren } + if effects.isAsync || effects.isThrows { + diagnose( + node: node, + message: "@JS struct initializer cannot be async or throw", + hint: "BridgeJS calls this initializer to rebuild struct values passed from JavaScript" + ) + return .skipChildren + } let structAbiName = exportedStructByName[structKey]?.abiName ?? "unknown" let constructor = ExportedConstructor( diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 7f4ecab03..82150d065 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -346,7 +346,6 @@ public struct BridgeJSLink { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -361,8 +360,6 @@ public struct BridgeJSLink { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) @@ -487,7 +484,7 @@ public struct BridgeJSLink { "let \(JSGlueVariableScope.reservedDecodeString);", "let \(JSGlueVariableScope.reservedDecodeUTF8);", "const \(JSGlueVariableScope.reservedImmortalStrings) = new Map();", - "const \(JSGlueVariableScope.reservedTextDecoder) = new TextDecoder(\"utf-8\");", + "const \(JSGlueVariableScope.reservedTextDecoder) = new TextDecoder(\"utf-8\", { ignoreBOM: true });", "const \(JSGlueVariableScope.reservedTextEncoder) = new TextEncoder(\"utf-8\");", "let \(JSGlueVariableScope.reservedStorageToReturnString);", "let \(JSGlueVariableScope.reservedStorageToReturnBytes);", @@ -785,9 +782,10 @@ public struct BridgeJSLink { printer.indent { printer.write("const Ctor = taCtors[kind];") printer.write("const byteLen = count * Ctor.BYTES_PER_ELEMENT;") + printer.write("const start = ptr >>> 0;") // slice() copies the bytes into a new ArrayBuffer that is properly aligned printer.write( - "const copy = \(JSGlueVariableScope.reservedMemory).buffer.slice(ptr, ptr + byteLen);" + "const copy = \(JSGlueVariableScope.reservedMemory).buffer.slice(start, start + byteLen);" ) printer.write("\(JSGlueVariableScope.reservedTaStack).push(Array.from(new Ctor(copy)));") } @@ -1733,6 +1731,9 @@ public struct BridgeJSLink { class ExportedThunkBuilder { var body: CodeFragmentPrinter var parameterForwardings: [String] = [] + + private var signatureParameters: [(parameter: Parameter, name: String)] = [] + let effects: Effects let scope: JSGlueVariableScope let context: IntrinsicJSFragment.PrintCodeContext @@ -1761,7 +1762,8 @@ public struct BridgeJSLink { loweringFragment.parameters.count == 1, "Lowering fragment should have exactly one parameter to lower" ) - let paramName = scope.variable(param.name) + let paramName = scope.variable(param.escapedJSIdentifier) + signatureParameters.append((param, paramName)) let loweredValues = try loweringFragment.printCode([paramName], context) parameterForwardings.append(contentsOf: loweredValues) } @@ -1770,6 +1772,20 @@ public struct BridgeJSLink { parameterForwardings.append("this.pointer") } + var parameterList: String { + signatureParameters.map { parameter, name in + guard let defaultValue = parameter.defaultValue else { + return name + } + let defaultJs = DefaultValueUtils.format( + defaultValue, + as: .javascript, + resolveTypeName: context.defaultValueTypeName + ) + return "\(name) = \(defaultJs)" + }.joined(separator: ", ") + } + func call(abiName: String, returnType: BridgeType) throws -> String? { if effects.isAsync { return try _call(abiName: abiName, returnType: .jsObject(nil)) @@ -1794,6 +1810,7 @@ public struct BridgeJSLink { body.write("const \(returnVariable) = \(call);") fragmentArguments = [returnVariable] } + body.write(lines: checkExceptionLines()) let liftedValues = try liftingFragment.printCode(fragmentArguments, context) assert(liftedValues.count <= 1, "Lifting fragment should produce at most one value") return liftedValues.first @@ -1803,10 +1820,11 @@ public struct BridgeJSLink { let call = "\(JSGlueVariableScope.reservedInstance).exports.\(abiName)(\(parameterForwardings.joined(separator: ", ")))" body.write("const ret = \(call);") + body.write(lines: checkExceptionLines()) return "ret" } - func checkExceptionLines() -> [String] { + private func checkExceptionLines() -> [String] { guard effects.isThrows else { return [] } @@ -1822,10 +1840,9 @@ public struct BridgeJSLink { ] } - /// Renders the thunk body (body code, exception handling, and optional return) into a printer. + /// Renders the thunk body and optional return; `call`/`callConstructor` put the exception check in `body`. func renderFunctionBody(into printer: CodeFragmentPrinter, returnExpr: String?) { printer.write(contentsOf: body) - printer.write(lines: checkExceptionLines()) if let returnExpr = returnExpr { printer.write("return \(returnExpr);") } @@ -1833,17 +1850,11 @@ public struct BridgeJSLink { func renderFunction( name: String, - parameters: [Parameter], returnExpr: String?, declarationPrefixKeyword: String? ) -> [String] { let printer = CodeFragmentPrinter() - let parameterList = DefaultValueUtils.formatParameterList( - parameters, - resolveTypeName: context.defaultValueTypeName - ) - printer.write( "\(declarationPrefixKeyword.map { "\($0) "} ?? "")\(name)(\(parameterList)) {" ) @@ -1951,11 +1962,15 @@ public struct BridgeJSLink { } else { returnTypeWithEffect = resolveTypeScriptType(returnType) } - let parameterSignatures = parameters.map { param in + return "\(renderTSParameterList(parameters)): \(returnTypeWithEffect)" + } + + private func renderTSParameterList(_ parameters: [Parameter]) -> String { + let parameterSignatures = zip(parameters, parameters.uniqueJSIdentifiers).map { param, name in let optional = param.hasDefault ? "?" : "" - return "\(param.name)\(optional): \(resolveTypeScriptType(param.type))" + return "\(name)\(optional): \(resolveTypeScriptType(param.type))" } - return "(\(parameterSignatures.joined(separator: ", "))): \(returnTypeWithEffect)" + return "(\(parameterSignatures.joined(separator: ", ")))" } private func renderGenericClause(_ genericParameters: [GenericParameter]) -> String { @@ -2065,11 +2080,7 @@ public struct BridgeJSLink { ) let constructorPrinter = CodeFragmentPrinter() - let paramList = DefaultValueUtils.formatParameterList( - constructor.parameters, - resolveTypeName: thunkBuilder.context.defaultValueTypeName - ) - constructorPrinter.write("init: function(\(paramList)) {") + constructorPrinter.write("init: function(\(thunkBuilder.parameterList)) {") constructorPrinter.indent { thunkBuilder.renderFunctionBody(into: constructorPrinter, returnExpr: returnExpr) } @@ -2293,7 +2304,6 @@ extension BridgeJSLink { let returnExpr = try thunkBuilder.call(abiName: function.abiName, returnType: function.returnType) let funcLines = thunkBuilder.renderFunction( name: function.abiName, - parameters: function.parameters, returnExpr: returnExpr, declarationPrefixKeyword: "function" ) @@ -2344,7 +2354,6 @@ extension BridgeJSLink { let funcLines = thunkBuilder.renderFunction( name: function.resolvedJSName, - parameters: function.parameters, returnExpr: returnExpr, declarationPrefixKeyword: "static" ) @@ -2374,11 +2383,7 @@ extension BridgeJSLink { let returnExpr = try thunkBuilder.call(abiName: function.abiName, returnType: function.returnType) let printer = CodeFragmentPrinter() - let parameterList = DefaultValueUtils.formatParameterList( - function.parameters, - resolveTypeName: thunkBuilder.context.defaultValueTypeName - ) - printer.write("\(function.resolvedJSName)(\(parameterList)) {") + printer.write("\(function.resolvedJSName)(\(thunkBuilder.parameterList)) {") printer.indent { thunkBuilder.renderFunctionBody(into: printer, returnExpr: returnExpr) } @@ -2410,7 +2415,6 @@ extension BridgeJSLink { let funcLines = thunkBuilder.renderFunction( name: function.abiName, - parameters: function.parameters, returnExpr: returnExpr, declarationPrefixKeyword: "function" ) @@ -2434,12 +2438,8 @@ extension BridgeJSLink { let returnExpr = try thunkBuilder.call(abiName: method.abiName, returnType: method.returnType) let methodPrinter = CodeFragmentPrinter() - let parameterList = DefaultValueUtils.formatParameterList( - method.parameters, - resolveTypeName: thunkBuilder.context.defaultValueTypeName - ) methodPrinter.write( - "\(method.resolvedJSName): function(\(parameterList)) {" + "\(method.resolvedJSName): function(\(thunkBuilder.parameterList)) {" ) methodPrinter.indent { thunkBuilder.renderFunctionBody(into: methodPrinter, returnExpr: returnExpr) @@ -2489,7 +2489,7 @@ extension BridgeJSLink { returnType: .void ) - propertyPrinter.write("set \(property.resolvedJSName)(value) {") + propertyPrinter.write("set \(property.resolvedJSName)(\(setterThunkBuilder.parameterList)) {") propertyPrinter.indent { setterThunkBuilder.renderFunctionBody(into: propertyPrinter, returnExpr: nil) } @@ -2543,13 +2543,8 @@ extension BridgeJSLink { try thunkBuilder.lowerParameter(param: param) } - let constructorParamList = DefaultValueUtils.formatParameterList( - constructor.parameters, - resolveTypeName: thunkBuilder.context.defaultValueTypeName - ) - jsPrinter.indent { - jsPrinter.write("constructor(\(constructorParamList)) {") + jsPrinter.write("constructor(\(thunkBuilder.parameterList)) {") let returnExpr = thunkBuilder.callConstructor(abiName: constructor.abiName) let constructCall = "\(klass.resolvedJSName).__construct(\(returnExpr))" jsPrinter.indent { @@ -2577,7 +2572,6 @@ extension BridgeJSLink { jsPrinter.write( lines: thunkBuilder.renderFunction( name: method.resolvedJSName, - parameters: method.parameters, returnExpr: returnExpr, declarationPrefixKeyword: "static" ) @@ -2598,7 +2592,6 @@ extension BridgeJSLink { jsPrinter.write( lines: thunkBuilder.renderFunction( name: method.resolvedJSName, - parameters: method.parameters, returnExpr: returnExpr, declarationPrefixKeyword: nil ) @@ -2670,14 +2663,10 @@ extension BridgeJSLink { printer.write("class \(klass.resolvedJSName) {") printer.indent { if let constructor = klass.constructor { - let paramSignatures = constructor.parameters.map { param in - let optional = param.hasDefault ? "?" : "" - return "\(param.name)\(optional): \(resolveTypeScriptType(param.type))" - } printer.write( lines: renderJSDoc(documentation: constructor.documentation, parameters: constructor.parameters) ) - printer.write("constructor(\(paramSignatures.joined(separator: ", ")));") + printer.write("constructor\(renderTSParameterList(constructor.parameters));") } for method in klass.methods.sorted(by: { $0.resolvedJSName < $1.resolvedJSName }) { let staticKeyword = method.effects.isStatic ? "static " : "" @@ -2723,7 +2712,6 @@ extension BridgeJSLink { jsPrinter.write( lines: getterThunkBuilder.renderFunction( name: property.resolvedJSName, - parameters: [], returnExpr: getterReturnExpr, declarationPrefixKeyword: getterKeyword ) @@ -2751,7 +2739,6 @@ extension BridgeJSLink { jsPrinter.write( lines: setterThunkBuilder.renderFunction( name: property.resolvedJSName, - parameters: [.init(label: nil, name: "value", type: property.type)], returnExpr: nil, declarationPrefixKeyword: setterKeyword ) @@ -2826,7 +2813,7 @@ extension BridgeJSLink { message: "Generic codec for '\(name)' was not declared before lifting parameter '\(param.name)'" ) } - let valueVar = scope.variable(param.name) + let valueVar = scope.variable(param.escapedJSIdentifier) let liftExpr = GenericJSCodegen.genericCodecLiftExpression(type: param.type, codec: codecVar) ?? "\(codecVar).lift()" @@ -2839,8 +2826,9 @@ extension BridgeJSLink { if liftingFragment.parameters.count == 0 { valuesToLift = [] } else if liftingFragment.parameters.count == 1 { - parameterNames.append(param.name) - valuesToLift = [scope.variable(param.name)] + let name = scope.variable(param.escapedJSIdentifier) + parameterNames.append(name) + valuesToLift = [name] } else { valuesToLift = liftingFragment.parameters.map { scope.variable(param.name + $0.capitalizedFirstLetter) } parameterNames.append(contentsOf: valuesToLift) @@ -2900,9 +2888,8 @@ extension BridgeJSLink { /// Renders an async import function with resolve/reject closure refs. /// - /// The generated function takes `resolveRef` and `rejectRef` as the first parameters, - /// looks up the resolve/reject closures from memory, and executes the body which - /// chains `.then(resolve, reject)` on the import's returned Promise. + /// The generated function takes `resolveRef` and `rejectRef` as the first parameters + /// and settles them with the result of the import call. private func renderAsyncFunction(name: String?) -> [String] { let printer = CodeFragmentPrinter() let allParams = ["resolveRef", "rejectRef"] + parameterNames @@ -2911,7 +2898,15 @@ extension BridgeJSLink { let s = JSGlueVariableScope.reservedSwift printer.write("const resolve = \(s).memory.getObject(resolveRef);") printer.write("const reject = \(s).memory.getObject(rejectRef);") - printer.write(contentsOf: body) + printer.write("try {") + printer.indent { + printer.write(contentsOf: body) + } + printer.write("} catch (error) {") + printer.indent { + printer.write("reject(error);") + } + printer.write("}") } printer.write("}") return printer.lines @@ -2933,7 +2928,7 @@ extension BridgeJSLink { private func call(callExpr: String) throws { if effects.isAsync { - body.write("\(callExpr).then(resolve, reject);") + body.write("Promise.resolve(\(callExpr)).then(resolve, reject);") return } if let name = returnType.referencedGenericName { @@ -3000,14 +2995,6 @@ extension BridgeJSLink { return try call(calleeExpr: calleeExpr) } - /// Generates an async method call with resolve/reject closure refs. - func callAsyncMethod(name: String) { - let objectExpr = "\(JSGlueVariableScope.reservedSwift).memory.getObject(self)" - let calleeExpr = Self.propertyAccessExpr(objectExpr: objectExpr, propertyName: name) - let callExpr = "\(calleeExpr)(\(parameterForwardings.joined(separator: ", ")))" - body.write("\(callExpr).then(resolve, reject);") - } - func callStaticMethod(on objectExpr: String, name: String) throws { let calleeExpr = Self.propertyAccessExpr(objectExpr: objectExpr, propertyName: name) return try call(calleeExpr: calleeExpr) @@ -3505,7 +3492,6 @@ extension BridgeJSLink { getterPrinter.write("get \(property.resolvedJSName)() {") getterPrinter.indent { getterPrinter.write(contentsOf: getterThunkBuilder.body) - getterPrinter.write(lines: getterThunkBuilder.checkExceptionLines()) if let returnExpr = getterReturnExpr { getterPrinter.write("return \(returnExpr);") } @@ -3529,10 +3515,9 @@ extension BridgeJSLink { ) let setterPrinter = CodeFragmentPrinter() - setterPrinter.write("set \(property.resolvedJSName)(value) {") + setterPrinter.write("set \(property.resolvedJSName)(\(setterThunkBuilder.parameterList)) {") setterPrinter.indent { setterPrinter.write(contentsOf: setterThunkBuilder.body) - setterPrinter.write(lines: setterThunkBuilder.checkExceptionLines()) } setterPrinter.write("},") @@ -4238,7 +4223,7 @@ extension BridgeJSLink { method: ExportedFunction ) throws { let thunkBuilder = ImportedThunkBuilder( - effects: Effects(isAsync: false, isThrows: false), + effects: method.effects, returnType: method.returnType, context: .exportSwift, intrinsicRegistry: intrinsicRegistry @@ -4316,20 +4301,6 @@ enum DefaultValueUtils { .replacingOccurrences(of: "\\", with: "\\\\") .replacingOccurrences(of: "\"", with: "\\\"") } - - /// Generates a JavaScript parameter list with default values - static func formatParameterList( - _ parameters: [Parameter], - resolveTypeName: (BridgeType, OutputFormat) -> String? = { _, _ in nil } - ) -> String { - return parameters.map { param in - if let defaultValue = param.defaultValue { - let defaultJs = format(defaultValue, as: .javascript, resolveTypeName: resolveTypeName) - return "\(param.name) = \(defaultJs)" - } - return param.name - }.joined(separator: ", ") - } } extension BridgeJSLink { @@ -4341,7 +4312,7 @@ extension BridgeJSLink { let resolveTypeName = makeCodecPrintContext(printer: CodeFragmentPrinter()).defaultValueTypeName var tagLines: [String] = [] - for parameter in parameters { + for (parameter, name) in zip(parameters, parameters.uniqueJSIdentifiers) { let docText = parsed.parameter(named: parameter.name) let defaultValue = parameter.defaultValue.map { DefaultValueUtils.format( @@ -4352,11 +4323,11 @@ extension BridgeJSLink { } switch (docText, defaultValue) { case let (.some(text), .some(value)): - tagLines.append("@param \(parameter.name) \(text) (default: \(value))") + tagLines.append("@param \(name) \(text) (default: \(value))") case let (.some(text), .none): - tagLines.append("@param \(parameter.name) \(text)") + tagLines.append("@param \(name) \(text)") case let (.none, .some(value)): - tagLines.append("@param \(parameter.name) - Optional parameter (default: \(value))") + tagLines.append("@param \(name) - Optional parameter (default: \(value))") case (.none, .none): continue } @@ -4481,6 +4452,38 @@ struct BridgeJSLinkError: Error { let message: String } +extension Parameter { + // From: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Lexical_grammar#reserved_words + private static let javaScriptReservedWords: Set = [ + "break", "case", "catch", "class", "const", "continue", "debugger", "default", "delete", "do", "else", + "export", "extends", "false", "finally", "for", "function", "if", "import", "in", "instanceof", "new", + "null", "return", "super", "switch", "this", "throw", "true", "try", "typeof", "var", "void", "while", + "with", "let", "static", "yield", "await", "enum", "implements", "interface", "package", "private", + "protected", "public", "arguments", "eval", + ] + + fileprivate var escapedJSIdentifier: String { + Self.javaScriptReservedWords.contains(name) ? "_\(name)" : name + } +} + +extension [Parameter] { + fileprivate var uniqueJSIdentifiers: [String] { + var names: [String] = [] + for parameter in self { + let escapedName = parameter.escapedJSIdentifier + var name = escapedName + var suffix = 1 + while names.contains(name) { + name = escapedName + suffix.description + suffix += 1 + } + names.append(name) + } + return names + } +} + extension ClosureSignature { fileprivate func renderTSFunctionType(renderType: (BridgeType) -> String) -> String { let renderedParameters = parameters.enumerated().map { index, parameter in diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index 2da07f2be..20f231dc8 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -749,6 +749,27 @@ struct IntrinsicJSFragment: Sendable { private static let jsValueLowerHelperName = "__bjs_jsValueLower" private static let jsValueLiftHelperName = "__bjs_jsValueLift" + private static let jsValueTakeHelperName = "__bjs_jsValueTake" + + /// Mirrors `JavaScriptValueKind` in `_CJavaScriptKit.h`. + private enum JSValueKind: Int, CaseIterable { + case boolean = 0 + case string = 1 + case number = 2 + case object = 3 + case null = 4 + case undefined = 5 + case symbol = 7 + case bigInt = 8 + + /// Whether `payload1` is a reference in `swift.memory`. + var holdsReference: Bool { + switch self { + case .string, .object, .symbol, .bigInt: return true + case .boolean, .number, .null, .undefined: return false + } + } + } private static func registerJSValueHelpers(scope: JSGlueVariableScope) { scope.registerIntrinsic("jsValueHelpers") { helperPrinter in @@ -777,6 +798,20 @@ struct IntrinsicJSFragment: Sendable { helperPrinter.write("return \(resultVar);") } helperPrinter.write("}") + helperPrinter.write("function \(jsValueTakeHelperName)(kind, payload1, payload2) {") + helperPrinter.indent { + helperPrinter.write("const value = \(jsValueLiftHelperName)(kind, payload1, payload2);") + let holdsReference = JSValueKind.allCases.filter(\.holdsReference) + .map { "kind === \($0.rawValue)" } + .joined(separator: " || ") + helperPrinter.write("if (\(holdsReference)) {") + helperPrinter.indent { + helperPrinter.write("\(JSGlueVariableScope.reservedSwift).memory.release(payload1);") + } + helperPrinter.write("}") + helperPrinter.write("return value;") + } + helperPrinter.write("}") } } @@ -792,7 +827,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("let \(payload2Var);") printer.write("if (\(value) === null) {") printer.indent { - printer.write("\(kindVar) = 4;") + printer.write("\(kindVar) = \(JSValueKind.null.rawValue);") printer.write("\(payload1Var) = 0;") printer.write("\(payload2Var) = 0;") } @@ -802,22 +837,22 @@ struct IntrinsicJSFragment: Sendable { printer.indent { printer.write("case \"boolean\":") printer.indent { - printer.write("\(kindVar) = 0;") + printer.write("\(kindVar) = \(JSValueKind.boolean.rawValue);") 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("\(kindVar) = \(JSValueKind.number.rawValue);") printer.write("\(payload1Var) = 0;") printer.write("\(payload2Var) = \(value);") printer.write("break;") } - func emitRetainCase(_ caseName: String, kind: Int) { + func emitRetainCase(_ caseName: String, kind: JSValueKind) { printer.write("case \"\(caseName)\":") printer.indent { - printer.write("\(kindVar) = \(kind);") + printer.write("\(kindVar) = \(kind.rawValue);") printer.write( "\(payload1Var) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(value));" ) @@ -825,18 +860,18 @@ struct IntrinsicJSFragment: Sendable { printer.write("break;") } } - emitRetainCase("string", kind: 1) + emitRetainCase("string", kind: .string) printer.write("case \"undefined\":") printer.indent { - printer.write("\(kindVar) = 5;") + printer.write("\(kindVar) = \(JSValueKind.undefined.rawValue);") printer.write("\(payload1Var) = 0;") printer.write("\(payload2Var) = 0;") printer.write("break;") } - emitRetainCase("object", kind: 3) - emitRetainCase("function", kind: 3) - emitRetainCase("symbol", kind: 7) - emitRetainCase("bigint", kind: 8) + emitRetainCase("object", kind: .object) + emitRetainCase("function", kind: .object) + emitRetainCase("symbol", kind: .symbol) + emitRetainCase("bigint", kind: .bigInt) printer.write("default:") printer.indent { printer.write("throw new TypeError(\"Unsupported JSValue type\");") @@ -874,53 +909,21 @@ struct IntrinsicJSFragment: Sendable { 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;") + for valueKind in JSValueKind.allCases { + let value: String + switch valueKind { + case .boolean: value = "\(payload1) !== 0" + case .number: value = payload2 + case .null: value = "null" + case .undefined: value = "undefined" + case .string, .object, .symbol, .bigInt: + value = "\(JSGlueVariableScope.reservedSwift).memory.getObject(\(payload1))" + } + printer.write("case \(valueKind.rawValue):") + printer.indent { + printer.write("\(resultVar) = \(value);") + printer.write("break;") + } } printer.write("default:") printer.indent { @@ -961,11 +964,12 @@ struct IntrinsicJSFragment: Sendable { let resultVar = scope.variable("jsValue") registerJSValueHelpers(scope: scope) printer.write( - "const \(resultVar) = \(jsValueLiftHelperName)(\(kind), \(payload1), \(payload2));" + "const \(resultVar) = \(jsValueTakeHelperName)(\(kind), \(payload1), \(payload2));" ) return [resultVar] } ) + /// Swift lends the payload reference for the duration of the call, so it is not released here. static let jsValueLiftParameter = IntrinsicJSFragment( parameters: ["kind", "payload1", "payload2"], printCode: { arguments, context in @@ -2232,7 +2236,7 @@ struct IntrinsicJSFragment: Sendable { let resultVar = scope.variable("jsValue") registerJSValueHelpers(scope: scope) printer.write( - "const \(resultVar) = \(jsValueLiftHelperName)(\(kindVar), \(payload1Var), \(payload2Var));" + "const \(resultVar) = \(jsValueTakeHelperName)(\(kindVar), \(payload1Var), \(payload2Var));" ) return [resultVar] } @@ -2586,25 +2590,21 @@ 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, - resolveTypeName: context.defaultValueTypeName + let builder = BridgeJSLink.ExportedThunkBuilder( + effects: method.effects, + context: context ) + builder.body.write( + "\(JSGlueVariableScope.reservedStructHelpers).\(context.scope.helperKey(forTypeNamed: structDef.swiftCallName)).lower(this);" + ) + for param in method.parameters { + try builder.lowerParameter(param: param) + } + let returnExpr = try builder.call(abiName: method.abiName, returnType: method.returnType) printer.write( - "\(instanceVar).\(method.resolvedJSName) = function(\(paramList)) {" + "\(instanceVar).\(method.resolvedJSName) = function(\(builder.parameterList)) {" ) - try printer.indent { - let builder = BridgeJSLink.ExportedThunkBuilder( - effects: method.effects, - context: context - ) - builder.body.write( - "\(JSGlueVariableScope.reservedStructHelpers).\(context.scope.helperKey(forTypeNamed: structDef.swiftCallName)).lower(this);" - ) - for param in method.parameters { - try builder.lowerParameter(param: param) - } - let returnExpr = try builder.call(abiName: method.abiName, returnType: method.returnType) + printer.indent { builder.renderFunctionBody(into: printer, returnExpr: returnExpr) } printer.write("}.bind(\(instanceVar));") diff --git a/Plugins/BridgeJS/Sources/BridgeJSMacros/JSMacroSupport.swift b/Plugins/BridgeJS/Sources/BridgeJSMacros/JSMacroSupport.swift index 224462ddb..c347bfb21 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSMacros/JSMacroSupport.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSMacros/JSMacroSupport.swift @@ -90,8 +90,9 @@ enum JSMacroHelper { static func parameterNames(_ parameters: FunctionParameterListSyntax) -> [String] { parameters.compactMap { param in let nameToken = param.secondName ?? param.firstName - let nameText = nameToken.text - return nameText == "_" ? nil : nameText + guard nameToken.text != "_" else { return nil } + let nameText = stripBackticks(nameToken.text) + return nameText.isValidSwiftIdentifier(for: .variableName) ? nameText : "`\(nameText)`" } } diff --git a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift index 8da9f2e4e..d52e9122d 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift @@ -607,6 +607,7 @@ public protocol BridgeSkeletonVisitor { accessLevel: BridgeJSAccessLevel ) mutating func visitImportedFunction(_ function: ImportedFunctionSkeleton) + mutating func visitProtocolMethod(_ method: ExportedFunction, accessLevel: BridgeJSAccessLevel) } public extension BridgeSkeletonVisitor { @@ -616,6 +617,7 @@ public extension BridgeSkeletonVisitor { accessLevel: BridgeJSAccessLevel ) {} mutating func visitImportedFunction(_ function: ImportedFunctionSkeleton) {} + mutating func visitProtocolMethod(_ method: ExportedFunction, accessLevel: BridgeJSAccessLevel) {} } public struct BridgeSkeletonWalker { @@ -681,6 +683,7 @@ public struct BridgeSkeletonWalker { } for proto in skeleton.protocols { for method in proto.methods { + visitor.visitProtocolMethod(method, accessLevel: currentAccessLevel) walk(method) } for property in proto.properties { @@ -1870,6 +1873,12 @@ public struct ClosureSignatureCollectorVisitor: BridgeSkeletonVisitor { ) } + public mutating func visitProtocolMethod(_ method: ExportedFunction, accessLevel: BridgeJSAccessLevel) { + guard method.effects.isAsync else { return } + + recordInjectedSignatures(forReturnType: method.returnType, accessLevel: accessLevel) + } + private mutating func recordInjectedSignatures( forReturnType returnType: BridgeType, accessLevel: BridgeJSAccessLevel diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/DiagnosticsTests.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/DiagnosticsTests.swift index 580360bb7..aadf04f00 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/DiagnosticsTests.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/DiagnosticsTests.swift @@ -535,6 +535,21 @@ import Testing #expect(skeleton.exported != nil) } + @Test + func throwingStructInitProducesDiagnostic() throws { + let source = """ + @JS struct Point { + var x: Double + + @JS init(x: Double) throws(JSException) { + self.x = x + } + } + """ + let diagnostics = try #require(moduleDiagnostics(source: source)) + #expect(diagnostics.description.contains("@JS struct initializer cannot be async or throw")) + } + @Test func structWithoutExplicitInitSucceeds() throws { let source = """ diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Protocol.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Protocol.swift index bdb700d69..670cb29fc 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Protocol.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Protocol.swift @@ -59,6 +59,10 @@ import JavaScriptKit func createEnum() -> ExampleEnum func handleResult(_ result: Result) func getResult() -> Result + func validate(_ value: Int) throws(JSException) -> Int + func loadLabel(_ key: String) async throws(JSException) -> String + func reset() async throws(JSException) + func fetchCount() async -> Int } @JS class MyViewController { @@ -66,9 +70,9 @@ import JavaScriptKit var delegate: MyViewControllerDelegate @JS - var secondDelegate: MyViewControllerDelegate? + var secondDelegate: (any MyViewControllerDelegate)? - @JS init(delegate: MyViewControllerDelegate) { + @JS init(delegate: any MyViewControllerDelegate) { self.delegate = delegate } @@ -95,6 +99,19 @@ import JavaScriptKit @JS func sendHelper(_ helper: Helper) { delegate.onHelperUpdated(helper) } + + @JS func validateValue(_ value: Int) throws(JSException) -> Int { + return try delegate.validate(value) + } + + @JS func loadLabel(_ key: String) async throws(JSException) -> String { + return try await delegate.loadLabel(key) + } + + @JS func validatedDelegate() throws(JSException) -> MyViewControllerDelegate { + _ = try delegate.validate(0) + return delegate + } } // Protocol array support @@ -103,7 +120,7 @@ import JavaScriptKit var delegates: [MyViewControllerDelegate] @JS - var delegatesByName: [String: MyViewControllerDelegate] + var delegatesByName: [String: any MyViewControllerDelegate] @JS init(delegates: [MyViewControllerDelegate]) { self.delegates = delegates @@ -117,7 +134,7 @@ import JavaScriptKit } } -@JS func processDelegates(_ delegates: [MyViewControllerDelegate]) -> [MyViewControllerDelegate] +@JS func processDelegates(_ delegates: [any MyViewControllerDelegate]) -> [any MyViewControllerDelegate] @JS func processDelegatesByName( _ delegates: [String: MyViewControllerDelegate] diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ProtocolInClosure.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ProtocolInClosure.swift index cb814adf2..660d1a834 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ProtocolInClosure.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ProtocolInClosure.swift @@ -14,5 +14,5 @@ import JavaScriptKit @JS func processRenderable(_ item: Renderable, transform: (Renderable) -> String) -> String @JS func makeRenderableFactory(defaultName: String) -> () -> Renderable -@JS func roundtripRenderable(_ callback: (Renderable) -> Renderable) -> (Renderable) -> Renderable -@JS func processOptionalRenderable(_ callback: (Renderable?) -> String) -> String +@JS func roundtripRenderable(_ callback: (any Renderable) -> any Renderable) -> (any Renderable) -> any Renderable +@JS func processOptionalRenderable(_ callback: ((any Renderable)?) -> String) -> String diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ReservedWordParameters.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ReservedWordParameters.swift new file mode 100644 index 000000000..d17db250d --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ReservedWordParameters.swift @@ -0,0 +1,23 @@ +@JS func check(extension: Int, break: Double, function: Bool, in: String) {} +@JS func checkEscaped(_ `in`: String) {} + +@JS class ReservedWordBox { + @JS init(in: Int) {} + @JS func run(for: Int) {} + @JS static func make(default: Int) -> Int { 0 } +} + +@JS protocol ReservedWordDelegate { + func handle(in: Int, for: String, _ `default`: Bool) +} + +@JSFunction func importedCheck(in: Int, for: String, _ `default`: Bool) throws(JSException) + +@JS func checkEscapedCollision(in: Int, _in: Int) {} +@JS func checkGlueNameCollision(instance: Int, swift: String) {} + +@JS protocol BacktickedLabelDelegate { + func handle(`in`: Int) +} + +@JSFunction func importedSelfClosure(_ `self`: @escaping () -> Void) throws(JSException) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/StringDecoderTests.mjs b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/StringDecoderTests.mjs index 2aa88cf5d..73299ddc0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/StringDecoderTests.mjs +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/StringDecoderTests.mjs @@ -6,7 +6,6 @@ const source = await readFile(process.argv[2] ?? new URL('../__Snapshots__/Bridg const shared = process.argv[3] === 'shared'; const { createInstantiator } = await import(`data:text/javascript;base64,${Buffer.from(source).toString('base64')}`); const encoder = new TextEncoder(); -const decoder = new TextDecoder(); const swift = { memory: { heap: [], retain: (value) => value } }; const bridge = await createInstantiator({ getImports: () => ({}) }, swift); const imports = {}; @@ -35,21 +34,27 @@ function large(value, immortal = false, ptr = 64) { } const values = ['', 'div', 'abcdefgh', 'abcdefghi', 'abcdefghij', 'abcdefé', 'abcdefgé', 'abcdefghé', 'abcdefghié', 'abc€', 'abcdefg€', 'abc😄', 'abcdef😄', 'abcdefg😄', - 'a\0b', '\ufeff', '\ufeffx', 'x\ufeff', '\ufeff\ufeffx', '\ufeffabcdefghijk', - 'abc\ufeffdefghijk', '\ufeff\ufeffabcdefghijk']; -for (const value of values) { - const expected = decoder.decode(encoder.encode(value)); + '😄😄', 'éééé', 'a\0b', '\ufeff', '\ufeffx', '\ufeffabcde', '\ufeffabcdef', + 'x\ufeff', '\ufeff\ufeffx', '\ufeffabcdefghijk', + 'abc\ufeffdefghijk', '\ufeff\ufeffabcdefghijk', + // UTF-8 widths, the surrogate gap, and supplementary-plane boundaries. + '\u0080', '\u07ff', '\u0800', '\ud7ff', '\ue000', '\uffff', '\u{10000}', '\u{10ffff}']; +for (const [index, value] of values.entries()) { if (encoder.encode(value).length <= 8) { words = small(value); - assert.equal(exports.checkString(), expected); + assert.equal(exports.checkString(), value); + } + for (const immortal of [false, true]) { + // Distinct locations keep immortal cache entries faithful to Swift literals. + words = large(value, immortal, 64 + index * 64); + assert.equal(exports.checkString(), value); + assert.equal(exports.checkString(), value); } - words = large(value); - assert.equal(exports.checkString(), expected); } // Alternate full and short inputs: bytes outside count must never leak into the result. for (const value of ['abcd😄', 'é', 'abcde€', '\ufeff', 'abcdefgh', '', 'x\0', '€', '\ufeff\ufeff']) { words = small(value); - assert.equal(exports.checkString(), decoder.decode(encoder.encode(value))); + assert.equal(exports.checkString(), value); } // Every ASCII byte, including NUL, at every small-string length. for (let byte = 0; byte < 128; byte++) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.json index bc443c6c0..40aa34cdf 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.json @@ -230,6 +230,79 @@ } } + }, + { + "abiName" : "bjs_MyViewController_validateValue", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : true + }, + "name" : "validateValue", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + } + ], + "returnType" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + }, + { + "abiName" : "bjs_MyViewController_loadLabel", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : true + }, + "name" : "loadLabel", + "parameters" : [ + { + "label" : "_", + "name" : "key", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_MyViewController_validatedDelegate", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : true + }, + "name" : "validatedDelegate", + "parameters" : [ + + ], + "returnType" : { + "swiftProtocol" : { + "_0" : "MyViewControllerDelegate" + } + } } ], "name" : "MyViewController", @@ -831,6 +904,99 @@ "_0" : "Result" } } + }, + { + "abiName" : "bjs_MyViewControllerDelegate_validate", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : true + }, + "name" : "validate", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + } + ], + "returnType" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + }, + { + "abiName" : "bjs_MyViewControllerDelegate_loadLabel", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : true + }, + "name" : "loadLabel", + "parameters" : [ + { + "label" : "_", + "name" : "key", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_MyViewControllerDelegate_reset", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : true + }, + "name" : "reset", + "parameters" : [ + + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_MyViewControllerDelegate_fetchCount", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : false + }, + "name" : "fetchCount", + "parameters" : [ + + ], + "returnType" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } } ], "name" : "MyViewControllerDelegate", diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift index a91524da5..2f75db462 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift @@ -1,3 +1,250 @@ +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModules7JSValueV_y") +fileprivate func invoke_js_callback_TestModule_10TestModules7JSValueV_y_extern(_ callback: Int32, _ param0Kind: Int32, _ param0Payload1: Int32, _ param0Payload2: Float64) -> Void +#else +fileprivate func invoke_js_callback_TestModule_10TestModules7JSValueV_y_extern(_ callback: Int32, _ param0Kind: Int32, _ param0Payload1: Int32, _ param0Payload2: Float64) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModules7JSValueV_y(_ callback: Int32, _ param0Kind: Int32, _ param0Payload1: Int32, _ param0Payload2: Float64) -> Void { + return invoke_js_callback_TestModule_10TestModules7JSValueV_y_extern(callback, param0Kind, param0Payload1, param0Payload2) +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModules7JSValueV_y") +fileprivate func make_swift_closure_TestModule_10TestModules7JSValueV_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_TestModule_10TestModules7JSValueV_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func make_swift_closure_TestModule_10TestModules7JSValueV_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_TestModule_10TestModules7JSValueV_y_extern(boxPtr, file, line) +} + +private enum _BJS_Closure_10TestModules7JSValueV_y { + static func bridgeJSLift(_ callbackId: Int32) -> (sending JSValue) -> Void { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let (param0Kind, param0Payload1, param0Payload2) = param0.bridgeJSLowerParameter() + let callbackValue = callback.bridgeJSLowerParameter() + invoke_js_callback_TestModule_10TestModules7JSValueV_y(callbackValue, param0Kind, param0Payload1, param0Payload2) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +extension JSTypedClosure where Signature == (sending JSValue) -> Void { + static func sending(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending JSValue) -> Void) -> Self { + Self( + makeClosure: make_swift_closure_TestModule_10TestModules7JSValueV_y, + body: body, + fileID: fileID, + line: line + ) + } +} + +@_expose(wasm, "invoke_swift_closure_TestModule_10TestModules7JSValueV_y") +@_cdecl("invoke_swift_closure_TestModule_10TestModules7JSValueV_y") +public func _invoke_swift_closure_TestModule_10TestModules7JSValueV_y(_ boxPtr: UnsafeMutableRawPointer, _ param0Kind: Int32, _ param0Payload1: Int32, _ param0Payload2: Float64) -> Void { + #if arch(wasm32) + let param0 = JSValue.bridgeJSLiftParameter(param0Kind, param0Payload1, param0Payload2) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending JSValue) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure + closure(param0) + #else + fatalError("Only available on WebAssembly") + #endif +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModulesSS_y") +fileprivate func invoke_js_callback_TestModule_10TestModulesSS_y_extern(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void +#else +fileprivate func invoke_js_callback_TestModule_10TestModulesSS_y_extern(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModulesSS_y(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void { + return invoke_js_callback_TestModule_10TestModulesSS_y_extern(callback, param0Word0, param0Word1, param0Word2) +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModulesSS_y") +fileprivate func make_swift_closure_TestModule_10TestModulesSS_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_TestModule_10TestModulesSS_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func make_swift_closure_TestModule_10TestModulesSS_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_TestModule_10TestModulesSS_y_extern(boxPtr, file, line) +} + +private enum _BJS_Closure_10TestModulesSS_y { + static func bridgeJSLift(_ callbackId: Int32) -> (sending String) -> Void { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + param0.bridgeJSWithLoweredParameter { (param0Word0, param0Word1, param0Word2) in + let callbackValue = callback.bridgeJSLowerParameter() + invoke_js_callback_TestModule_10TestModulesSS_y(callbackValue, param0Word0, param0Word1, param0Word2) + } + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +extension JSTypedClosure where Signature == (sending String) -> Void { + static func sending(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending String) -> Void) -> Self { + Self( + makeClosure: make_swift_closure_TestModule_10TestModulesSS_y, + body: body, + fileID: fileID, + line: line + ) + } +} + +@_expose(wasm, "invoke_swift_closure_TestModule_10TestModulesSS_y") +@_cdecl("invoke_swift_closure_TestModule_10TestModulesSS_y") +public func _invoke_swift_closure_TestModule_10TestModulesSS_y(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { + #if arch(wasm32) + let param0 = String.bridgeJSLiftParameter(param0Bytes, param0Length) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending String) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure + closure(param0) + #else + fatalError("Only available on WebAssembly") + #endif +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModulesSi_y") +fileprivate func invoke_js_callback_TestModule_10TestModulesSi_y_extern(_ callback: Int32, _ param0: Int32) -> Void +#else +fileprivate func invoke_js_callback_TestModule_10TestModulesSi_y_extern(_ callback: Int32, _ param0: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModulesSi_y(_ callback: Int32, _ param0: Int32) -> Void { + return invoke_js_callback_TestModule_10TestModulesSi_y_extern(callback, param0) +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModulesSi_y") +fileprivate func make_swift_closure_TestModule_10TestModulesSi_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_TestModule_10TestModulesSi_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func make_swift_closure_TestModule_10TestModulesSi_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_TestModule_10TestModulesSi_y_extern(boxPtr, file, line) +} + +private enum _BJS_Closure_10TestModulesSi_y { + static func bridgeJSLift(_ callbackId: Int32) -> (sending Int) -> Void { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let param0Value = param0.bridgeJSLowerParameter() + let callbackValue = callback.bridgeJSLowerParameter() + invoke_js_callback_TestModule_10TestModulesSi_y(callbackValue, param0Value) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +extension JSTypedClosure where Signature == (sending Int) -> Void { + static func sending(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending Int) -> Void) -> Self { + Self( + makeClosure: make_swift_closure_TestModule_10TestModulesSi_y, + body: body, + fileID: fileID, + line: line + ) + } +} + +@_expose(wasm, "invoke_swift_closure_TestModule_10TestModulesSi_y") +@_cdecl("invoke_swift_closure_TestModule_10TestModulesSi_y") +public func _invoke_swift_closure_TestModule_10TestModulesSi_y(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Void { + #if arch(wasm32) + let param0 = Int.bridgeJSLiftParameter(param0) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending Int) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure + closure(param0) + #else + fatalError("Only available on WebAssembly") + #endif +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuley_y") +fileprivate func invoke_js_callback_TestModule_10TestModuley_y_extern(_ callback: Int32) -> Void +#else +fileprivate func invoke_js_callback_TestModule_10TestModuley_y_extern(_ callback: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuley_y(_ callback: Int32) -> Void { + return invoke_js_callback_TestModule_10TestModuley_y_extern(callback) +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuley_y") +fileprivate func make_swift_closure_TestModule_10TestModuley_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_TestModule_10TestModuley_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func make_swift_closure_TestModule_10TestModuley_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_TestModule_10TestModuley_y_extern(boxPtr, file, line) +} + +private enum _BJS_Closure_10TestModuley_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_TestModule_10TestModuley_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_TestModule_10TestModuley_y, + body: body, + fileID: fileID, + line: line + ) + } +} + +@_expose(wasm, "invoke_swift_closure_TestModule_10TestModuley_y") +@_cdecl("invoke_swift_closure_TestModule_10TestModuley_y") +public func _invoke_swift_closure_TestModule_10TestModuley_y(_ boxPtr: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let closure = Unmanaged<_BridgeJSTypedClosureBox<() -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure + closure() + #else + fatalError("Only available on WebAssembly") + #endif +} + extension MyViewControllerDelegate where Self: _BridgedSwiftProtocolWrapper { func onSomethingHappened() -> Void { let jsObjectValue = jsObject.bridgeJSLowerParameter() @@ -75,6 +322,39 @@ extension MyViewControllerDelegate where Self: _BridgedSwiftProtocolWrapper { return Result.bridgeJSLiftReturn(ret) } + func validate(_ value: Int) throws(JSException) -> Int { + let valueValue = value.bridgeJSLowerParameter() + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let ret = bjs_MyViewControllerDelegate_validate(jsObjectValue, valueValue) + if let error = _swift_js_take_exception() { throw error } + return Int.bridgeJSLiftReturn(ret) + } + + func loadLabel(_ key: String) async throws(JSException) -> String { + let resolved = try await _bjs_awaitPromise(makeResolveClosure: { JSTypedClosure<(sending String) -> Void>.sending($0) }, makeRejectClosure: { JSTypedClosure<(sending JSValue) -> Void>.sending($0) }) { resolveRef, rejectRef in + key.bridgeJSWithLoweredParameter { (keyWord0, keyWord1, keyWord2) in + let jsObjectValue = jsObject.bridgeJSLowerParameter() + bjs_MyViewControllerDelegate_loadLabel(resolveRef, rejectRef, jsObjectValue, keyWord0, keyWord1, keyWord2) + } + } + return resolved + } + + func reset() async throws(JSException) -> Void { + try await _bjs_awaitPromise(makeResolveClosure: { JSTypedClosure<() -> Void>($0) }, makeRejectClosure: { JSTypedClosure<(sending JSValue) -> Void>.sending($0) }) { resolveRef, rejectRef in + let jsObjectValue = jsObject.bridgeJSLowerParameter() + bjs_MyViewControllerDelegate_reset(resolveRef, rejectRef, jsObjectValue) + } + } + + func fetchCount() async -> Int { + let resolved = try! await _bjs_awaitPromise(makeResolveClosure: { JSTypedClosure<(sending Int) -> Void>.sending($0) }, makeRejectClosure: { JSTypedClosure<(sending JSValue) -> Void>.sending($0) }) { resolveRef, rejectRef in + let jsObjectValue = jsObject.bridgeJSLowerParameter() + bjs_MyViewControllerDelegate_fetchCount(resolveRef, rejectRef, jsObjectValue) + } + return resolved + } + var eventCount: Int { get { let jsObjectValue = jsObject.bridgeJSLowerParameter() @@ -369,6 +649,54 @@ fileprivate func bjs_MyViewControllerDelegate_getResult_extern(_ jsObject: Int32 return bjs_MyViewControllerDelegate_getResult_extern(jsObject) } +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_validate") +fileprivate func bjs_MyViewControllerDelegate_validate_extern(_ jsObject: Int32, _ value: Int32) -> Int32 +#else +fileprivate func bjs_MyViewControllerDelegate_validate_extern(_ jsObject: Int32, _ value: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_MyViewControllerDelegate_validate(_ jsObject: Int32, _ value: Int32) -> Int32 { + return bjs_MyViewControllerDelegate_validate_extern(jsObject, value) +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_loadLabel") +fileprivate func bjs_MyViewControllerDelegate_loadLabel_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ jsObject: Int32, _ keyWord0: Int32, _ keyWord1: Int32, _ keyWord2: Int32) -> Void +#else +fileprivate func bjs_MyViewControllerDelegate_loadLabel_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ jsObject: Int32, _ keyWord0: Int32, _ keyWord1: Int32, _ keyWord2: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_MyViewControllerDelegate_loadLabel(_ resolveRef: Int32, _ rejectRef: Int32, _ jsObject: Int32, _ keyWord0: Int32, _ keyWord1: Int32, _ keyWord2: Int32) -> Void { + return bjs_MyViewControllerDelegate_loadLabel_extern(resolveRef, rejectRef, jsObject, keyWord0, keyWord1, keyWord2) +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_reset") +fileprivate func bjs_MyViewControllerDelegate_reset_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ jsObject: Int32) -> Void +#else +fileprivate func bjs_MyViewControllerDelegate_reset_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ jsObject: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_MyViewControllerDelegate_reset(_ resolveRef: Int32, _ rejectRef: Int32, _ jsObject: Int32) -> Void { + return bjs_MyViewControllerDelegate_reset_extern(resolveRef, rejectRef, jsObject) +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_fetchCount") +fileprivate func bjs_MyViewControllerDelegate_fetchCount_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ jsObject: Int32) -> Void +#else +fileprivate func bjs_MyViewControllerDelegate_fetchCount_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ jsObject: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_MyViewControllerDelegate_fetchCount(_ resolveRef: Int32, _ rejectRef: Int32, _ jsObject: Int32) -> Void { + return bjs_MyViewControllerDelegate_fetchCount_extern(resolveRef, rejectRef, jsObject) +} + #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_eventCount_get") fileprivate func bjs_MyViewControllerDelegate_eventCount_get_extern(_ jsObject: Int32) -> Int32 @@ -888,6 +1216,73 @@ public func _bjs_MyViewController_sendHelper(_ _self: UnsafeMutableRawPointer, _ #endif } +@_expose(wasm, "bjs_MyViewController_validateValue") +@_cdecl("bjs_MyViewController_validateValue") +public func _bjs_MyViewController_validateValue(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Int32 { + #if arch(wasm32) + let value = Int.bridgeJSLiftParameter(value) + let _self = MyViewController.bridgeJSLiftParameter(_self) + do { + let ret = try _self.validateValue(_: value) + 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: error.description) + withExtendedLifetime(jsError.jsObject) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } + return 0 + } + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_MyViewController_loadLabel") +@_cdecl("bjs_MyViewController_loadLabel") +public func _bjs_MyViewController_loadLabel(_ _self: UnsafeMutableRawPointer, _ keyBytes: Int32, _ keyLength: Int32) -> Int32 { + #if arch(wasm32) + let key = String.bridgeJSLiftParameter(keyBytes, keyLength) + let _self = MyViewController.bridgeJSLiftParameter(_self) + return _bjs_makePromise(resolve: Promise_resolve_SS, reject: Promise_reject) { () async throws(JSException) -> String in + return try await _self.loadLabel(_: key) + } + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_MyViewController_validatedDelegate") +@_cdecl("bjs_MyViewController_validatedDelegate") +public func _bjs_MyViewController_validatedDelegate(_ _self: UnsafeMutableRawPointer) -> Int32 { + #if arch(wasm32) + let _self = MyViewController.bridgeJSLiftParameter(_self) + do { + let ret = _bridgeJSUnwrapProtocolExportable(try _self.validatedDelegate(), "MyViewControllerDelegate") + return ret.bridgeJSLowerAsProtocolReturn() + } catch let error { + if let error = error.thrownValue.object { + withExtendedLifetime(error) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } else { + let jsError = JSError(message: error.description) + withExtendedLifetime(jsError.jsObject) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } + return 0 + } + #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 { @@ -1096,6 +1491,49 @@ extension Priority: BridgedSwiftGenericBridgeable { @_spi(BridgeJS) public static let bridgeJSTypeHandle = Priority.bridgeJSMakeTypeHandle() } +@JSFunction func Promise_reject(_ promise: JSObject, _ value: JSValue) throws(JSException) + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "promise_reject_TestModule") +fileprivate func promise_reject_TestModule_extern(_ promise: Int32, _ valueKind: Int32, _ valuePayload1: Int32, _ valuePayload2: Float64) -> Void +#else +fileprivate func promise_reject_TestModule_extern(_ promise: Int32, _ valueKind: Int32, _ valuePayload1: Int32, _ valuePayload2: Float64) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func promise_reject_TestModule(_ promise: Int32, _ valueKind: Int32, _ valuePayload1: Int32, _ valuePayload2: Float64) -> Void { + return promise_reject_TestModule_extern(promise, valueKind, valuePayload1, valuePayload2) +} + +func _$Promise_reject(_ promise: JSObject, _ value: JSValue) throws(JSException) -> Void { + let (valueKind, valuePayload1, valuePayload2) = value.bridgeJSLowerParameter() + let promiseValue = promise.bridgeJSLowerParameter() + promise_reject_TestModule(promiseValue, valueKind, valuePayload1, valuePayload2) + if let error = _swift_js_take_exception() { throw error } +} + +@JSFunction func Promise_resolve_SS(_ promise: JSObject, _ value: String) throws(JSException) + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "promise_resolve_TestModule_SS") +fileprivate func promise_resolve_TestModule_SS_extern(_ promise: Int32, _ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Void +#else +fileprivate func promise_resolve_TestModule_SS_extern(_ promise: Int32, _ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func promise_resolve_TestModule_SS(_ promise: Int32, _ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Void { + return promise_resolve_TestModule_SS_extern(promise, valueWord0, valueWord1, valueWord2) +} + +func _$Promise_resolve_SS(_ promise: JSObject, _ value: String) throws(JSException) -> Void { + value.bridgeJSWithLoweredParameter { (valueWord0, valueWord1, valueWord2) in + let promiseValue = promise.bridgeJSLowerParameter() + promise_resolve_TestModule_SS(promiseValue, valueWord0, valueWord1, valueWord2) + } + if let error = _swift_js_take_exception() { throw error } +} + #if arch(wasm32) @_extern(wasm, module: "bjs", name: "bjs_TestModule_register_type_handles") fileprivate func _bjs_TestModule_register_type_handles_extern(_ base: UnsafePointer?, _ count: Int32) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ReservedWordParameters.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ReservedWordParameters.json new file mode 100644 index 000000000..380de8738 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ReservedWordParameters.json @@ -0,0 +1,459 @@ +{ + "exported" : { + "aliases" : [ + + ], + "classes" : [ + { + "constructor" : { + "abiName" : "bjs_ReservedWordBox_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "in", + "name" : "in", + "type" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + } + ] + }, + "methods" : [ + { + "abiName" : "bjs_ReservedWordBox_run", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "run", + "parameters" : [ + { + "label" : "for", + "name" : "for", + "type" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_ReservedWordBox_static_make", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "make", + "parameters" : [ + { + "label" : "default", + "name" : "default", + "type" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + } + ], + "returnType" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + }, + "staticContext" : { + "className" : { + "_0" : "ReservedWordBox" + } + } + } + ], + "name" : "ReservedWordBox", + "properties" : [ + + ], + "swiftCallName" : "ReservedWordBox" + } + ], + "enums" : [ + + ], + "exposeToGlobal" : false, + "functions" : [ + { + "abiName" : "bjs_check", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "check", + "parameters" : [ + { + "label" : "extension", + "name" : "extension", + "type" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + }, + { + "label" : "break", + "name" : "break", + "type" : { + "double" : { + + } + } + }, + { + "label" : "function", + "name" : "function", + "type" : { + "bool" : { + + } + } + }, + { + "label" : "in", + "name" : "in", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_checkEscaped", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "checkEscaped", + "parameters" : [ + { + "label" : "_", + "name" : "in", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_checkEscapedCollision", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "checkEscapedCollision", + "parameters" : [ + { + "label" : "in", + "name" : "in", + "type" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + }, + { + "label" : "_in", + "name" : "_in", + "type" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_checkGlueNameCollision", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "checkGlueNameCollision", + "parameters" : [ + { + "label" : "instance", + "name" : "instance", + "type" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + }, + { + "label" : "swift", + "name" : "swift", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + } + ], + "protocols" : [ + { + "methods" : [ + { + "abiName" : "bjs_ReservedWordDelegate_handle", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "handle", + "parameters" : [ + { + "label" : "in", + "name" : "in", + "type" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + }, + { + "label" : "for", + "name" : "for", + "type" : { + "string" : { + + } + } + }, + { + "label" : "_", + "name" : "default", + "type" : { + "bool" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + } + ], + "name" : "ReservedWordDelegate", + "properties" : [ + + ] + }, + { + "methods" : [ + { + "abiName" : "bjs_BacktickedLabelDelegate_handle", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "handle", + "parameters" : [ + { + "label" : "`in`", + "name" : "in", + "type" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + } + ], + "returnType" : { + "void" : { + + } + } + } + ], + "name" : "BacktickedLabelDelegate", + "properties" : [ + + ] + } + ], + "structs" : [ + + ] + }, + "imported" : { + "children" : [ + { + "functions" : [ + { + "accessLevel" : "internal", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : true + }, + "name" : "importedCheck", + "parameters" : [ + { + "name" : "in", + "type" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + }, + { + "name" : "for", + "type" : { + "string" : { + + } + } + }, + { + "name" : "default", + "type" : { + "bool" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "accessLevel" : "internal", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : true + }, + "name" : "importedSelfClosure", + "parameters" : [ + { + "name" : "self", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModuley_y", + "moduleName" : "TestModule", + "parameters" : [ + + ], + "returnType" : { + "void" : { + + } + }, + "sendingParameters" : false + }, + "useJSTypedClosure" : false + } + } + } + ], + "returnType" : { + "void" : { + + } + } + } + ], + "types" : [ + + ] + } + ] + }, + "moduleName" : "TestModule", + "usedExternalModules" : [ + + ] +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ReservedWordParameters.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ReservedWordParameters.swift new file mode 100644 index 000000000..51b65629f --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ReservedWordParameters.swift @@ -0,0 +1,280 @@ +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuley_y") +fileprivate func invoke_js_callback_TestModule_10TestModuley_y_extern(_ callback: Int32) -> Void +#else +fileprivate func invoke_js_callback_TestModule_10TestModuley_y_extern(_ callback: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuley_y(_ callback: Int32) -> Void { + return invoke_js_callback_TestModule_10TestModuley_y_extern(callback) +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuley_y") +fileprivate func make_swift_closure_TestModule_10TestModuley_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_TestModule_10TestModuley_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func make_swift_closure_TestModule_10TestModuley_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_TestModule_10TestModuley_y_extern(boxPtr, file, line) +} + +private enum _BJS_Closure_10TestModuley_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_TestModule_10TestModuley_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_TestModule_10TestModuley_y, + body: body, + fileID: fileID, + line: line + ) + } +} + +@_expose(wasm, "invoke_swift_closure_TestModule_10TestModuley_y") +@_cdecl("invoke_swift_closure_TestModule_10TestModuley_y") +public func _invoke_swift_closure_TestModule_10TestModuley_y(_ boxPtr: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let closure = Unmanaged<_BridgeJSTypedClosureBox<() -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure + closure() + #else + fatalError("Only available on WebAssembly") + #endif +} + +extension ReservedWordDelegate where Self: _BridgedSwiftProtocolWrapper { + func handle(`in`: Int, `for`: String, _ `default`: Bool) -> Void { + `for`.bridgeJSWithLoweredParameter { (forWord0, forWord1, forWord2) in + let defaultValue = `default`.bridgeJSLowerParameter() + let inValue = `in`.bridgeJSLowerParameter() + let jsObjectValue = jsObject.bridgeJSLowerParameter() + bjs_ReservedWordDelegate_handle(jsObjectValue, inValue, forWord0, forWord1, forWord2, defaultValue) + } + } +} + +struct AnyReservedWordDelegate: ReservedWordDelegate, _BridgedSwiftProtocolWrapper { + let jsObject: JSObject + + static func bridgeJSLiftParameter(_ value: Int32) -> Self { + return AnyReservedWordDelegate(jsObject: JSObject(id: UInt32(bitPattern: value))) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_ReservedWordDelegate_handle") +fileprivate func bjs_ReservedWordDelegate_handle_extern(_ jsObject: Int32, _ `in`: Int32, _ forWord0: Int32, _ forWord1: Int32, _ forWord2: Int32, _ `default`: Int32) -> Void +#else +fileprivate func bjs_ReservedWordDelegate_handle_extern(_ jsObject: Int32, _ `in`: Int32, _ forWord0: Int32, _ forWord1: Int32, _ forWord2: Int32, _ `default`: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_ReservedWordDelegate_handle(_ jsObject: Int32, _ `in`: Int32, _ forWord0: Int32, _ forWord1: Int32, _ forWord2: Int32, _ `default`: Int32) -> Void { + return bjs_ReservedWordDelegate_handle_extern(jsObject, `in`, forWord0, forWord1, forWord2, `default`) +} + +extension BacktickedLabelDelegate where Self: _BridgedSwiftProtocolWrapper { + func handle(`in`: Int) -> Void { + let inValue = `in`.bridgeJSLowerParameter() + let jsObjectValue = jsObject.bridgeJSLowerParameter() + bjs_BacktickedLabelDelegate_handle(jsObjectValue, inValue) + } +} + +struct AnyBacktickedLabelDelegate: BacktickedLabelDelegate, _BridgedSwiftProtocolWrapper { + let jsObject: JSObject + + static func bridgeJSLiftParameter(_ value: Int32) -> Self { + return AnyBacktickedLabelDelegate(jsObject: JSObject(id: UInt32(bitPattern: value))) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_BacktickedLabelDelegate_handle") +fileprivate func bjs_BacktickedLabelDelegate_handle_extern(_ jsObject: Int32, _ `in`: Int32) -> Void +#else +fileprivate func bjs_BacktickedLabelDelegate_handle_extern(_ jsObject: Int32, _ `in`: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_BacktickedLabelDelegate_handle(_ jsObject: Int32, _ `in`: Int32) -> Void { + return bjs_BacktickedLabelDelegate_handle_extern(jsObject, `in`) +} + +@_expose(wasm, "bjs_check") +@_cdecl("bjs_check") +public func _bjs_check(_ `extension`: Int32, _ `break`: Float64, _ function: Int32, _ inBytes: Int32, _ inLength: Int32) -> Void { + #if arch(wasm32) + let `in` = String.bridgeJSLiftParameter(inBytes, inLength) + let function = Bool.bridgeJSLiftParameter(function) + let `break` = Double.bridgeJSLiftParameter(`break`) + let `extension` = Int.bridgeJSLiftParameter(`extension`) + check(extension: `extension`, break: `break`, function: function, in: `in`) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_checkEscaped") +@_cdecl("bjs_checkEscaped") +public func _bjs_checkEscaped(_ inBytes: Int32, _ inLength: Int32) -> Void { + #if arch(wasm32) + let `in` = String.bridgeJSLiftParameter(inBytes, inLength) + checkEscaped(_: `in`) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_checkEscapedCollision") +@_cdecl("bjs_checkEscapedCollision") +public func _bjs_checkEscapedCollision(_ `in`: Int32, _ _in: Int32) -> Void { + #if arch(wasm32) + let _in = Int.bridgeJSLiftParameter(_in) + let `in` = Int.bridgeJSLiftParameter(`in`) + checkEscapedCollision(in: `in`, _in: _in) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_checkGlueNameCollision") +@_cdecl("bjs_checkGlueNameCollision") +public func _bjs_checkGlueNameCollision(_ instance: Int32, _ swiftBytes: Int32, _ swiftLength: Int32) -> Void { + #if arch(wasm32) + let swift = String.bridgeJSLiftParameter(swiftBytes, swiftLength) + let instance = Int.bridgeJSLiftParameter(instance) + checkGlueNameCollision(instance: instance, swift: swift) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ReservedWordBox_init") +@_cdecl("bjs_ReservedWordBox_init") +public func _bjs_ReservedWordBox_init(_ `in`: Int32) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let `in` = Int.bridgeJSLiftParameter(`in`) + let ret = ReservedWordBox(in: `in`) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ReservedWordBox_run") +@_cdecl("bjs_ReservedWordBox_run") +public func _bjs_ReservedWordBox_run(_ _self: UnsafeMutableRawPointer, _ `for`: Int32) -> Void { + #if arch(wasm32) + let `for` = Int.bridgeJSLiftParameter(`for`) + let _self = ReservedWordBox.bridgeJSLiftParameter(_self) + _self.run(for: `for`) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ReservedWordBox_static_make") +@_cdecl("bjs_ReservedWordBox_static_make") +public func _bjs_ReservedWordBox_static_make(_ `default`: Int32) -> Int32 { + #if arch(wasm32) + let `default` = Int.bridgeJSLiftParameter(`default`) + let ret = ReservedWordBox.make(default: `default`) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ReservedWordBox_deinit") +@_cdecl("bjs_ReservedWordBox_deinit") +public func _bjs_ReservedWordBox_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif +} + +extension ReservedWordBox: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable { + var jsValue: JSValue { + return .object(JSObject(id: UInt32(bitPattern: _bjs_ReservedWordBox_wrap(Unmanaged.passRetained(self).toOpaque())))) + } + consuming func bridgeJSLowerAsProtocolReturn() -> Int32 { + _bjs_ReservedWordBox_wrap(Unmanaged.passRetained(self).toOpaque()) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_ReservedWordBox_wrap") +fileprivate func _bjs_ReservedWordBox_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_ReservedWordBox_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func _bjs_ReservedWordBox_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_ReservedWordBox_wrap_extern(pointer) +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_importedCheck") +fileprivate func bjs_importedCheck_extern(_ `in`: Int32, _ forWord0: Int32, _ forWord1: Int32, _ forWord2: Int32, _ `default`: Int32) -> Void +#else +fileprivate func bjs_importedCheck_extern(_ `in`: Int32, _ forWord0: Int32, _ forWord1: Int32, _ forWord2: Int32, _ `default`: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_importedCheck(_ `in`: Int32, _ forWord0: Int32, _ forWord1: Int32, _ forWord2: Int32, _ `default`: Int32) -> Void { + return bjs_importedCheck_extern(`in`, forWord0, forWord1, forWord2, `default`) +} + +func _$importedCheck(_ `in`: Int, _ `for`: String, _ `default`: Bool) throws(JSException) -> Void { + `for`.bridgeJSWithLoweredParameter { (forWord0, forWord1, forWord2) in + let defaultValue = `default`.bridgeJSLowerParameter() + let inValue = `in`.bridgeJSLowerParameter() + bjs_importedCheck(inValue, forWord0, forWord1, forWord2, defaultValue) + } + if let error = _swift_js_take_exception() { + throw error + } +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_importedSelfClosure") +fileprivate func bjs_importedSelfClosure_extern(_ self: Int32) -> Void +#else +fileprivate func bjs_importedSelfClosure_extern(_ self: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_importedSelfClosure(_ self: Int32) -> Void { + return bjs_importedSelfClosure_extern(self) +} + +func _$importedSelfClosure(_ self: @escaping () -> Void) throws(JSException) -> Void { + let `self` = JSTypedClosure<() -> Void>(self) + let selfFuncRef = self.bridgeJSLowerParameter() + withExtendedLifetime((self)) { + bjs_importedSelfClosure(selfFuncRef) + } + if let error = _swift_js_take_exception() { + throw error + } +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Alias.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Alias.js index 422e26dd9..dafac12d3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Alias.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Alias.js @@ -17,7 +17,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -267,7 +267,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); return jsValue; }, }, @@ -361,6 +361,13 @@ export async function createInstantiator(options, swift) { } return jsValue; } + function __bjs_jsValueTake(kind, payload1, payload2) { + const value = __bjs_jsValueLift(kind, payload1, payload2); + if (kind === 1 || kind === 3 || kind === 7 || kind === 8) { + swift.memory.release(payload1); + } + return value; + } const __bjs_codec_M10TestModuleT16PolygonReference = { lower: (v) => { @@ -498,7 +505,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -706,7 +714,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -721,8 +728,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AliasInClosure.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AliasInClosure.js index 5a7dc255e..4793a3d48 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AliasInClosure.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AliasInClosure.js @@ -11,7 +11,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -130,7 +130,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -318,7 +319,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -333,8 +333,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js index bb61c4fb5..1e46aa559 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js @@ -24,7 +24,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -274,7 +274,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); return jsValue; }, }, @@ -368,6 +368,13 @@ export async function createInstantiator(options, swift) { } return jsValue; } + function __bjs_jsValueTake(kind, payload1, payload2) { + const value = __bjs_jsValueLift(kind, payload1, payload2); + if (kind === 1 || kind === 3 || kind === 7 || kind === 8) { + swift.memory.release(payload1); + } + return value; + } const __bjs_codec_Array_Int = __bjs_arrayCodec(__bjs_primitiveCodecs.Int); const __bjs_codec_Array_String = __bjs_arrayCodec(__bjs_stringCodec); @@ -561,7 +568,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["swift_js_struct_lower_Point"] = function(objectId) { @@ -768,7 +776,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -783,8 +790,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.js index b657a2188..ab64ccfa0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.js @@ -21,7 +21,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -271,7 +271,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); return jsValue; }, }, @@ -365,6 +365,13 @@ export async function createInstantiator(options, swift) { } return jsValue; } + function __bjs_jsValueTake(kind, payload1, payload2) { + const value = __bjs_jsValueLift(kind, payload1, payload2); + if (kind === 1 || kind === 3 || kind === 7 || kind === 8) { + swift.memory.release(payload1); + } + return value; + } const __bjs_codec_M10TestModuleT10AsyncPoint = { lower: (v) => { @@ -473,7 +480,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["swift_js_struct_lower_AsyncPoint"] = function(objectId) { @@ -752,7 +760,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -767,8 +774,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) @@ -947,26 +952,26 @@ export async function createInstantiator(options, swift) { asyncRoundTripStructThrows: function bjs_asyncRoundTripStructThrows(v) { structHelpers.M10TestModuleT10AsyncPoint.lower(v); const ret = instance.exports.bjs_asyncRoundTripStructThrows(); - 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; } + const ret1 = swift.memory.getObject(ret); + swift.memory.release(ret); return ret1; }, asyncThrowsZeroArg: function bjs_asyncThrowsZeroArg() { const ret = instance.exports.bjs_asyncThrowsZeroArg(); - 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; } + const ret1 = swift.memory.getObject(ret); + swift.memory.release(ret); return ret1; }, asyncCombineStructs: function bjs_asyncCombineStructs(a, b) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AsyncAssociatedValueEnum.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AsyncAssociatedValueEnum.js index d16d071b7..3e1483580 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AsyncAssociatedValueEnum.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AsyncAssociatedValueEnum.js @@ -18,7 +18,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -128,6 +128,13 @@ export async function createInstantiator(options, swift) { } return jsValue; } + function __bjs_jsValueTake(kind, payload1, payload2) { + const value = __bjs_jsValueLift(kind, payload1, payload2); + if (kind === 1 || kind === 3 || kind === 7 || kind === 8) { + swift.memory.release(payload1); + } + return value; + } const __bjs_createEnumHelpers_M10TestModuleT18AsyncPayloadResult = () => ({ lower: (value) => { @@ -238,7 +245,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -398,7 +406,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -413,8 +420,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AsyncImport.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AsyncImport.js index cc7b29f42..7e6c1e2c4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AsyncImport.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AsyncImport.js @@ -11,7 +11,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -121,6 +121,13 @@ export async function createInstantiator(options, swift) { } return jsValue; } + function __bjs_jsValueTake(kind, payload1, payload2) { + const value = __bjs_jsValueLift(kind, payload1, payload2); + if (kind === 1 || kind === 3 || kind === 7 || kind === 8) { + swift.memory.release(payload1); + } + return value; + } const swiftClosureRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => { if (state.unregistered) { return; } @@ -220,7 +227,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -474,33 +482,57 @@ export async function createInstantiator(options, swift) { TestModule["bjs_asyncReturnVoid"] = function bjs_asyncReturnVoid(resolveRef, rejectRef) { const resolve = swift.memory.getObject(resolveRef); const reject = swift.memory.getObject(rejectRef); - imports.asyncReturnVoid().then(resolve, reject); + try { + Promise.resolve(imports.asyncReturnVoid()).then(resolve, reject); + } catch (error) { + reject(error); + } } TestModule["bjs_asyncRoundTripInt"] = function bjs_asyncRoundTripInt(resolveRef, rejectRef, v) { const resolve = swift.memory.getObject(resolveRef); const reject = swift.memory.getObject(rejectRef); - imports.asyncRoundTripInt(v).then(resolve, reject); + try { + Promise.resolve(imports.asyncRoundTripInt(v)).then(resolve, reject); + } catch (error) { + reject(error); + } } TestModule["bjs_asyncRoundTripString"] = function bjs_asyncRoundTripString(resolveRef, rejectRef, vWord0, vWord1, vWord2) { const resolve = swift.memory.getObject(resolveRef); const reject = swift.memory.getObject(rejectRef); - const string = decodeString(vWord0, vWord1, vWord2); - imports.asyncRoundTripString(string).then(resolve, reject); + try { + const string = decodeString(vWord0, vWord1, vWord2); + Promise.resolve(imports.asyncRoundTripString(string)).then(resolve, reject); + } catch (error) { + reject(error); + } } TestModule["bjs_asyncRoundTripBool"] = function bjs_asyncRoundTripBool(resolveRef, rejectRef, v) { const resolve = swift.memory.getObject(resolveRef); const reject = swift.memory.getObject(rejectRef); - imports.asyncRoundTripBool(v !== 0).then(resolve, reject); + try { + Promise.resolve(imports.asyncRoundTripBool(v !== 0)).then(resolve, reject); + } catch (error) { + reject(error); + } } TestModule["bjs_asyncRoundTripDouble"] = function bjs_asyncRoundTripDouble(resolveRef, rejectRef, v) { const resolve = swift.memory.getObject(resolveRef); const reject = swift.memory.getObject(rejectRef); - imports.asyncRoundTripDouble(v).then(resolve, reject); + try { + Promise.resolve(imports.asyncRoundTripDouble(v)).then(resolve, reject); + } catch (error) { + reject(error); + } } TestModule["bjs_asyncRoundTripJSObject"] = function bjs_asyncRoundTripJSObject(resolveRef, rejectRef, v) { const resolve = swift.memory.getObject(resolveRef); const reject = swift.memory.getObject(rejectRef); - imports.asyncRoundTripJSObject(swift.memory.getObject(v)).then(resolve, reject); + try { + Promise.resolve(imports.asyncRoundTripJSObject(swift.memory.getObject(v))).then(resolve, reject); + } catch (error) { + reject(error); + } } }, setInstance: (i) => { @@ -530,7 +562,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -545,8 +576,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AsyncStaticImport.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AsyncStaticImport.js index 406c5da24..0b854158d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AsyncStaticImport.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AsyncStaticImport.js @@ -11,7 +11,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -121,6 +121,13 @@ export async function createInstantiator(options, swift) { } return jsValue; } + function __bjs_jsValueTake(kind, payload1, payload2) { + const value = __bjs_jsValueLift(kind, payload1, payload2); + if (kind === 1 || kind === 3 || kind === 7 || kind === 8) { + swift.memory.release(payload1); + } + return value; + } const swiftClosureRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => { if (state.unregistered) { return; } @@ -220,7 +227,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -391,12 +399,20 @@ export async function createInstantiator(options, swift) { TestModule["bjs_AsyncBox_asyncStaticRoundTrip_static"] = function bjs_AsyncBox_asyncStaticRoundTrip_static(resolveRef, rejectRef, v) { const resolve = swift.memory.getObject(resolveRef); const reject = swift.memory.getObject(rejectRef); - imports.AsyncBox.asyncStaticRoundTrip(v).then(resolve, reject); + try { + Promise.resolve(imports.AsyncBox.asyncStaticRoundTrip(v)).then(resolve, reject); + } catch (error) { + reject(error); + } } TestModule["bjs_AsyncBox_asyncStaticVoid_static"] = function bjs_AsyncBox_asyncStaticVoid_static(resolveRef, rejectRef) { const resolve = swift.memory.getObject(resolveRef); const reject = swift.memory.getObject(rejectRef); - imports.AsyncBox.asyncStaticVoid().then(resolve, reject); + try { + Promise.resolve(imports.AsyncBox.asyncStaticVoid()).then(resolve, reject); + } catch (error) { + reject(error); + } } }, setInstance: (i) => { @@ -426,7 +442,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -441,8 +456,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ClassWithNestedTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ClassWithNestedTypes.js index 3d0a66cc3..08cab592c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ClassWithNestedTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ClassWithNestedTypes.js @@ -16,7 +16,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -122,7 +122,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["swift_js_struct_lower_Account_Credentials"] = function(objectId) { @@ -267,7 +268,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -282,8 +282,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js index 35417c66b..f8a62adb1 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js @@ -17,7 +17,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -267,7 +267,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); return jsValue; }, }, @@ -361,6 +361,13 @@ export async function createInstantiator(options, swift) { } return jsValue; } + function __bjs_jsValueTake(kind, payload1, payload2) { + const value = __bjs_jsValueLift(kind, payload1, payload2); + if (kind === 1 || kind === 3 || kind === 7 || kind === 8) { + swift.memory.release(payload1); + } + return value; + } const __bjs_codec_M10TestModuleT6Config = { lower: (v) => { @@ -485,7 +492,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["swift_js_struct_lower_Config"] = function(objectId) { @@ -645,7 +653,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -660,8 +667,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js index 1b796f0de..6e763b743 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js @@ -11,7 +11,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -261,7 +261,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); return jsValue; }, }, @@ -355,6 +355,13 @@ export async function createInstantiator(options, swift) { } return jsValue; } + function __bjs_jsValueTake(kind, payload1, payload2) { + const value = __bjs_jsValueLift(kind, payload1, payload2); + if (kind === 1 || kind === 3 || kind === 7 || kind === 8) { + swift.memory.release(payload1); + } + return value; + } const __bjs_codec_Dict_Int = __bjs_dictCodec(__bjs_primitiveCodecs.Int); const __bjs_codec_Dict_String = __bjs_dictCodec(__bjs_stringCodec); @@ -465,7 +472,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["swift_js_struct_lower_Counters"] = function(objectId) { @@ -620,7 +628,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -635,8 +642,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DocComments.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DocComments.js index 0dae550a8..aa3ac20c9 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DocComments.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DocComments.js @@ -17,7 +17,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -122,7 +122,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["swift_js_struct_lower_Point"] = function(objectId) { @@ -284,7 +285,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -299,8 +299,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAlias.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAlias.js index 897f9e772..00725576a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAlias.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAlias.js @@ -11,7 +11,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -105,7 +105,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -243,7 +244,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -258,8 +258,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js index afe2e8ac7..3369c92f9 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js @@ -92,7 +92,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -342,7 +342,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); return jsValue; }, }, @@ -436,6 +436,13 @@ export async function createInstantiator(options, swift) { } return jsValue; } + function __bjs_jsValueTake(kind, payload1, payload2) { + const value = __bjs_jsValueLift(kind, payload1, payload2); + if (kind === 1 || kind === 3 || kind === 7 || kind === 8) { + swift.memory.release(payload1); + } + return value; + } const __bjs_codec_Optional_String = __bjs_optionalCodec(__bjs_stringCodec); const __bjs_codec_Optional_Bool = __bjs_optionalCodec(__bjs_primitiveCodecs.Bool); @@ -1060,7 +1067,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["swift_js_struct_lower_Point"] = function(objectId) { @@ -1205,7 +1213,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -1220,8 +1227,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValueImport.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValueImport.js index 4b71ac219..df18151cc 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValueImport.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValueImport.js @@ -18,7 +18,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -150,7 +150,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -329,7 +330,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -344,8 +344,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.js index e87881f55..5e55689ff 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.js @@ -35,7 +35,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -129,7 +129,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -259,7 +260,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -274,8 +274,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCaseImport.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCaseImport.js index c816b3bf0..20e16735c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCaseImport.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCaseImport.js @@ -16,7 +16,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -111,7 +111,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -267,7 +268,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -282,8 +282,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js index f744a43f3..a8a01bda5 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js @@ -55,7 +55,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -149,7 +149,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -299,7 +300,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -314,8 +314,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js index e43b2bcb9..e63ffc2ff 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js @@ -36,7 +36,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -130,7 +130,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -280,7 +281,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -295,8 +295,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.js index fd3640162..299a1d730 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.js @@ -86,7 +86,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -336,7 +336,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); return jsValue; }, }, @@ -430,6 +430,13 @@ export async function createInstantiator(options, swift) { } return jsValue; } + function __bjs_jsValueTake(kind, payload1, payload2) { + const value = __bjs_jsValueLift(kind, payload1, payload2); + if (kind === 1 || kind === 3 || kind === 7 || kind === 8) { + swift.memory.release(payload1); + } + return value; + } const __bjs_codec_M10TestModuleT8FileSize = { lower: (v) => { @@ -525,7 +532,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -673,7 +681,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -688,8 +695,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ExtensionNestedTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ExtensionNestedTypes.js index 53690ed6a..b573e3559 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ExtensionNestedTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ExtensionNestedTypes.js @@ -27,7 +27,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -176,7 +176,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["swift_js_struct_lower_Library_Shelf"] = function(objectId) { @@ -328,7 +329,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -343,8 +343,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ExtensionOrderIndependence.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ExtensionOrderIndependence.js index e5a43fdc2..094d37c11 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ExtensionOrderIndependence.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ExtensionOrderIndependence.js @@ -11,7 +11,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -125,7 +125,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["swift_js_struct_lower_Depot_Crate"] = function(objectId) { @@ -270,7 +271,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -285,8 +285,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ExtensionScopeParity.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ExtensionScopeParity.js index 5312f0fbd..ca1cf7361 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ExtensionScopeParity.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ExtensionScopeParity.js @@ -15,7 +15,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -121,7 +121,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["swift_js_struct_lower_Meta"] = function(objectId) { @@ -270,7 +271,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -285,8 +285,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/FixedWidthIntegers.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/FixedWidthIntegers.js index af7fa150c..636aacd1e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/FixedWidthIntegers.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/FixedWidthIntegers.js @@ -11,7 +11,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -106,7 +106,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -308,7 +309,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -323,8 +323,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GenericImports.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GenericImports.js index e2f71f878..a39fe8bd7 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GenericImports.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GenericImports.js @@ -27,7 +27,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -295,7 +295,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); return jsValue; }, }, @@ -389,6 +389,13 @@ export async function createInstantiator(options, swift) { } return jsValue; } + function __bjs_jsValueTake(kind, payload1, payload2) { + const value = __bjs_jsValueLift(kind, payload1, payload2); + if (kind === 1 || kind === 3 || kind === 7 || kind === 8) { + swift.memory.release(payload1); + } + return value; + } const __bjs_codec_Array_Int = __bjs_arrayCodec(__bjs_primitiveCodecs.Int); const __bjs_codec_Optional_Array_Int = __bjs_optionalCodec(__bjs_codec_Array_Int); @@ -572,7 +579,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["swift_js_struct_lower_GenericPoint"] = function(objectId) { @@ -966,7 +974,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -981,8 +988,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.js index 77dcf0f7a..6917cc24e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.js @@ -11,7 +11,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -106,7 +106,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -253,7 +254,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -268,8 +268,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.js index c5c7221d0..435110d18 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.js @@ -11,7 +11,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -105,7 +105,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -278,7 +279,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -293,8 +293,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.ConfigPointer.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.ConfigPointer.js index f33437e89..308778af0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.ConfigPointer.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.ConfigPointer.js @@ -11,7 +11,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -105,7 +105,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -250,7 +251,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -265,8 +265,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.PerClass.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.PerClass.js index 43901d4a2..e1717e32e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.PerClass.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.PerClass.js @@ -11,7 +11,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -105,7 +105,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -250,7 +251,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -265,8 +265,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.js index 43901d4a2..e1717e32e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.js @@ -11,7 +11,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -105,7 +105,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -250,7 +251,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -265,8 +265,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportArray.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportArray.js index 893402b07..56a1489f5 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportArray.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportArray.js @@ -11,7 +11,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -261,7 +261,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); return jsValue; }, }, @@ -355,6 +355,13 @@ export async function createInstantiator(options, swift) { } return jsValue; } + function __bjs_jsValueTake(kind, payload1, payload2) { + const value = __bjs_jsValueLift(kind, payload1, payload2); + if (kind === 1 || kind === 3 || kind === 7 || kind === 8) { + swift.memory.release(payload1); + } + return value; + } const __bjs_codec_Array_Int = __bjs_arrayCodec(__bjs_primitiveCodecs.Int); const __bjs_codec_Array_String = __bjs_arrayCodec(__bjs_stringCodec); @@ -433,7 +440,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -603,7 +611,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -618,8 +625,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js index 69a851251..ea45f4fb1 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js @@ -11,7 +11,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -261,7 +261,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); return jsValue; }, }, @@ -355,6 +355,13 @@ export async function createInstantiator(options, swift) { } return jsValue; } + function __bjs_jsValueTake(kind, payload1, payload2) { + const value = __bjs_jsValueLift(kind, payload1, payload2); + if (kind === 1 || kind === 3 || kind === 7 || kind === 8) { + swift.memory.release(payload1); + } + return value; + } const __bjs_codec_Foo = { lower: (v) => { @@ -469,7 +476,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["swift_js_struct_lower_FooContainer"] = function(objectId) { @@ -615,7 +623,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -630,8 +637,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) @@ -758,14 +763,14 @@ export async function createInstantiator(options, swift) { 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; } + const ret1 = swift.memory.getObject(ret); + swift.memory.release(ret); return ret1; }, processFooArray: function bjs_processFooArray(foos) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.js index 8909352ce..8de2a8dc0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.js @@ -11,7 +11,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -106,7 +106,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -416,7 +417,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -431,8 +431,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClass.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClass.js index 0c0f030f7..732b4aaec 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClass.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClass.js @@ -11,7 +11,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -106,7 +106,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -315,7 +316,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -330,8 +330,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js index f730efb98..abd4e32d5 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js @@ -11,7 +11,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -106,7 +106,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -298,7 +299,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -313,8 +313,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSImportBareModule.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSImportBareModule.js index 23a5b1635..f72355ae0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSImportBareModule.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSImportBareModule.js @@ -17,7 +17,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -111,7 +111,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -323,7 +324,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -338,8 +338,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSImportBareModuleFallback.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSImportBareModuleFallback.js index 55ef14aa6..bf2c55047 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSImportBareModuleFallback.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSImportBareModuleFallback.js @@ -14,7 +14,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -108,7 +108,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -267,7 +268,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -282,8 +282,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSImportModule.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSImportModule.js index 589f570cf..130c0367c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSImportModule.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSImportModule.js @@ -14,7 +14,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -108,7 +108,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -307,7 +308,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -322,8 +322,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSNameOverride.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSNameOverride.js index 16219c83c..5025b2803 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSNameOverride.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSNameOverride.js @@ -16,7 +16,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -127,7 +127,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["swift_js_struct_lower_RenamedVector"] = function(objectId) { @@ -272,7 +273,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -287,8 +287,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSNameTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSNameTypes.js index ad3e9096e..bbd490bd5 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSNameTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSNameTypes.js @@ -16,7 +16,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -110,7 +110,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -248,7 +249,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -263,8 +263,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSTypedArrayTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSTypedArrayTypes.js index f1ffa766f..8ce616dd0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSTypedArrayTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSTypedArrayTypes.js @@ -11,7 +11,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -105,7 +105,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -234,7 +235,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -249,8 +249,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js index 99742f97b..37c4134d6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js @@ -11,7 +11,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -261,7 +261,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); return jsValue; }, }, @@ -355,6 +355,13 @@ export async function createInstantiator(options, swift) { } return jsValue; } + function __bjs_jsValueTake(kind, payload1, payload2) { + const value = __bjs_jsValueLift(kind, payload1, payload2); + if (kind === 1 || kind === 3 || kind === 7 || kind === 8) { + swift.memory.release(payload1); + } + return value; + } const __bjs_codec_Array_JSValue = __bjs_arrayCodec(__bjs_primitiveCodecs.JSValue); const __bjs_codec_Optional_Array_JSValue = __bjs_optionalCodec(__bjs_codec_Array_JSValue); @@ -432,7 +439,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -591,7 +599,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -606,8 +613,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) @@ -824,7 +829,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); return jsValue; } echoOptional(value) { @@ -847,7 +852,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); optResult = jsValue; } else { optResult = null; @@ -859,7 +864,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); return jsValue; } set value(value) { @@ -874,7 +879,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); optResult = jsValue; } else { optResult = null; @@ -904,7 +909,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); return jsValue; }, roundTripOptionalJSValue: function bjs_roundTripOptionalJSValue(value) { @@ -927,7 +932,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); optResult = jsValue; } else { optResult = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js index bed72152c..dfe74e98b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js @@ -11,7 +11,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -105,7 +105,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -242,7 +243,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -257,8 +257,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js index 75697b834..4219f5249 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js @@ -11,7 +11,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -105,7 +105,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -250,7 +251,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -265,8 +265,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js index c6f2fdffa..405be1d28 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js @@ -11,7 +11,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -105,7 +105,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -242,7 +243,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -257,8 +257,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/NamespacedClassSignature.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/NamespacedClassSignature.js index 79519e8f1..db7ead8eb 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/NamespacedClassSignature.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/NamespacedClassSignature.js @@ -11,7 +11,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -130,7 +130,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -294,7 +295,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -309,8 +309,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js index 2e2667caa..a40655ea6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js @@ -11,7 +11,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -261,7 +261,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); return jsValue; }, }, @@ -355,6 +355,13 @@ export async function createInstantiator(options, swift) { } return jsValue; } + function __bjs_jsValueTake(kind, payload1, payload2) { + const value = __bjs_jsValueLift(kind, payload1, payload2); + if (kind === 1 || kind === 3 || kind === 7 || kind === 8) { + swift.memory.release(payload1); + } + return value; + } const __bjs_codec_M10TestModuleT7Greeter = { lower: (v) => { @@ -440,7 +447,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -589,7 +597,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -604,8 +611,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js index 33d18909a..815e564be 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js @@ -11,7 +11,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -261,7 +261,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); return jsValue; }, }, @@ -355,6 +355,13 @@ export async function createInstantiator(options, swift) { } return jsValue; } + function __bjs_jsValueTake(kind, payload1, payload2) { + const value = __bjs_jsValueLift(kind, payload1, payload2); + if (kind === 1 || kind === 3 || kind === 7 || kind === 8) { + swift.memory.release(payload1); + } + return value; + } const __bjs_codec_M10TestModuleT7Greeter = { lower: (v) => { @@ -440,7 +447,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -589,7 +597,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -604,8 +611,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/NestedType.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/NestedType.js index f46e610cd..a1c133290 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/NestedType.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/NestedType.js @@ -11,7 +11,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -130,7 +130,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["swift_js_struct_lower_User_Stats"] = function(objectId) { @@ -286,7 +287,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -301,8 +301,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/NestedTypeNameCollision.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/NestedTypeNameCollision.js index 332fc4e42..b9697fc97 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/NestedTypeNameCollision.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/NestedTypeNameCollision.js @@ -11,7 +11,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -126,7 +126,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["swift_js_struct_lower_Catalog_Entry"] = function(objectId) { @@ -270,7 +271,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -285,8 +285,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js index 57c49fd4c..ac372c3d1 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js @@ -11,7 +11,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -261,7 +261,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); return jsValue; }, }, @@ -355,6 +355,13 @@ export async function createInstantiator(options, swift) { } return jsValue; } + function __bjs_jsValueTake(kind, payload1, payload2) { + const value = __bjs_jsValueLift(kind, payload1, payload2); + if (kind === 1 || kind === 3 || kind === 7 || kind === 8) { + swift.memory.release(payload1); + } + return value; + } const __bjs_codec_JSObject = { lower: (v) => { @@ -456,7 +463,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -871,7 +879,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -886,8 +893,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.js index a25de5e29..2d89454c2 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.js @@ -11,7 +11,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -106,7 +106,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -243,7 +244,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -258,8 +258,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.js index 2a92af613..d3b49e4f3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.js @@ -11,7 +11,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -106,7 +106,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -254,7 +255,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -269,8 +269,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js index 39677e821..d136df4fc 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js @@ -11,7 +11,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -105,7 +105,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -242,7 +243,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -257,8 +257,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.d.ts index a413fa500..4259fb347 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.d.ts @@ -17,6 +17,10 @@ export interface MyViewControllerDelegate { createEnum(): ExampleEnumTag; handleResult(result: ResultTag): void; getResult(): ResultTag; + validate(value: number): number; + loadLabel(key: string): Promise; + reset(): Promise; + fetchCount(): Promise; eventCount: number; readonly delegateName: string; optionalName: string | null; @@ -87,6 +91,9 @@ export interface MyViewController extends SwiftHeapObject { updateLabel(prefix: string, suffix: string): void; checkEvenCount(): boolean; sendHelper(helper: Helper): void; + validateValue(value: number): number; + loadLabel(key: string): Promise; + validatedDelegate(): MyViewControllerDelegate; delegate: MyViewControllerDelegate; secondDelegate: MyViewControllerDelegate | null; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js index 192e93d8e..5ab588886 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js @@ -35,7 +35,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -285,7 +285,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); return jsValue; }, }, @@ -379,6 +379,38 @@ export async function createInstantiator(options, swift) { } return jsValue; } + function __bjs_jsValueTake(kind, payload1, payload2) { + const value = __bjs_jsValueLift(kind, payload1, payload2); + if (kind === 1 || kind === 3 || kind === 7 || kind === 8) { + swift.memory.release(payload1); + } + return value; + } + + 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 >>> 0); + let length = 0; + while (bytes[length] !== 0) { length += 1; } + const fileID = decodeUTF8(state.file, 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_codec_M10TestModuleT24MyViewControllerDelegate = { lower: (v) => { @@ -500,7 +532,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -512,6 +545,22 @@ export async function createInstantiator(options, swift) { promise[__bjs_promiseSettlers] = { resolve, reject }; return swift.memory.retain(promise); } + bjs["promise_resolve_TestModule_SS"] = function(promise, valueWord0, valueWord1, valueWord2) { + try { + const string = decodeString(valueWord0, valueWord1, valueWord2); + swift.memory.getObject(promise)[__bjs_promiseSettlers].resolve(string); + } catch (error) { + setException(error); + } + } + bjs["promise_reject_TestModule"] = function(promise, valueKind, valuePayload1, valuePayload2) { + try { + const jsValue = __bjs_jsValueLift(valueKind, valuePayload1, valuePayload2); + swift.memory.getObject(promise)[__bjs_promiseSettlers].reject(jsValue); + } catch (error) { + setException(error); + } + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; @@ -602,6 +651,95 @@ export async function createInstantiator(options, swift) { 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(); + } + bjs["invoke_js_callback_TestModule_10TestModules7JSValueV_y"] = function(callbackId, param0Kind, param0Payload1, param0Payload2) { + try { + const callback = swift.memory.getObject(callbackId); + const jsValue = __bjs_jsValueLift(param0Kind, param0Payload1, param0Payload2); + callback(jsValue); + } catch (error) { + setException(error); + } + } + bjs["make_swift_closure_TestModule_10TestModules7JSValueV_y"] = function(boxPtr, file, line) { + const lower_closure_TestModule_10TestModules7JSValueV_y = function(param0) { + const [param0Kind, param0Payload1, param0Payload2] = __bjs_jsValueLower(param0); + instance.exports.invoke_swift_closure_TestModule_10TestModules7JSValueV_y(boxPtr, param0Kind, param0Payload1, param0Payload2); + if (tmpRetException) { + const error = swift.memory.getObject(tmpRetException); + swift.memory.release(tmpRetException); + tmpRetException = undefined; + throw error; + } + }; + return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModules7JSValueV_y); + } + bjs["invoke_js_callback_TestModule_10TestModulesSS_y"] = function(callbackId, param0Word0, param0Word1, param0Word2) { + try { + const callback = swift.memory.getObject(callbackId); + const string = decodeString(param0Word0, param0Word1, param0Word2); + callback(string); + } catch (error) { + setException(error); + } + } + bjs["make_swift_closure_TestModule_10TestModulesSS_y"] = function(boxPtr, file, line) { + const lower_closure_TestModule_10TestModulesSS_y = function(param0) { + const param0Bytes = textEncoder.encode(param0); + const param0Id = swift.memory.retain(param0Bytes); + instance.exports.invoke_swift_closure_TestModule_10TestModulesSS_y(boxPtr, param0Id, param0Bytes.length); + if (tmpRetException) { + const error = swift.memory.getObject(tmpRetException); + swift.memory.release(tmpRetException); + tmpRetException = undefined; + throw error; + } + }; + return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModulesSS_y); + } + bjs["invoke_js_callback_TestModule_10TestModulesSi_y"] = function(callbackId, param0) { + try { + const callback = swift.memory.getObject(callbackId); + callback(param0); + } catch (error) { + setException(error); + } + } + bjs["make_swift_closure_TestModule_10TestModulesSi_y"] = function(boxPtr, file, line) { + const lower_closure_TestModule_10TestModulesSi_y = function(param0) { + instance.exports.invoke_swift_closure_TestModule_10TestModulesSi_y(boxPtr, param0); + if (tmpRetException) { + const error = swift.memory.getObject(tmpRetException); + swift.memory.release(tmpRetException); + tmpRetException = undefined; + throw error; + } + }; + return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModulesSi_y); + } + bjs["invoke_js_callback_TestModule_10TestModuley_y"] = function(callbackId) { + try { + const callback = swift.memory.getObject(callbackId); + callback(); + } catch (error) { + setException(error); + } + } + bjs["make_swift_closure_TestModule_10TestModuley_y"] = function(boxPtr, file, line) { + const lower_closure_TestModule_10TestModuley_y = function() { + instance.exports.invoke_swift_closure_TestModule_10TestModuley_y(boxPtr); + if (tmpRetException) { + const error = swift.memory.getObject(tmpRetException); + swift.memory.release(tmpRetException); + tmpRetException = undefined; + throw error; + } + }; + return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuley_y); + } // Wrapper functions for module: TestModule if (!importObject["TestModule"]) { importObject["TestModule"] = {}; @@ -913,6 +1051,43 @@ export async function createInstantiator(options, swift) { setException(error); } } + TestModule["bjs_MyViewControllerDelegate_validate"] = function bjs_MyViewControllerDelegate_validate(self, value) { + try { + let ret = swift.memory.getObject(self).validate(value); + return ret; + } catch (error) { + setException(error); + return 0 + } + } + TestModule["bjs_MyViewControllerDelegate_loadLabel"] = function bjs_MyViewControllerDelegate_loadLabel(resolveRef, rejectRef, self, keyWord0, keyWord1, keyWord2) { + const resolve = swift.memory.getObject(resolveRef); + const reject = swift.memory.getObject(rejectRef); + try { + const string = decodeString(keyWord0, keyWord1, keyWord2); + Promise.resolve(swift.memory.getObject(self).loadLabel(string)).then(resolve, reject); + } catch (error) { + reject(error); + } + } + TestModule["bjs_MyViewControllerDelegate_reset"] = function bjs_MyViewControllerDelegate_reset(resolveRef, rejectRef, self) { + const resolve = swift.memory.getObject(resolveRef); + const reject = swift.memory.getObject(rejectRef); + try { + Promise.resolve(swift.memory.getObject(self).reset()).then(resolve, reject); + } catch (error) { + reject(error); + } + } + TestModule["bjs_MyViewControllerDelegate_fetchCount"] = function bjs_MyViewControllerDelegate_fetchCount(resolveRef, rejectRef, self) { + const resolve = swift.memory.getObject(resolveRef); + const reject = swift.memory.getObject(rejectRef); + try { + Promise.resolve(swift.memory.getObject(self).fetchCount()).then(resolve, reject); + } catch (error) { + reject(error); + } + } }, setInstance: (i) => { if (memory !== i.exports.memory) immortalStrings.clear(); @@ -941,7 +1116,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -956,8 +1130,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) @@ -1185,6 +1357,42 @@ export async function createInstantiator(options, swift) { sendHelper(helper) { instance.exports.bjs_MyViewController_sendHelper(this.pointer, helper.pointer); } + validateValue(value) { + const ret = instance.exports.bjs_MyViewController_validateValue(this.pointer, value); + if (tmpRetException) { + const error = swift.memory.getObject(tmpRetException); + swift.memory.release(tmpRetException); + tmpRetException = undefined; + throw error; + } + return ret; + } + loadLabel(key) { + const keyBytes = textEncoder.encode(key); + const keyId = swift.memory.retain(keyBytes); + const ret = instance.exports.bjs_MyViewController_loadLabel(this.pointer, keyId, keyBytes.length); + if (tmpRetException) { + const error = swift.memory.getObject(tmpRetException); + swift.memory.release(tmpRetException); + tmpRetException = undefined; + throw error; + } + const ret1 = swift.memory.getObject(ret); + swift.memory.release(ret); + return ret1; + } + validatedDelegate() { + const ret = instance.exports.bjs_MyViewController_validatedDelegate(this.pointer); + if (tmpRetException) { + const error = swift.memory.getObject(tmpRetException); + swift.memory.release(tmpRetException); + tmpRetException = undefined; + throw error; + } + const ret1 = swift.memory.getObject(ret); + swift.memory.release(ret); + return ret1; + } get delegate() { const ret = instance.exports.bjs_MyViewController_delegate_get(this.pointer); const ret1 = swift.memory.getObject(ret); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ProtocolInClosure.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ProtocolInClosure.js index aab8103f5..c35d725e6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ProtocolInClosure.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ProtocolInClosure.js @@ -11,7 +11,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -130,7 +130,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -248,14 +249,14 @@ export async function createInstantiator(options, swift) { bjs["make_swift_closure_TestModule_10TestModule10RenderableP_10RenderableP"] = function(boxPtr, file, line) { const lower_closure_TestModule_10TestModule10RenderableP_10RenderableP = function(param0) { const ret = instance.exports.invoke_swift_closure_TestModule_10TestModule10RenderableP_10RenderableP(boxPtr, swift.memory.retain(param0)); - 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; } + const ret1 = swift.memory.getObject(ret); + swift.memory.release(ret); return ret1; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModule10RenderableP_10RenderableP); @@ -273,14 +274,14 @@ export async function createInstantiator(options, swift) { bjs["make_swift_closure_TestModule_10TestModule10RenderableP_SS"] = function(boxPtr, file, line) { const lower_closure_TestModule_10TestModule10RenderableP_SS = function(param0) { instance.exports.invoke_swift_closure_TestModule_10TestModule10RenderableP_SS(boxPtr, swift.memory.retain(param0)); - const ret = tmpRetString; - tmpRetString = undefined; if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } + const ret = tmpRetString; + tmpRetString = undefined; return ret; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModule10RenderableP_SS); @@ -305,14 +306,14 @@ export async function createInstantiator(options, swift) { result = 0; } instance.exports.invoke_swift_closure_TestModule_10TestModuleSq10RenderableP_SS(boxPtr, +isSome, result); - const ret = tmpRetString; - tmpRetString = undefined; if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } + const ret = tmpRetString; + tmpRetString = undefined; return ret; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSq10RenderableP_SS); @@ -330,14 +331,14 @@ export async function createInstantiator(options, swift) { bjs["make_swift_closure_TestModule_10TestModuley_10RenderableP"] = function(boxPtr, file, line) { const lower_closure_TestModule_10TestModuley_10RenderableP = function() { const ret = instance.exports.invoke_swift_closure_TestModule_10TestModuley_10RenderableP(boxPtr); - 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; } + const ret1 = swift.memory.getObject(ret); + swift.memory.release(ret); return ret1; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuley_10RenderableP); @@ -388,7 +389,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -403,8 +403,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/RelativeQualifiedTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/RelativeQualifiedTypes.js index a1b8f290c..87daa2d84 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/RelativeQualifiedTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/RelativeQualifiedTypes.js @@ -11,7 +11,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -148,7 +148,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["swift_js_struct_lower_Library_Shelf"] = function(objectId) { @@ -325,7 +326,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -340,8 +340,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReservedWordParameters.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReservedWordParameters.d.ts new file mode 100644 index 000000000..82dc96f71 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReservedWordParameters.d.ts @@ -0,0 +1,45 @@ +// 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 ReservedWordDelegate { + handle(_in: number, _for: string, _default: boolean): void; +} + +export interface BacktickedLabelDelegate { + handle(_in: number): void; +} + +/// 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 ReservedWordBox extends SwiftHeapObject { + run(_for: number): void; +} +export type Exports = { + check(extension: number, _break: number, _function: boolean, _in: string): void; + checkEscaped(_in: string): void; + checkEscapedCollision(_in: number, _in1: number): void; + checkGlueNameCollision(instance: number, swift: string): void; + ReservedWordBox: { + new(_in: number): ReservedWordBox; + make(_default: number): number; + }, +} +export type Imports = { + importedCheck(_in: number, _for: string, _default: boolean): void; + importedSelfClosure(self: () => void): 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/ReservedWordParameters.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReservedWordParameters.js new file mode 100644 index 000000000..deb145efa --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReservedWordParameters.js @@ -0,0 +1,555 @@ +// 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; + let decodeString; + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); + const textEncoder = new TextEncoder("utf-8"); + let tmpRetString; + let tmpRetBytes; + let tmpRetException; + let tmpRetOptionalBool; + let tmpRetOptionalInt; + let tmpRetOptionalFloat; + let tmpRetOptionalDouble; + let tmpRetOptionalHeapObject; + let strStack = []; + let i32Stack = []; + let i64Stack = []; + let f32Stack = []; + let f64Stack = []; + let ptrStack = []; + let taStack = []; + const enumHelpers = {}; + const structHelpers = {}; + + 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 >>> 0); + let length = 0; + while (bytes[length] !== 0) { length += 1; } + const fileID = decodeUTF8(state.file, 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 { + /** + * @param {WebAssembly.Imports} importObject + */ + addImports: (importObject, importsContext) => { + bjs = {}; + importObject["bjs"] = bjs; + const imports = options.getImports(importsContext); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); + } + 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 >>> 0); + bytes.set(source); + } + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); + } + bjs["swift_js_init_memory_with_result"] = function(ptr, len) { + const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); + 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_i32"] = function(v) { + i32Stack.push(v | 0); + } + bjs["swift_js_push_f32"] = function(v) { + f32Stack.push(Math.fround(v)); + } + bjs["swift_js_push_f64"] = function(v) { + f64Stack.push(v); + } + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); + strStack.push(value); + } + bjs["swift_js_pop_i32"] = function() { + return i32Stack.pop(); + } + bjs["swift_js_pop_f32"] = function() { + return f32Stack.pop(); + } + bjs["swift_js_pop_f64"] = function() { + return f64Stack.pop(); + } + bjs["swift_js_push_pointer"] = function(pointer) { + ptrStack.push(pointer); + } + bjs["swift_js_pop_pointer"] = function() { + return ptrStack.pop(); + } + bjs["swift_js_push_i64"] = function(v) { + i64Stack.push(v); + } + bjs["swift_js_pop_i64"] = function() { + return i64Stack.pop(); + } + const taCtors = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array, Float32Array, Float64Array]; + bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { + const Ctor = taCtors[kind]; + const byteLen = count * Ctor.BYTES_PER_ELEMENT; + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); + taStack.push(Array.from(new Ctor(copy))); + } + bjs["bjs_core_register_type_handles"] = function() {}; + const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers"); + bjs["swift_js_make_promise"] = function() { + let resolve, reject; + const promise = new Promise((res, rej) => { resolve = res; reject = rej; }); + promise[__bjs_promiseSettlers] = { resolve, reject }; + return swift.memory.retain(promise); + } + 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, word0, word1, word2) { + if (isSome === 0) { + tmpRetString = null; + } else { + tmpRetString = decodeString(word0, word1, word2); + } + } + 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["swift_js_closure_unregister"] = function(funcRef) {} + bjs["swift_js_closure_unregister"] = function(funcRef) { + const func = swift.memory.getObject(funcRef); + func.__unregister(); + } + bjs["invoke_js_callback_TestModule_10TestModuley_y"] = function(callbackId) { + try { + const callback = swift.memory.getObject(callbackId); + callback(); + } catch (error) { + setException(error); + } + } + bjs["make_swift_closure_TestModule_10TestModuley_y"] = function(boxPtr, file, line) { + const lower_closure_TestModule_10TestModuley_y = function() { + instance.exports.invoke_swift_closure_TestModule_10TestModuley_y(boxPtr); + if (tmpRetException) { + const error = swift.memory.getObject(tmpRetException); + swift.memory.release(tmpRetException); + tmpRetException = undefined; + throw error; + } + }; + return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuley_y); + } + // Wrapper functions for module: TestModule + if (!importObject["TestModule"]) { + importObject["TestModule"] = {}; + } + importObject["TestModule"]["bjs_ReservedWordBox_wrap"] = function(pointer) { + const obj = _exports['ReservedWordBox'].__construct(pointer); + return swift.memory.retain(obj); + }; + const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; + TestModule["bjs_importedCheck"] = function bjs_importedCheck(_in, forWord0, forWord1, forWord2, _default) { + try { + const string = decodeString(forWord0, forWord1, forWord2); + imports.importedCheck(_in, string, _default !== 0); + } catch (error) { + setException(error); + } + } + TestModule["bjs_importedSelfClosure"] = function bjs_importedSelfClosure(self) { + try { + imports.importedSelfClosure(swift.memory.getObject(self)); + } catch (error) { + setException(error); + } + } + TestModule["bjs_ReservedWordDelegate_handle"] = function bjs_ReservedWordDelegate_handle(self, _in, forWord0, forWord1, forWord2, _default) { + try { + const string = decodeString(forWord0, forWord1, forWord2); + swift.memory.getObject(self).handle(_in, string, _default !== 0); + } catch (error) { + setException(error); + } + } + TestModule["bjs_BacktickedLabelDelegate_handle"] = function bjs_BacktickedLabelDelegate_handle(self, _in) { + try { + swift.memory.getObject(self).handle(_in); + } catch (error) { + setException(error); + } + } + }, + setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); + instance = i; + memory = instance.exports.memory; + + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); + + setException = (error) => { + instance.exports._swift_js_exception.value = swift.memory.retain(error) + } + }, + /** @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.identityMap?.delete(state.pointer); + state.deinit(state.pointer); + }); + + /// Represents a Swift heap object like a class instance or an actor instance. + class SwiftHeapObject { + static __wrap(pointer, deinit, prototype, identityCache) { + pointer = pointer >>> 0; + const makeFresh = (identityMap) => { + const obj = Object.create(prototype); + const state = { pointer, deinit, hasReleased: false, identityMap }; + obj.pointer = pointer; + obj.__swiftHeapObjectState = state; + swiftHeapObjectFinalizationRegistry.register(obj, state, state); + if (identityMap) { + identityMap.set(pointer, new WeakRef(obj)); + } + return obj; + }; + + if (!identityCache) { + return makeFresh(null); + } + + const cached = identityCache.get(pointer)?.deref(); + if (cached && !cached.__swiftHeapObjectState.hasReleased) { + deinit(pointer); + return cached; + } + if (identityCache.has(pointer)) { + identityCache.delete(pointer); + } + + return makeFresh(identityCache); + } + + release() { + const state = this.__swiftHeapObjectState; + if (state.hasReleased) { + return; + } + state.hasReleased = true; + swiftHeapObjectFinalizationRegistry.unregister(state); + state.identityMap?.delete(state.pointer); + state.deinit(state.pointer); + } + } + class ReservedWordBox extends SwiftHeapObject { + static __construct(ptr) { + return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_ReservedWordBox_deinit, ReservedWordBox.prototype, null); + } + + constructor(_in) { + const ret = instance.exports.bjs_ReservedWordBox_init(_in); + return ReservedWordBox.__construct(ret); + } + run(_for) { + instance.exports.bjs_ReservedWordBox_run(this.pointer, _for); + } + static make(_default) { + const ret = instance.exports.bjs_ReservedWordBox_static_make(_default); + return ret; + } + } + const exports = { + check: function bjs_check(extension, _break, _function, _in) { + const _inBytes = textEncoder.encode(_in); + const _inId = swift.memory.retain(_inBytes); + instance.exports.bjs_check(extension, _break, _function, _inId, _inBytes.length); + }, + checkEscaped: function bjs_checkEscaped(_in) { + const _inBytes = textEncoder.encode(_in); + const _inId = swift.memory.retain(_inBytes); + instance.exports.bjs_checkEscaped(_inId, _inBytes.length); + }, + checkEscapedCollision: function bjs_checkEscapedCollision(_in, _in1) { + instance.exports.bjs_checkEscapedCollision(_in, _in1); + }, + checkGlueNameCollision: function bjs_checkGlueNameCollision(instance1, swift1) { + const swift1Bytes = textEncoder.encode(swift1); + const swift1Id = swift.memory.retain(swift1Bytes); + instance.exports.bjs_checkGlueNameCollision(instance1, swift1Id, swift1Bytes.length); + }, + ReservedWordBox, + }; + _exports = exports; + return exports; + }, + } +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js index 338cf237d..a5f1258e4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js @@ -22,7 +22,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -149,7 +149,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -287,7 +288,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -302,8 +302,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js index e474c82a6..e52f9d5dd 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js @@ -22,7 +22,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -149,7 +149,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -287,7 +288,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -302,8 +302,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js index eb1b2d2ef..94888662f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js @@ -16,7 +16,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -110,7 +110,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -248,7 +249,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -263,8 +263,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js index 95470ed56..84fb321ae 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js @@ -16,7 +16,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -110,7 +110,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -248,7 +249,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -263,8 +263,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.js index c76381468..78f6a8dbc 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.js @@ -11,7 +11,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -106,7 +106,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -252,7 +253,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -267,8 +267,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.js index 0a0fc1650..0a8460da0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.js @@ -11,7 +11,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -106,7 +106,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -245,7 +246,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -260,8 +260,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StructWithNestedTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StructWithNestedTypes.js index 7c189df7e..c5e8ebe24 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StructWithNestedTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StructWithNestedTypes.js @@ -26,7 +26,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -164,7 +164,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["swift_js_struct_lower_Shape"] = function(objectId) { @@ -322,7 +323,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -337,8 +337,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js index 293ea56da..fc6903739 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js @@ -11,7 +11,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -106,7 +106,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -270,7 +271,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -285,8 +285,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js index dabb7595f..ece62f6ac 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js @@ -41,7 +41,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -291,7 +291,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); return jsValue; }, }, @@ -385,6 +385,13 @@ export async function createInstantiator(options, swift) { } return jsValue; } + function __bjs_jsValueTake(kind, payload1, payload2) { + const value = __bjs_jsValueLift(kind, payload1, payload2); + if (kind === 1 || kind === 3 || kind === 7 || kind === 8) { + swift.memory.release(payload1); + } + return value; + } const swiftClosureRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => { if (state.unregistered) { return; } @@ -567,7 +574,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["swift_js_struct_lower_Animal"] = function(objectId) { @@ -751,14 +759,14 @@ export async function createInstantiator(options, swift) { const param0Bytes = textEncoder.encode(param0); const param0Id = swift.memory.retain(param0Bytes); instance.exports.invoke_swift_closure_TestModule_10TestModule5ThemeO_5ThemeO(boxPtr, param0Id, param0Bytes.length); - const ret = tmpRetString; - tmpRetString = undefined; if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } + const ret = tmpRetString; + tmpRetString = undefined; return ret; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModule5ThemeO_5ThemeO); @@ -777,13 +785,13 @@ export async function createInstantiator(options, swift) { const lower_closure_TestModule_10TestModule6AnimalV_6AnimalV = function(param0) { structHelpers.M10TestModuleT6Animal.lower(param0); instance.exports.invoke_swift_closure_TestModule_10TestModule6AnimalV_6AnimalV(boxPtr); - const structValue = structHelpers.M10TestModuleT6Animal.lift(); if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } + const structValue = structHelpers.M10TestModuleT6Animal.lift(); return structValue; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModule6AnimalV_6AnimalV); @@ -826,13 +834,13 @@ export async function createInstantiator(options, swift) { const lower_closure_TestModule_10TestModule9APIResultO_9APIResultO = function(param0) { const param0CaseId = enumHelpers.M10TestModuleT9APIResult.lower(param0); instance.exports.invoke_swift_closure_TestModule_10TestModule9APIResultO_9APIResultO(boxPtr, param0CaseId); - const ret = enumHelpers.M10TestModuleT9APIResult.lift(i32Stack.pop()); if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } + const ret = enumHelpers.M10TestModuleT9APIResult.lift(i32Stack.pop()); return ret; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModule9APIResultO_9APIResultO); @@ -928,14 +936,14 @@ export async function createInstantiator(options, swift) { const param0Bytes = textEncoder.encode(param0); const param0Id = swift.memory.retain(param0Bytes); instance.exports.invoke_swift_closure_TestModule_10TestModuleSS_SS(boxPtr, param0Id, param0Bytes.length); - const ret = tmpRetString; - tmpRetString = undefined; if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } + const ret = tmpRetString; + tmpRetString = undefined; return ret; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSS_SS); @@ -1046,14 +1054,14 @@ export async function createInstantiator(options, swift) { const lower_closure_TestModule_10TestModuleSq10HttpStatusO_Sq10HttpStatusO = function(param0) { const isSome = param0 != null; 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; } + const optResult = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; return optResult; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSq10HttpStatusO_Sq10HttpStatusO); @@ -1089,14 +1097,14 @@ export async function createInstantiator(options, swift) { result1 = 0; } instance.exports.invoke_swift_closure_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO(boxPtr, +isSome, result, result1); - const optResult = tmpRetString; - tmpRetString = undefined; if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } + const optResult = tmpRetString; + tmpRetString = undefined; return optResult; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO); @@ -1115,13 +1123,13 @@ export async function createInstantiator(options, swift) { const lower_closure_TestModule_10TestModuleSq6AnimalV_Sq6AnimalV = function(param0) { __bjs_codec_Optional_M10TestModuleT6Animal.lower(param0); instance.exports.invoke_swift_closure_TestModule_10TestModuleSq6AnimalV_Sq6AnimalV(boxPtr); - const optValue = __bjs_codec_Optional_M10TestModuleT6Animal.lift(); if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } + const optValue = __bjs_codec_Optional_M10TestModuleT6Animal.lift(); return optValue; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSq6AnimalV_Sq6AnimalV); @@ -1146,15 +1154,15 @@ export async function createInstantiator(options, swift) { 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); if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } + 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); @@ -1192,14 +1200,14 @@ export async function createInstantiator(options, swift) { result = 0; } instance.exports.invoke_swift_closure_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO(boxPtr, +isSome, result); - const tag = i32Stack.pop(); - const optResult = tag === -1 ? null : enumHelpers.M10TestModuleT9APIResult.lift(tag); if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } + const tag = i32Stack.pop(); + const optResult = tag === -1 ? null : enumHelpers.M10TestModuleT9APIResult.lift(tag); return optResult; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO); @@ -1218,14 +1226,14 @@ export async function createInstantiator(options, swift) { const lower_closure_TestModule_10TestModuleSq9DirectionO_Sq9DirectionO = function(param0) { const isSome = param0 != null; 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; } + const optResult = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; return optResult; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSq9DirectionO_Sq9DirectionO); @@ -1261,14 +1269,14 @@ export async function createInstantiator(options, swift) { result1 = 0; } instance.exports.invoke_swift_closure_TestModule_10TestModuleSqSS_SqSS(boxPtr, +isSome, result, result1); - const optResult = tmpRetString; - tmpRetString = undefined; if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } + const optResult = tmpRetString; + tmpRetString = undefined; return optResult; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSqSS_SqSS); @@ -1287,14 +1295,14 @@ export async function createInstantiator(options, swift) { const lower_closure_TestModule_10TestModuleSqSb_SqSb = function(param0) { const isSome = param0 != null; instance.exports.invoke_swift_closure_TestModule_10TestModuleSqSb_SqSb(boxPtr, +isSome, isSome ? param0 ? 1 : 0 : 0); - const optResult = tmpRetOptionalBool; - tmpRetOptionalBool = undefined; if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } + const optResult = tmpRetOptionalBool; + tmpRetOptionalBool = undefined; return optResult; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSqSb_SqSb); @@ -1313,14 +1321,14 @@ export async function createInstantiator(options, swift) { 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.0); - const optResult = tmpRetOptionalDouble; - tmpRetOptionalDouble = undefined; if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } + const optResult = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; return optResult; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSqSd_SqSd); @@ -1339,14 +1347,14 @@ export async function createInstantiator(options, swift) { 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.0); - const optResult = tmpRetOptionalFloat; - tmpRetOptionalFloat = undefined; if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } + const optResult = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; return optResult; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSqSf_SqSf); @@ -1365,14 +1373,14 @@ export async function createInstantiator(options, swift) { const lower_closure_TestModule_10TestModuleSqSi_SqSi = function(param0) { const isSome = param0 != null; 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; } + const optResult = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; return optResult; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSqSi_SqSi); @@ -1380,23 +1388,27 @@ export async function createInstantiator(options, swift) { bjs["invoke_js_callback_TestModule_10TestModuleYaKSS_SS"] = function(resolveRef, rejectRef, callbackId, param0Word0, param0Word1, param0Word2) { const resolve = swift.memory.getObject(resolveRef); const reject = swift.memory.getObject(rejectRef); - const callback = swift.memory.getObject(callbackId); - const string = decodeString(param0Word0, param0Word1, param0Word2); - callback(string).then(resolve, reject); + try { + const callback = swift.memory.getObject(callbackId); + const string = decodeString(param0Word0, param0Word1, param0Word2); + Promise.resolve(callback(string)).then(resolve, reject); + } catch (error) { + reject(error); + } } bjs["make_swift_closure_TestModule_10TestModuleYaKSS_SS"] = function(boxPtr, file, line) { const lower_closure_TestModule_10TestModuleYaKSS_SS = function(param0) { const param0Bytes = textEncoder.encode(param0); const param0Id = swift.memory.retain(param0Bytes); const ret = instance.exports.invoke_swift_closure_TestModule_10TestModuleYaKSS_SS(boxPtr, param0Id, param0Bytes.length); - 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; } + const ret1 = swift.memory.getObject(ret); + swift.memory.release(ret); return ret1; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleYaKSS_SS); @@ -1404,20 +1416,24 @@ export async function createInstantiator(options, swift) { bjs["invoke_js_callback_TestModule_10TestModuleYaKSb_9APIResultO"] = function(resolveRef, rejectRef, callbackId, param0) { const resolve = swift.memory.getObject(resolveRef); const reject = swift.memory.getObject(rejectRef); - const callback = swift.memory.getObject(callbackId); - callback(param0 !== 0).then(resolve, reject); + try { + const callback = swift.memory.getObject(callbackId); + Promise.resolve(callback(param0 !== 0)).then(resolve, reject); + } catch (error) { + reject(error); + } } bjs["make_swift_closure_TestModule_10TestModuleYaKSb_9APIResultO"] = function(boxPtr, file, line) { const lower_closure_TestModule_10TestModuleYaKSb_9APIResultO = function(param0) { const ret = instance.exports.invoke_swift_closure_TestModule_10TestModuleYaKSb_9APIResultO(boxPtr, param0); - 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; } + const ret1 = swift.memory.getObject(ret); + swift.memory.release(ret); return ret1; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleYaKSb_9APIResultO); @@ -1425,9 +1441,13 @@ export async function createInstantiator(options, swift) { bjs["invoke_js_callback_TestModule_10TestModuleYaSS_6AnimalV"] = function(resolveRef, rejectRef, callbackId, param0Word0, param0Word1, param0Word2) { const resolve = swift.memory.getObject(resolveRef); const reject = swift.memory.getObject(rejectRef); - const callback = swift.memory.getObject(callbackId); - const string = decodeString(param0Word0, param0Word1, param0Word2); - callback(string).then(resolve, reject); + try { + const callback = swift.memory.getObject(callbackId); + const string = decodeString(param0Word0, param0Word1, param0Word2); + Promise.resolve(callback(string)).then(resolve, reject); + } catch (error) { + reject(error); + } } bjs["make_swift_closure_TestModule_10TestModuleYaSS_6AnimalV"] = function(boxPtr, file, line) { const lower_closure_TestModule_10TestModuleYaSS_6AnimalV = function(param0) { @@ -1443,9 +1463,13 @@ export async function createInstantiator(options, swift) { bjs["invoke_js_callback_TestModule_10TestModuleYaSS_SS"] = function(resolveRef, rejectRef, callbackId, param0Word0, param0Word1, param0Word2) { const resolve = swift.memory.getObject(resolveRef); const reject = swift.memory.getObject(rejectRef); - const callback = swift.memory.getObject(callbackId); - const string = decodeString(param0Word0, param0Word1, param0Word2); - callback(string).then(resolve, reject); + try { + const callback = swift.memory.getObject(callbackId); + const string = decodeString(param0Word0, param0Word1, param0Word2); + Promise.resolve(callback(string)).then(resolve, reject); + } catch (error) { + reject(error); + } } bjs["make_swift_closure_TestModule_10TestModuleYaSS_SS"] = function(boxPtr, file, line) { const lower_closure_TestModule_10TestModuleYaSS_SS = function(param0) { @@ -1587,7 +1611,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -1602,8 +1625,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js index 0a6690be9..eb2347864 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js @@ -11,7 +11,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -121,6 +121,13 @@ export async function createInstantiator(options, swift) { } return jsValue; } + function __bjs_jsValueTake(kind, payload1, payload2) { + const value = __bjs_jsValueLift(kind, payload1, payload2); + if (kind === 1 || kind === 3 || kind === 7 || kind === 8) { + swift.memory.release(payload1); + } + return value; + } const swiftClosureRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => { if (state.unregistered) { return; } @@ -220,7 +227,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -393,23 +401,27 @@ export async function createInstantiator(options, swift) { bjs["invoke_js_callback_TestModule_10TestModuleYaKSS_SS"] = function(resolveRef, rejectRef, callbackId, param0Word0, param0Word1, param0Word2) { const resolve = swift.memory.getObject(resolveRef); const reject = swift.memory.getObject(rejectRef); - const callback = swift.memory.getObject(callbackId); - const string = decodeString(param0Word0, param0Word1, param0Word2); - callback(string).then(resolve, reject); + try { + const callback = swift.memory.getObject(callbackId); + const string = decodeString(param0Word0, param0Word1, param0Word2); + Promise.resolve(callback(string)).then(resolve, reject); + } catch (error) { + reject(error); + } } bjs["make_swift_closure_TestModule_10TestModuleYaKSS_SS"] = function(boxPtr, file, line) { const lower_closure_TestModule_10TestModuleYaKSS_SS = function(param0) { const param0Bytes = textEncoder.encode(param0); const param0Id = swift.memory.retain(param0Bytes); const ret = instance.exports.invoke_swift_closure_TestModule_10TestModuleYaKSS_SS(boxPtr, param0Id, param0Bytes.length); - 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; } + const ret1 = swift.memory.getObject(ret); + swift.memory.release(ret); return ret1; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleYaKSS_SS); @@ -509,7 +521,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -524,8 +535,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js index e336f8911..7ba2ada2f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js @@ -16,7 +16,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -266,7 +266,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); return jsValue; }, }, @@ -360,6 +360,13 @@ export async function createInstantiator(options, swift) { } return jsValue; } + function __bjs_jsValueTake(kind, payload1, payload2) { + const value = __bjs_jsValueLift(kind, payload1, payload2); + if (kind === 1 || kind === 3 || kind === 7 || kind === 8) { + swift.memory.release(payload1); + } + return value; + } const __bjs_codec_Optional_Int = __bjs_optionalCodec(__bjs_primitiveCodecs.Int); const __bjs_codec_Optional_Bool = __bjs_optionalCodec(__bjs_primitiveCodecs.Bool); @@ -610,7 +617,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["swift_js_struct_lower_DataPoint"] = function(objectId) { @@ -804,7 +812,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -819,8 +826,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js index ff953c9a3..c1bb5d023 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js @@ -11,7 +11,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -261,7 +261,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); return jsValue; }, }, @@ -355,6 +355,13 @@ export async function createInstantiator(options, swift) { } return jsValue; } + function __bjs_jsValueTake(kind, payload1, payload2) { + const value = __bjs_jsValueLift(kind, payload1, payload2); + if (kind === 1 || kind === 3 || kind === 7 || kind === 8) { + swift.memory.release(payload1); + } + return value; + } const __bjs_codec_M10TestModuleT5Point = { lower: (v) => { @@ -451,7 +458,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["swift_js_struct_lower_Point"] = function(objectId) { @@ -607,7 +615,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -622,8 +629,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftTypedClosureAccess.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftTypedClosureAccess.js index 8cec87d6e..1abc20336 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftTypedClosureAccess.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftTypedClosureAccess.js @@ -11,7 +11,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -130,7 +130,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -352,7 +353,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -367,8 +367,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.js index 40bf7e8c2..3b36bb511 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.js @@ -11,7 +11,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -105,7 +105,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -234,7 +235,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -249,8 +249,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js index 435415b0f..f3d2a217a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js @@ -11,7 +11,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -122,7 +122,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["swift_js_struct_lower_PointerFields"] = function(objectId) { @@ -259,7 +260,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -274,8 +274,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.js index ce27ff522..c8693eeb3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.js @@ -11,7 +11,7 @@ export async function createInstantiator(options, swift) { let decodeString; let decodeUTF8; const immortalStrings = new Map(); - const textDecoder = new TextDecoder("utf-8"); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -106,7 +106,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -243,7 +244,6 @@ export async function createInstantiator(options, swift) { u6 = 0, u7 = 0; while (byteIndex < count) { - const start = byteIndex; const b0 = byteAt(word0, word1, byteIndex++); let codePoint; if (b0 < 128) codePoint = b0; @@ -258,8 +258,6 @@ export async function createInstantiator(options, swift) { b3 = byteAt(word0, word1, byteIndex++); codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); } - // Match TextDecoder: consume exactly one leading UTF-8 BOM. - if (start === 0 && codePoint === 0xfeff) continue; const supplementary = codePoint > 0xffff; const codeUnit = supplementary ? 0xd800 + ((codePoint - 0x10000) >>> 10) diff --git a/Plugins/PackageToJS/README.md b/Plugins/PackageToJS/README.md index 0e3e0e124..01a420466 100644 --- a/Plugins/PackageToJS/README.md +++ b/Plugins/PackageToJS/README.md @@ -22,6 +22,12 @@ to generate browser and Node platform wrappers backed by `uwasi` instead: swift package --swift-sdk wasm32-unknown-wasi js --wasi-runtime uwasi ``` +The `uwasi` wrappers import only the stdio, args, environ, clock, poll, proc and +random features, so bundlers can drop `uwasi`'s file system and file syscalls return +`ENOSYS`. With `--enable-code-coverage`, the Node wrapper adds an in-memory file +system so the test runner can read the coverage profile. To give an application a +file system, pass your own `wasi` object to `instantiate`. + The generated browser main-thread setup rejects blocking WASI waits. Run guests that require `poll_oneoff` clock waits in a worker. Node and browser workers use `uwasi`'s blocking implementation. diff --git a/Plugins/PackageToJS/Sources/PackageToJS.swift b/Plugins/PackageToJS/Sources/PackageToJS.swift index cf236c5cc..b736cca69 100644 --- a/Plugins/PackageToJS/Sources/PackageToJS.swift +++ b/Plugins/PackageToJS/Sources/PackageToJS.swift @@ -957,6 +957,7 @@ struct PackagingPlanner { let staticConditions: [String: Bool] = [ "USE_WASI_CDN": options.useCDN, "USE_UWASI": options.wasiRuntime == .uwasi, + "USE_UWASI_FILESYSTEM": options.wasiRuntime == .uwasi && options.enableCodeCoverage, "HAS_BRIDGE": skeletons.count > 0, "HAS_IMPORTS": skeletons.count > 0, "TARGET_DEFAULT_PLATFORM_NODE": options.defaultPlatform == .node, diff --git a/Plugins/PackageToJS/Templates/platforms/browser.js b/Plugins/PackageToJS/Templates/platforms/browser.js index e8c596308..6b148685f 100644 --- a/Plugins/PackageToJS/Templates/platforms/browser.js +++ b/Plugins/PackageToJS/Templates/platforms/browser.js @@ -4,11 +4,12 @@ import { MODULE_PATH /* #if USE_SHARED_MEMORY */, MEMORY_TYPE /* #endif */} from /* #if USE_UWASI */ /* #if USE_WASI_CDN */ // @ts-ignore -import { WASI, MemoryFileSystem, useAll, lineBuffered } from 'https://cdn.jsdelivr.net/npm/uwasi@1.5.2/+esm'; +import { WASI, lineBuffered, useStdio, useArgs, useEnviron, useClock, usePoll, useProc, useRandom } from 'https://cdn.jsdelivr.net/npm/uwasi@1.5.2/+esm'; /* #else */ -import { WASI, MemoryFileSystem, useAll, lineBuffered } from 'uwasi'; +import { WASI, lineBuffered, useStdio, useArgs, useEnviron, useClock, usePoll, useProc, useRandom } from 'uwasi'; /* #endif */ import { browserMainThreadSleep, createUwasi } from './uwasi.js'; +const uwasiRuntime = { WASI, lineBuffered, useStdio, useArgs, useEnviron, useClock, usePoll, useProc, useRandom }; /* #else */ /* #if USE_WASI_CDN */ // @ts-ignore @@ -38,10 +39,7 @@ export async function defaultBrowserThreadSetup() { /* #if IS_WASI */ /* #if USE_UWASI */ - const { wasi } = createUwasi( - { WASI, MemoryFileSystem, useAll, lineBuffered }, - { modulePath: MODULE_PATH } - ) + const { wasi } = createUwasi(uwasiRuntime, { modulePath: MODULE_PATH }) /* #else */ const wasi = new WASI(/* args */[MODULE_PATH], /* env */[], /* fd */[ new OpenFile(new File([])), // stdin @@ -127,16 +125,13 @@ export async function defaultBrowserSetup(options) { const onStdoutLine = options.onStdoutLine ?? ((line) => console.log(line)) const onStderrLine = options.onStderrLine ?? ((line) => console.error(line)) /* #if USE_UWASI */ - const { wasi } = createUwasi( - { WASI, MemoryFileSystem, useAll, lineBuffered }, - { - modulePath: MODULE_PATH, - args, - onStdoutLine, - onStderrLine, - sleep: browserMainThreadSleep(), - } - ) + const { wasi } = createUwasi(uwasiRuntime, { + modulePath: MODULE_PATH, + args, + onStdoutLine, + onStderrLine, + sleep: browserMainThreadSleep(), + }) /* #else */ const wasi = new WASI(/* args */[MODULE_PATH, ...args], /* env */[], /* fd */[ new OpenFile(new File([])), // stdin diff --git a/Plugins/PackageToJS/Templates/platforms/node.js b/Plugins/PackageToJS/Templates/platforms/node.js index b01290252..4725201b7 100644 --- a/Plugins/PackageToJS/Templates/platforms/node.js +++ b/Plugins/PackageToJS/Templates/platforms/node.js @@ -4,8 +4,17 @@ import { Worker, parentPort } from "node:worker_threads"; import { MODULE_PATH /* #if USE_SHARED_MEMORY */, MEMORY_TYPE /* #endif */} from "../instantiate.js" /* #if IS_WASI */ /* #if USE_UWASI */ -import { WASI, MemoryFileSystem, useAll, lineBuffered } from 'uwasi'; +import { WASI, lineBuffered, useStdio, useArgs, useEnviron, useClock, usePoll, useProc, useRandom } from 'uwasi'; +/* #if USE_UWASI_FILESYSTEM */ +import { MemoryFileSystem, useMemoryFS } from 'uwasi'; +/* #endif */ import { createUwasi } from './uwasi.js'; +const uwasiRuntime = { + WASI, lineBuffered, useStdio, useArgs, useEnviron, useClock, usePoll, useProc, useRandom, +/* #if USE_UWASI_FILESYSTEM */ + MemoryFileSystem, useMemoryFS, +/* #endif */ +}; /* #else */ import { WASI, File, OpenFile, ConsoleStdout, PreopenDirectory, Directory, Inode } from '@bjorn3/browser_wasi_shim'; /* #endif */ @@ -28,10 +37,7 @@ export async function defaultNodeThreadSetup() { } /* #if USE_UWASI */ - const { wasi } = createUwasi( - { WASI, MemoryFileSystem, useAll, lineBuffered }, - { modulePath: MODULE_PATH } - ) + const { wasi } = createUwasi(uwasiRuntime, { modulePath: MODULE_PATH }) /* #else */ const wasi = new WASI(/* args */[MODULE_PATH], /* env */[], /* fd */[ new OpenFile(new File([])), // stdin @@ -136,14 +142,11 @@ export async function defaultNodeSetup(options = {}) { const args = options.args ?? process.argv.slice(2) /* #if USE_UWASI */ - const { wasi } = createUwasi( - { WASI, MemoryFileSystem, useAll, lineBuffered }, - { - modulePath: MODULE_PATH, - args, - withExtractFile: true, - } - ) + const { wasi } = createUwasi(uwasiRuntime, { + modulePath: MODULE_PATH, + args, + withExtractFile: true, + }) /* #else */ const rootFs = new Map(); const wasi = new WASI(/* args */[MODULE_PATH, ...args], /* env */[], /* fd */[ diff --git a/Plugins/PackageToJS/Templates/platforms/uwasi.js b/Plugins/PackageToJS/Templates/platforms/uwasi.js index e7a9ce1bc..56212a108 100644 --- a/Plugins/PackageToJS/Templates/platforms/uwasi.js +++ b/Plugins/PackageToJS/Templates/platforms/uwasi.js @@ -17,7 +17,19 @@ export function browserMainThreadSleep() { } /** - * @param {{ WASI: any, MemoryFileSystem: any, useAll: any, lineBuffered: any }} runtime + * @param {{ + * WASI: any, + * lineBuffered: any, + * useStdio: any, + * useArgs: any, + * useEnviron: any, + * useClock: any, + * usePoll: any, + * useProc: any, + * useRandom: any, + * MemoryFileSystem?: any, + * useMemoryFS?: any, + * }} runtime * @param {{ * modulePath: string, * args?: string[], @@ -32,27 +44,35 @@ export function createUwasi(runtime, options) { const onStdoutLine = options.onStdoutLine ?? ((line) => console.log(line)); const onStderrLine = options.onStderrLine ?? ((line) => console.error(line)); - const fileSystem = new runtime.MemoryFileSystem({ "/": "/" }); - const stdout = runtime.lineBuffered(onStdoutLine); - const stderr = runtime.lineBuffered(onStderrLine); + const stdio = { + stdin: () => "", + stdout: runtime.lineBuffered(onStdoutLine), + stderr: runtime.lineBuffered(onStderrLine), + outputBuffers: true, + }; + const fileSystem = runtime.MemoryFileSystem + ? new runtime.MemoryFileSystem({ "/": "/" }) + : undefined; const wasi = new runtime.WASI({ args: [options.modulePath, ...args], env: {}, features: [ - runtime.useAll({ - withFileSystem: fileSystem, - withStdio: { - stdin: () => "", - stdout, - stderr, - outputBuffers: true, - }, - sleep: options.sleep, - }), + fileSystem + ? runtime.useMemoryFS({ + withFileSystem: fileSystem, + withStdio: stdio, + }) + : runtime.useStdio(stdio), + runtime.useArgs(), + runtime.useEnviron(), + runtime.useClock(), + runtime.usePoll({ sleep: options.sleep }), + runtime.useProc(), + runtime.useRandom(), ], }); - if (options.withExtractFile) { + if (fileSystem && options.withExtractFile) { Object.assign(wasi, { extractFile(filePath) { const node = fileSystem.lookup(filePath); diff --git a/Plugins/PackageToJS/Templates/runtime.mjs b/Plugins/PackageToJS/Templates/runtime.mjs index b0be54bb4..6170e58d0 100644 --- a/Plugins/PackageToJS/Templates/runtime.mjs +++ b/Plugins/PackageToJS/Templates/runtime.mjs @@ -759,7 +759,12 @@ class SwiftRuntime { swjs_load_typed_array: (ref, buffer) => { const memory = this.memory; const typedArray = memory.getObject(ref); - const bytes = new Uint8Array(typedArray.buffer); + // Copy only the window the view describes. `typedArray.buffer` + // is the whole backing `ArrayBuffer`, which may be larger than + // the view and may start before it; the guest sizes the + // destination from the view's own length, so viewing the entire + // buffer would both shift the bytes and overrun the destination. + const bytes = new Uint8Array(typedArray.buffer, typedArray.byteOffset, typedArray.byteLength); this.getUint8Array().set(bytes, buffer >>> 0); }, swjs_release: (ref) => { diff --git a/Plugins/PackageToJS/Tests/Inputs/UWASIAdapterTests.mjs b/Plugins/PackageToJS/Tests/Inputs/UWASIAdapterTests.mjs index 94dfab59e..8084c5805 100644 --- a/Plugins/PackageToJS/Tests/Inputs/UWASIAdapterTests.mjs +++ b/Plugins/PackageToJS/Tests/Inputs/UWASIAdapterTests.mjs @@ -1,25 +1,72 @@ import assert from "node:assert/strict"; import { test } from "node:test"; -import { MemoryFileSystem, useAll, WASI } from "uwasi"; +import { + MemoryFileSystem, + useArgs, + useClock, + useEnviron, + useMemoryFS, + usePoll, + useProc, + useRandom, + useStdio, + WASI, +} from "uwasi"; import { browserMainThreadSleep, createUwasi, } from "../../Templates/platforms/uwasi.js"; -test("PackageToJS UWASI adapter preserves its host contracts", () => { - const stdout = []; - const stderr = []; - let lineBufferedCalls = 0; +const minimalRuntime = { + WASI, + useStdio, + useArgs, + useEnviron, + useClock, + usePoll, + useProc, + useRandom, +}; +const fileSystemRuntime = { ...minimalRuntime, MemoryFileSystem, useMemoryFS }; +const WASI_ERRNO_NOSYS = 52; + +function recordingLineBuffered() { + const calls = { count: 0 }; const lineBuffered = (writeLine) => { - lineBufferedCalls += 1; + calls.count += 1; return (chunk) => { const line = new TextDecoder().decode(chunk).replace(/\n$/, ""); writeLine(line); }; }; + return { calls, lineBuffered }; +} + +function bindMemory(wasi) { + const memory = new WebAssembly.Memory({ initial: 1 }); + wasi.setInstance({ exports: { memory } }); + return { + view: new DataView(memory.buffer), + bytes: new Uint8Array(memory.buffer), + }; +} + +function writeTo(wasi, { view, bytes }, fd, text) { + const chunk = new TextEncoder().encode(text); + bytes.set(chunk, 64); + view.setUint32(0, 64, true); + view.setUint32(4, chunk.length, true); + assert.equal(wasi.wasiImport.fd_write(fd, 0, 1, 8), 0); + assert.equal(view.getUint32(8, true), chunk.length); +} + +test("PackageToJS UWASI adapter preserves its host contracts with a file system", () => { + const stdout = []; + const stderr = []; + const { calls, lineBuffered } = recordingLineBuffered(); const { wasi, fileSystem } = createUwasi( - { WASI, MemoryFileSystem, useAll, lineBuffered }, + { ...fileSystemRuntime, lineBuffered }, { modulePath: "main.wasm", onStdoutLine: (line) => stdout.push(line), @@ -27,22 +74,11 @@ test("PackageToJS UWASI adapter preserves its host contracts", () => { withExtractFile: true, }, ); - const memory = new WebAssembly.Memory({ initial: 1 }); - wasi.setInstance({ exports: { memory } }); - - const view = new DataView(memory.buffer); - const bytes = new Uint8Array(memory.buffer); - const write = (fd, chunk) => { - bytes.set(chunk, 64); - view.setUint32(0, 64, true); - view.setUint32(4, chunk.length, true); - assert.equal(wasi.wasiImport.fd_write(fd, 0, 1, 8), 0); - assert.equal(view.getUint32(8, true), chunk.length); - }; + const memory = bindMemory(wasi); - write(1, new TextEncoder().encode("output\n")); - write(2, new TextEncoder().encode("error\n")); - assert.equal(lineBufferedCalls, 2); + writeTo(wasi, memory, 1, "output\n"); + writeTo(wasi, memory, 2, "error\n"); + assert.equal(calls.count, 2); assert.deepEqual(stdout, ["output"]); assert.deepEqual(stderr, ["error"]); @@ -53,39 +89,77 @@ test("PackageToJS UWASI adapter preserves its host contracts", () => { ); }); -test("PackageToJS forwards the host sleep policy", (t) => { - t.mock.method(performance, "now", () => 0); - const { wasi } = createUwasi( - { - WASI, - MemoryFileSystem, - useAll, - lineBuffered: (writeLine) => writeLine, - }, +test("PackageToJS UWASI adapter omits the file system by default", () => { + const stdout = []; + const stderr = []; + const { calls, lineBuffered } = recordingLineBuffered(); + const { wasi, fileSystem } = createUwasi( + { ...minimalRuntime, lineBuffered }, { modulePath: "main.wasm", - sleep(milliseconds) { - throw new Error(`cannot block for ${milliseconds}ms`); - }, + onStdoutLine: (line) => stdout.push(line), + onStderrLine: (line) => stderr.push(line), + withExtractFile: true, }, ); - const memory = new WebAssembly.Memory({ initial: 1 }); - wasi.setInstance({ exports: { memory } }); + const memory = bindMemory(wasi); + + writeTo(wasi, memory, 1, "output\n"); + writeTo(wasi, memory, 2, "error\n"); + assert.equal(calls.count, 2); + assert.deepEqual(stdout, ["output"]); + assert.deepEqual(stderr, ["error"]); - const view = new DataView(memory.buffer); - view.setBigUint64(0, 0n, true); - view.setUint8(8, 0); - view.setUint32(16, 1, true); - view.setBigUint64(24, 1_000_000n, true); - view.setBigUint64(32, 0n, true); - view.setUint16(40, 0, true); - - assert.throws( - () => wasi.wasiImport.poll_oneoff(0, 128, 1, 256), - /cannot block for 1ms/, + assert.equal(fileSystem, undefined); + assert.equal("extractFile" in wasi, false); + assert.equal(wasi.wasiImport.fd_prestat_get(3, 0), 8); + assert.equal( + wasi.wasiImport.path_open(3, 0, 0, 0, 0, 0n, 0n, 0, 0), + WASI_ERRNO_NOSYS, ); + for (const name of [ + "args_get", + "environ_get", + "clock_time_get", + "poll_oneoff", + "proc_exit", + "random_get", + ]) { + assert.ok(wasi.wasiImport[name].length > 0, `${name} must be provided`); + } }); +for (const [name, runtime] of [ + ["minimal", minimalRuntime], + ["file system", fileSystemRuntime], +]) { + test(`PackageToJS forwards the host sleep policy (${name})`, (t) => { + t.mock.method(performance, "now", () => 0); + const { wasi } = createUwasi( + { ...runtime, lineBuffered: (writeLine) => writeLine }, + { + modulePath: "main.wasm", + sleep(milliseconds) { + throw new Error(`cannot block for ${milliseconds}ms`); + }, + }, + ); + const { view } = bindMemory(wasi); + + view.setBigUint64(0, 0n, true); + view.setUint8(8, 0); + view.setUint32(16, 1, true); + view.setBigUint64(24, 1_000_000n, true); + view.setBigUint64(32, 0n, true); + view.setUint16(40, 0, true); + + assert.throws( + () => wasi.wasiImport.poll_oneoff(0, 128, 1, 256), + /cannot block for 1ms/, + ); + }); +} + test("PackageToJS blocks waits only on the browser main thread", () => { assert.equal(browserMainThreadSleep(), undefined); diff --git a/Plugins/PackageToJS/Tests/PackagingPlannerTests.swift b/Plugins/PackageToJS/Tests/PackagingPlannerTests.swift index 2341f59af..d94e672bc 100644 --- a/Plugins/PackageToJS/Tests/PackagingPlannerTests.swift +++ b/Plugins/PackageToJS/Tests/PackagingPlannerTests.swift @@ -52,27 +52,31 @@ import Testing @Test(arguments: [ ( variant: "debug", configuration: "debug", noOptimize: false, - debugInfoFormat: DebugInfoFormat.none, wasiRuntime: WASIRuntime.browserWASIShim + debugInfoFormat: DebugInfoFormat.none, wasiRuntime: WASIRuntime.browserWASIShim, enableCodeCoverage: false ), ( variant: "debug_uwasi", configuration: "debug", noOptimize: false, - debugInfoFormat: DebugInfoFormat.none, wasiRuntime: WASIRuntime.uwasi + debugInfoFormat: DebugInfoFormat.none, wasiRuntime: WASIRuntime.uwasi, enableCodeCoverage: false + ), + ( + variant: "debug_uwasi_coverage", configuration: "debug", noOptimize: false, + debugInfoFormat: DebugInfoFormat.none, wasiRuntime: WASIRuntime.uwasi, enableCodeCoverage: true ), ( variant: "release", configuration: "release", noOptimize: false, - debugInfoFormat: DebugInfoFormat.none, wasiRuntime: WASIRuntime.browserWASIShim + debugInfoFormat: DebugInfoFormat.none, wasiRuntime: WASIRuntime.browserWASIShim, enableCodeCoverage: false ), ( variant: "release_no_optimize", configuration: "release", noOptimize: true, - debugInfoFormat: DebugInfoFormat.none, wasiRuntime: WASIRuntime.browserWASIShim + debugInfoFormat: DebugInfoFormat.none, wasiRuntime: WASIRuntime.browserWASIShim, enableCodeCoverage: false ), ( variant: "release_dwarf", configuration: "release", noOptimize: false, - debugInfoFormat: DebugInfoFormat.dwarf, wasiRuntime: WASIRuntime.browserWASIShim + debugInfoFormat: DebugInfoFormat.dwarf, wasiRuntime: WASIRuntime.browserWASIShim, enableCodeCoverage: false ), ( variant: "release_name", configuration: "release", noOptimize: false, - debugInfoFormat: DebugInfoFormat.name, wasiRuntime: WASIRuntime.browserWASIShim + debugInfoFormat: DebugInfoFormat.name, wasiRuntime: WASIRuntime.browserWASIShim, enableCodeCoverage: false ), ]) func planBuild( @@ -80,10 +84,12 @@ import Testing configuration: String, noOptimize: Bool, debugInfoFormat: PackageToJS.DebugInfoFormat, - wasiRuntime: WASIRuntime + wasiRuntime: WASIRuntime, + enableCodeCoverage: Bool ) throws { var options = PackageToJS.PackageOptions() options.wasiRuntime = wasiRuntime + options.enableCodeCoverage = enableCodeCoverage let system = TestPackagingSystem() let planner = PackagingPlanner( options: options, diff --git a/Plugins/PackageToJS/Tests/TemplatesTests.swift b/Plugins/PackageToJS/Tests/TemplatesTests.swift index cc2b4d2a0..81240658b 100644 --- a/Plugins/PackageToJS/Tests/TemplatesTests.swift +++ b/Plugins/PackageToJS/Tests/TemplatesTests.swift @@ -17,12 +17,14 @@ import Foundation /// `npx tsc -p Templates/tsconfig.json` /// Test both WASI runtimes in node and browser platform variants. @Test(arguments: [ - (platform: "node", runtime: "browser-wasi-shim", sharedMemory: false), - (platform: "browser", runtime: "browser-wasi-shim", sharedMemory: false), - (platform: "node", runtime: "uwasi", sharedMemory: false), - (platform: "browser", runtime: "uwasi", sharedMemory: true), + (platform: "node", runtime: "browser-wasi-shim", sharedMemory: false, filesystem: false), + (platform: "browser", runtime: "browser-wasi-shim", sharedMemory: false, filesystem: false), + (platform: "node", runtime: "uwasi", sharedMemory: false, filesystem: false), + (platform: "node", runtime: "uwasi", sharedMemory: false, filesystem: true), + (platform: "browser", runtime: "uwasi", sharedMemory: true, filesystem: false), + (platform: "browser", runtime: "uwasi", sharedMemory: false, filesystem: true), ]) - func tscCheck(platform: String, runtime: String, sharedMemory: Bool) throws { + func tscCheck(platform: String, runtime: String, sharedMemory: Bool, filesystem: Bool) throws { // 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( @@ -41,6 +43,7 @@ import Foundation "IS_WASI": true, "USE_WASI_CDN": false, "USE_UWASI": runtime == "uwasi", + "USE_UWASI_FILESYSTEM": runtime == "uwasi" && filesystem, "HAS_BRIDGE": false, "HAS_IMPORTS": false, "TARGET_DEFAULT_PLATFORM_NODE": platform == "node", @@ -78,6 +81,11 @@ import Foundation ) let expectedImport = runtime == "uwasi" ? "from 'uwasi'" : "from '@bjorn3/browser_wasi_shim'" #expect(platformSource.contains(expectedImport)) + if runtime == "uwasi" { + #expect(!platformSource.contains("useAll")) + #expect(platformSource.contains("useStdio")) + #expect(platformSource.contains("MemoryFileSystem") == (platform == "node" && filesystem)) + } let manifestData = try Data(contentsOf: destination.appending(path: "package.json")) let manifest = try #require( diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_debug.json b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_debug.json index a21b94fd6..5ac062bc4 100644 --- a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_debug.json +++ b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_debug.json @@ -46,7 +46,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -63,7 +63,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -80,7 +80,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -97,7 +97,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -127,7 +127,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/package.json", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json" @@ -155,7 +155,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -172,7 +172,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -189,7 +189,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.worker.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -206,7 +206,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -223,7 +223,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -240,7 +240,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -257,7 +257,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_debug_uwasi.json b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_debug_uwasi.json index 0948e2b74..b75adacfb 100644 --- a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_debug_uwasi.json +++ b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_debug_uwasi.json @@ -46,7 +46,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -63,7 +63,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -80,7 +80,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -97,7 +97,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -127,7 +127,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/package.json", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json" @@ -155,7 +155,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -172,7 +172,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -189,7 +189,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.worker.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -206,7 +206,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -223,7 +223,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -240,7 +240,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/uwasi.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -257,7 +257,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -274,7 +274,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_debug_uwasi_coverage.json b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_debug_uwasi_coverage.json new file mode 100644 index 000000000..c503152db --- /dev/null +++ b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_debug_uwasi_coverage.json @@ -0,0 +1,311 @@ +[ + { + "attributes" : [ + "silent" + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH" + ], + "output" : "$INTERMEDIATES", + "wants" : [ + + ] + }, + { + "attributes" : [ + + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH", + "$WASM_PRODUCT_ARTIFACT" + ], + "output" : "$INTERMEDIATES\/wasm-imports.json", + "wants" : [ + "$INTERMEDIATES" + ] + }, + { + "attributes" : [ + "silent" + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH" + ], + "output" : "$OUTPUT", + "wants" : [ + + ] + }, + { + "attributes" : [ + + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH", + "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/index.d.ts", + "$INTERMEDIATES\/wasm-imports.json" + ], + "output" : "$OUTPUT\/index.d.ts", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjp0cnVlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "wants" : [ + "$OUTPUT", + "$INTERMEDIATES\/wasm-imports.json", + "$OUTPUT\/platforms" + ] + }, + { + "attributes" : [ + + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH", + "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/index.js", + "$INTERMEDIATES\/wasm-imports.json" + ], + "output" : "$OUTPUT\/index.js", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjp0cnVlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "wants" : [ + "$OUTPUT", + "$INTERMEDIATES\/wasm-imports.json", + "$OUTPUT\/platforms" + ] + }, + { + "attributes" : [ + + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH", + "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/instantiate.d.ts", + "$INTERMEDIATES\/wasm-imports.json" + ], + "output" : "$OUTPUT\/instantiate.d.ts", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjp0cnVlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "wants" : [ + "$OUTPUT", + "$INTERMEDIATES\/wasm-imports.json", + "$OUTPUT\/platforms" + ] + }, + { + "attributes" : [ + + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH", + "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/instantiate.js", + "$INTERMEDIATES\/wasm-imports.json" + ], + "output" : "$OUTPUT\/instantiate.js", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjp0cnVlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "wants" : [ + "$OUTPUT", + "$INTERMEDIATES\/wasm-imports.json", + "$OUTPUT\/platforms" + ] + }, + { + "attributes" : [ + + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH", + "$WASM_PRODUCT_ARTIFACT" + ], + "output" : "$OUTPUT\/main.wasm", + "wants" : [ + "$OUTPUT" + ] + }, + { + "attributes" : [ + + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH", + "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/package.json", + "$INTERMEDIATES\/wasm-imports.json" + ], + "output" : "$OUTPUT\/package.json", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjp0cnVlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "wants" : [ + "$OUTPUT", + "$INTERMEDIATES\/wasm-imports.json" + ] + }, + { + "attributes" : [ + "silent" + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH" + ], + "output" : "$OUTPUT\/platforms", + "wants" : [ + + ] + }, + { + "attributes" : [ + + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH", + "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/platforms\/browser.d.ts", + "$INTERMEDIATES\/wasm-imports.json" + ], + "output" : "$OUTPUT\/platforms\/browser.d.ts", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjp0cnVlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "wants" : [ + "$OUTPUT", + "$INTERMEDIATES\/wasm-imports.json", + "$OUTPUT\/platforms" + ] + }, + { + "attributes" : [ + + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH", + "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/platforms\/browser.js", + "$INTERMEDIATES\/wasm-imports.json" + ], + "output" : "$OUTPUT\/platforms\/browser.js", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjp0cnVlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "wants" : [ + "$OUTPUT", + "$INTERMEDIATES\/wasm-imports.json", + "$OUTPUT\/platforms" + ] + }, + { + "attributes" : [ + + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH", + "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/platforms\/browser.worker.js", + "$INTERMEDIATES\/wasm-imports.json" + ], + "output" : "$OUTPUT\/platforms\/browser.worker.js", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjp0cnVlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "wants" : [ + "$OUTPUT", + "$INTERMEDIATES\/wasm-imports.json", + "$OUTPUT\/platforms" + ] + }, + { + "attributes" : [ + + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH", + "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/platforms\/node.d.ts", + "$INTERMEDIATES\/wasm-imports.json" + ], + "output" : "$OUTPUT\/platforms\/node.d.ts", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjp0cnVlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "wants" : [ + "$OUTPUT", + "$INTERMEDIATES\/wasm-imports.json", + "$OUTPUT\/platforms" + ] + }, + { + "attributes" : [ + + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH", + "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/platforms\/node.js", + "$INTERMEDIATES\/wasm-imports.json" + ], + "output" : "$OUTPUT\/platforms\/node.js", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjp0cnVlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "wants" : [ + "$OUTPUT", + "$INTERMEDIATES\/wasm-imports.json", + "$OUTPUT\/platforms" + ] + }, + { + "attributes" : [ + + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH", + "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/platforms\/uwasi.js", + "$INTERMEDIATES\/wasm-imports.json" + ], + "output" : "$OUTPUT\/platforms\/uwasi.js", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjp0cnVlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "wants" : [ + "$OUTPUT", + "$INTERMEDIATES\/wasm-imports.json", + "$OUTPUT\/platforms" + ] + }, + { + "attributes" : [ + + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH", + "$SELF_PACKAGE\/Sources\/JavaScriptKit\/Runtime\/index.d.ts", + "$INTERMEDIATES\/wasm-imports.json" + ], + "output" : "$OUTPUT\/runtime.d.ts", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjp0cnVlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "wants" : [ + "$OUTPUT", + "$INTERMEDIATES\/wasm-imports.json", + "$OUTPUT\/platforms" + ] + }, + { + "attributes" : [ + + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH", + "$SELF_PACKAGE\/Sources\/JavaScriptKit\/Runtime\/index.mjs", + "$INTERMEDIATES\/wasm-imports.json" + ], + "output" : "$OUTPUT\/runtime.js", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjp0cnVlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "wants" : [ + "$OUTPUT", + "$INTERMEDIATES\/wasm-imports.json", + "$OUTPUT\/platforms" + ] + }, + { + "attributes" : [ + "phony", + "silent" + ], + "inputs" : [ + + ], + "output" : "all", + "wants" : [ + "$OUTPUT\/main.wasm", + "$INTERMEDIATES\/wasm-imports.json", + "$OUTPUT\/package.json", + "$OUTPUT\/index.js", + "$OUTPUT\/index.d.ts", + "$OUTPUT\/instantiate.js", + "$OUTPUT\/instantiate.d.ts", + "$OUTPUT\/platforms\/browser.js", + "$OUTPUT\/platforms\/browser.d.ts", + "$OUTPUT\/platforms\/browser.worker.js", + "$OUTPUT\/platforms\/node.js", + "$OUTPUT\/platforms\/node.d.ts", + "$OUTPUT\/runtime.js", + "$OUTPUT\/runtime.d.ts", + "$OUTPUT\/platforms\/uwasi.js" + ] + } +] \ No newline at end of file diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release.json b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release.json index d2f0d0f38..7a881a621 100644 --- a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release.json +++ b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release.json @@ -60,7 +60,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -77,7 +77,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -94,7 +94,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -111,7 +111,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -142,7 +142,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/package.json", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json" @@ -170,7 +170,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -187,7 +187,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -204,7 +204,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.worker.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -221,7 +221,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -238,7 +238,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -255,7 +255,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -272,7 +272,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_dwarf.json b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_dwarf.json index a21b94fd6..5ac062bc4 100644 --- a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_dwarf.json +++ b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_dwarf.json @@ -46,7 +46,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -63,7 +63,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -80,7 +80,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -97,7 +97,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -127,7 +127,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/package.json", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json" @@ -155,7 +155,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -172,7 +172,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -189,7 +189,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.worker.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -206,7 +206,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -223,7 +223,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -240,7 +240,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -257,7 +257,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_name.json b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_name.json index d2f0d0f38..7a881a621 100644 --- a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_name.json +++ b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_name.json @@ -60,7 +60,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -77,7 +77,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -94,7 +94,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -111,7 +111,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -142,7 +142,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/package.json", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json" @@ -170,7 +170,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -187,7 +187,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -204,7 +204,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.worker.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -221,7 +221,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -238,7 +238,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -255,7 +255,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -272,7 +272,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", 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 a21b94fd6..5ac062bc4 100644 --- a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_no_optimize.json +++ b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_no_optimize.json @@ -46,7 +46,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -63,7 +63,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -80,7 +80,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -97,7 +97,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -127,7 +127,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/package.json", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json" @@ -155,7 +155,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -172,7 +172,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -189,7 +189,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.worker.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -206,7 +206,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -223,7 +223,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -240,7 +240,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -257,7 +257,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planTestBuild.json b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planTestBuild.json index 3c4029927..e9a0b9fea 100644 --- a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planTestBuild.json +++ b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planTestBuild.json @@ -72,7 +72,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/bin\/test.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -89,7 +89,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -106,7 +106,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -123,7 +123,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -140,7 +140,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -170,7 +170,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/package.json", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json" @@ -198,7 +198,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -215,7 +215,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -232,7 +232,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.worker.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -249,7 +249,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -266,7 +266,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -283,7 +283,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -300,7 +300,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -317,7 +317,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/test.browser.html", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -334,7 +334,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/test.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -351,7 +351,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/test.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", diff --git a/Runtime/src/index.ts b/Runtime/src/index.ts index 879774a7d..e05bf712e 100644 --- a/Runtime/src/index.ts +++ b/Runtime/src/index.ts @@ -763,7 +763,16 @@ export class SwiftRuntime { swjs_load_typed_array: (ref: ref, buffer: pointer) => { const memory = this.memory; const typedArray = memory.getObject(ref); - const bytes = new Uint8Array(typedArray.buffer); + // Copy only the window the view describes. `typedArray.buffer` + // is the whole backing `ArrayBuffer`, which may be larger than + // the view and may start before it; the guest sizes the + // destination from the view's own length, so viewing the entire + // buffer would both shift the bytes and overrun the destination. + const bytes = new Uint8Array( + typedArray.buffer, + typedArray.byteOffset, + typedArray.byteLength, + ); this.getUint8Array().set(bytes, buffer >>> 0); }, diff --git a/Runtime/test/load-typed-array.test.ts b/Runtime/test/load-typed-array.test.ts new file mode 100644 index 000000000..724aa23fa --- /dev/null +++ b/Runtime/test/load-typed-array.test.ts @@ -0,0 +1,107 @@ +import { describe, expect, test } from "vitest"; +import { SwiftRuntime } from "../src/index.js"; + +// `swjs_load_typed_array` must copy only the window a TypedArray view describes, +// not its whole backing `ArrayBuffer`. The guest sizes the destination from the +// view's own `length`/`byteLength`, so copying the entire buffer both shifts the +// bytes (a view with a non-zero `byteOffset` lands offset in the guest) and +// writes past the end of the destination. +const DESTINATION = 1024; + +function makeRuntime(): { runtime: SwiftRuntime; memory: WebAssembly.Memory } { + const memory = new WebAssembly.Memory({ initial: 1 }); + const runtime = new SwiftRuntime(); + runtime.setInstance({ + exports: { + memory, + swjs_library_version: () => 708, + }, + } as unknown as WebAssembly.Instance); + return { runtime, memory }; +} + +describe("swjs_load_typed_array respects the view's window", () => { + test("copies a Uint8Array view from its byteOffset", () => { + const { runtime, memory } = makeRuntime(); + const backing = new ArrayBuffer(32); + new Uint8Array(backing).set( + Array.from({ length: 32 }, (_, i) => 0xa0 + i), + ); + const view = new Uint8Array(backing, 8, 8); + + const space = (runtime as any).memory; + const imports = runtime.wasmImports as any; + imports.swjs_load_typed_array(space.retain(view), DESTINATION); + + const guest = new Uint8Array(memory.buffer); + expect( + Array.from(guest.subarray(DESTINATION, DESTINATION + 8)), + ).toEqual(Array.from(view)); + }); + + test("does not write past the end of the view", () => { + const { runtime, memory } = makeRuntime(); + const backing = new ArrayBuffer(32); + new Uint8Array(backing).fill(0xff); + const view = new Uint8Array(backing, 8, 8); + + // Fill the guest memory around the destination with a sentinel so any + // byte written beyond the view's `byteLength` is visible. + const guest = new Uint8Array(memory.buffer); + guest.fill(0x5a, DESTINATION, DESTINATION + 64); + + const space = (runtime as any).memory; + const imports = runtime.wasmImports as any; + imports.swjs_load_typed_array(space.retain(view), DESTINATION); + + expect( + Array.from(guest.subarray(DESTINATION + 8, DESTINATION + 64)), + ).toEqual(new Array(56).fill(0x5a)); + }); + + test("copies a multi-byte element view from its byteOffset", () => { + const { runtime, memory } = makeRuntime(); + const backing = new ArrayBuffer(32); + new Int32Array(backing).set([1, 2, 3, 4, 5, 6, 7, 8]); + const view = new Int32Array(backing, 8, 4); + + const space = (runtime as any).memory; + const imports = runtime.wasmImports as any; + imports.swjs_load_typed_array(space.retain(view), DESTINATION); + + const guest = new Int32Array(memory.buffer, DESTINATION, 4); + expect(Array.from(guest)).toEqual([3, 4, 5, 6]); + }); + + test("copies a DataView from its byteOffset", () => { + const { runtime, memory } = makeRuntime(); + const backing = new ArrayBuffer(32); + new Uint8Array(backing).set( + Array.from({ length: 32 }, (_, i) => 0xa0 + i), + ); + const view = new DataView(backing, 8, 8); + + const space = (runtime as any).memory; + const imports = runtime.wasmImports as any; + imports.swjs_load_typed_array(space.retain(view), DESTINATION); + + const guest = new Uint8Array(memory.buffer); + expect( + Array.from(guest.subarray(DESTINATION, DESTINATION + 8)), + ).toEqual(Array.from(new Uint8Array(backing, 8, 8))); + }); + + test("still copies a whole-buffer view unchanged", () => { + const { runtime, memory } = makeRuntime(); + const view = new Uint8Array([1, 2, 3, 4, 5]); + + const space = (runtime as any).memory; + const imports = runtime.wasmImports as any; + imports.swjs_load_typed_array(space.retain(view), DESTINATION); + + const guest = new Uint8Array(memory.buffer); + expect( + Array.from(guest.subarray(DESTINATION, DESTINATION + 5)), + ).toEqual([1, 2, 3, 4, 5]); + }); +}); diff --git a/Sources/JavaScriptEventLoop/JavaScriptEventLoop+YieldInterval.swift b/Sources/JavaScriptEventLoop/JavaScriptEventLoop+YieldInterval.swift new file mode 100644 index 000000000..dbcd30b9f --- /dev/null +++ b/Sources/JavaScriptEventLoop/JavaScriptEventLoop+YieldInterval.swift @@ -0,0 +1,103 @@ +// Clock and host task scheduling for `JavaScriptEventLoop.yieldInterval`. + +import JavaScriptKit +import _Concurrency + +#if compiler(>=5.5) + +@available(macOS 14.0, iOS 17.0, watchOS 10.0, tvOS 17.0, *) +extension JavaScriptEventLoop { + + #if hasFeature(Embedded) + // `ContinuousClock` is unavailable in Embedded Swift; use `performance.now()` in milliseconds. + typealias DrainInstant = Double + + func drainClockNow() -> DrainInstant { + if performanceNow == nil { + let performance = JSObject.global.performance.object! + performanceNow = (performance, performance.now.function!) + } + return performanceNow!.now(this: performanceNow!.performance).number! + } + + func drainElapsed(since start: DrainInstant) -> Duration { + .milliseconds(drainClockNow() - start) + } + #else + typealias DrainInstant = ContinuousClock.Instant + + func drainClockNow() -> DrainInstant { + ContinuousClock.now + } + + func drainElapsed(since start: DrainInstant) -> Duration { + start.duration(to: .now) + } + #endif + + /// Runs `body` in a new JavaScript task via `setImmediate`, `MessageChannel`, or `setTimeout`. + func queueHostTask(_ body: @escaping () -> Void) { + if hostTaskScheduler == nil { + hostTaskScheduler = Self.makeHostTaskScheduler() + } + hostTaskScheduler!(body) + } + + private static func makeHostTaskScheduler() -> (@escaping () -> Void) -> Void { + let global = JSObject.global + if let setImmediate = global.setImmediate.function { + return { body in + _ = setImmediate( + JSOneshotClosure { _ in + body() + return .undefined + } + ) + } + } + if let messageChannel = global.MessageChannel.function { + // Unlike nested `setTimeout` calls, messages are not clamped to 4 ms. + let channel = messageChannel.new(arguments: [JSValue]()) + let sender = channel.port1.object! + let postMessage = sender.postMessage.function! + let pending = PendingHostTasks() + let receiver = JSClosure { _ in + pending.runAll() + return .undefined + } + channel.port2.object!.onmessage = .object(receiver) + return { body in + pending.bodies.append(body) + // Keep `receiver` alive as long as the scheduler. + withExtendedLifetime(receiver) { + _ = postMessage(this: sender, JSValue.undefined) + } + } + } + let setTimeout = global.setTimeout.function! + return { body in + _ = setTimeout( + JSOneshotClosure { _ in + body() + return .undefined + }, + 0 + ) + } + } +} + +/// Bodies waiting for the next `MessageChannel` message. +private final class PendingHostTasks { + var bodies: [() -> Void] = [] + + func runAll() { + let bodies = self.bodies + self.bodies = [] + for body in bodies { + body() + } + } +} + +#endif diff --git a/Sources/JavaScriptEventLoop/JavaScriptEventLoop.swift b/Sources/JavaScriptEventLoop/JavaScriptEventLoop.swift index ead6157bf..ffca27795 100644 --- a/Sources/JavaScriptEventLoop/JavaScriptEventLoop.swift +++ b/Sources/JavaScriptEventLoop/JavaScriptEventLoop.swift @@ -48,6 +48,26 @@ public final class JavaScriptEventLoop: SerialExecutor, @unchecked Sendable { /// A function that invokes a given closure after a specified number of milliseconds. public var setTimeout: (Double, @escaping () -> Void) -> Void + /// The maximum time to run queued jobs before yielding to the JavaScript event loop. + /// + /// By default (`nil`), all queued jobs run in a single microtask, so long-running async work + /// blocks rendering, input, and other JavaScript tasks until it completes. When set, the + /// remaining jobs continue in a new JavaScript task after the interval, at the cost of some + /// latency. A single job is never interrupted. + /// + /// ```swift + /// JavaScriptEventLoop.shared.yieldInterval = .milliseconds(16) + /// ``` + public var yieldInterval: Duration? + + /// Continues a drain that stopped at ``yieldInterval``. Created lazily. + var hostTaskScheduler: ((@escaping () -> Void) -> Void)? + + #if hasFeature(Embedded) + /// Cached `performance.now` used by ``yieldInterval`` in Embedded Swift. + var performanceNow: (performance: JSObject, now: JSFunction)? + #endif + /// A mutable state to manage internal job queue /// Note that this should be guarded atomically when supporting multi-threaded environment. var queueState = QueueState() diff --git a/Sources/JavaScriptEventLoop/JobQueue.swift b/Sources/JavaScriptEventLoop/JobQueue.swift index a0f2c4bbb..8ca74e1c8 100644 --- a/Sources/JavaScriptEventLoop/JobQueue.swift +++ b/Sources/JavaScriptEventLoop/JobQueue.swift @@ -1,6 +1,6 @@ // This file contains the job queue implementation which re-order jobs based on their priority. -// The current implementation is much simple to be easily debugged, but should be re-implemented -// using priority queue ideally. +// Jobs form runs, one per priority in descending order, FIFO within a run. The first job of each +// run points to its last job, so an insert steps over whole runs. import _Concurrency import _CJavaScriptEventLoop @@ -19,15 +19,18 @@ extension JavaScriptEventLoop { func insertJobQueue(job newJob: UnownedJob) { withUnsafeMutablePointer(to: &queueState.headJob) { headJobPtr in var position: UnsafeMutablePointer = headJobPtr - while let cur = position.pointee { - if cur.rawPriority < newJob.rawPriority { - newJob.nextInQueue().pointee = cur - position.pointee = newJob + while let runHead = position.pointee, runHead.rawPriority >= newJob.rawPriority { + let runTail = runHead.lastInRun().pointee! + if runHead.rawPriority == newJob.rawPriority { + newJob.nextInQueue().pointee = runTail.nextInQueue().pointee + runTail.nextInQueue().pointee = newJob + runHead.lastInRun().pointee = newJob return } - position = cur.nextInQueue() + position = runTail.nextInQueue() } - newJob.nextInQueue().pointee = nil + newJob.nextInQueue().pointee = position.pointee + newJob.lastInRun().pointee = newJob position.pointee = newJob } @@ -43,12 +46,37 @@ extension JavaScriptEventLoop { func runAllJobs() { assert(queueState.isSpinning) + // The clock is only read while `yieldInterval` is set. + var start: DrainInstant? = yieldInterval == nil ? nil : drainClockNow() + // A clock read costs more than a small job. Read it every `clockStride` jobs, and double + // the stride (up to 256) while the drain is far from the interval. + var clockStride = 1 + var jobsUntilClockRead = 1 while let job = self.claimNextFromQueue() { #if compiler(>=5.9) job.runSynchronously(on: self.asUnownedSerialExecutor()) #else job._runSynchronously(on: self.asUnownedSerialExecutor()) #endif + + if let yieldInterval, queueState.headJob != nil { + if let start { + jobsUntilClockRead -= 1 + if jobsUntilClockRead > 0 { continue } + let elapsed = drainElapsed(since: start) + if elapsed >= yieldInterval { + // Keep `isSpinning` set so new jobs wait for the continuation. + queueHostTask { self.runAllJobs() } + return + } + if elapsed * 4 < yieldInterval { + clockStride = min(clockStride * 2, 256) + } + jobsUntilClockRead = clockStride + } else { + start = drainClockNow() + } + } } queueState.isSpinning = false @@ -56,7 +84,14 @@ extension JavaScriptEventLoop { func claimNextFromQueue() -> UnownedJob? { if let job = self.queueState.headJob { - self.queueState.headJob = job.nextInQueue().pointee + let nextJob = job.nextInQueue().pointee + if let nextJob { + let runTail = job.lastInRun().pointee! + if !runTail.isSameJob(as: job) { + nextJob.lastInRun().pointee = runTail + } + } + self.queueState.headJob = nextJob return job } return nil @@ -82,6 +117,16 @@ extension UnownedJob { } } + /// The last job of the run. Valid only on the first job of a run. + fileprivate func lastInRun() -> UnsafeMutablePointer { + return withUnsafeMutablePointer(to: &asImpl().pointee.SchedulerPrivate.1) { rawLastJobPtr in + UnsafeMutableRawPointer(rawLastJobPtr).bindMemory(to: UnownedJob?.self, capacity: 1) + } + } + + fileprivate func isSameJob(as other: UnownedJob) -> Bool { + asImpl() == other.asImpl() + } } private struct JobFlags { diff --git a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift index dd5e1e970..0b7fc3120 100644 --- a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift +++ b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift @@ -969,11 +969,14 @@ extension JSValue: _BridgedSwiftStackType { } @_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) + // Retain inside `withRawJSValue` so `self` still owns the JS reference. + withRawJSValue { raw in + let kind = Int32(raw.kind.rawValue) + let payload1 = Int32(bitPattern: raw.payload1) + _swift_js_push_i32(kind) + _swift_js_push_i32(Self.bridgeJSRetainPayloadIfNeeded(kind: kind, payload1: payload1)) + _swift_js_push_f64(raw.payload2) + } } @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (kind: Int32, payload1: Int32, payload2: Double) { @@ -986,19 +989,18 @@ extension JSValue: _BridgedSwiftStackType { } } + /// Takes ownership of the payload reference that JavaScript retained when it lowered the value. @_spi(BridgeJS) public static func bridgeJSLiftParameter( _ kind: Int32, _ payload1: Int32, _ payload2: Double ) -> JSValue { - let retainedPayload1 = bridgeJSRetainPayloadIfNeeded(kind: kind, payload1: payload1) - guard let kindEnum = JavaScriptValueKind(rawValue: UInt32(kind)) else { fatalError("Invalid JSValue kind: \(kind)") } let rawValue = RawJSValue( kind: kindEnum, - payload1: JavaScriptPayload1(UInt32(bitPattern: retainedPayload1)), + payload1: JavaScriptPayload1(UInt32(bitPattern: payload1)), payload2: payload2 ) return rawValue.jsValue 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 4c91ba749..5bc907137 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 @@ -217,6 +217,8 @@ struct AnyCounter: Counter, _BridgedSwiftProtocolWrapper { | Swift Feature | Status | |:--------------|:-------| | Method requirements: `func foo(_ param: String?) -> FooClass?` | ✅ | +| Throwing method requirements: `func foo() throws(JSException)` | ✅ | +| Async method requirements: `func foo() async throws(JSException) -> Bar` | ✅ | | Property requirements: `var property: Type { get }` / `var property: Type { get set }` | ✅ | | Optional parameters / return values in methods | ✅ | | Optional properties | ✅ | diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/JavaScript-Interop-Cheat-Sheet.md b/Sources/JavaScriptKit/Documentation.docc/Articles/JavaScript-Interop-Cheat-Sheet.md index 4280a4637..b554e5a7b 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/JavaScript-Interop-Cheat-Sheet.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/JavaScript-Interop-Cheat-Sheet.md @@ -373,4 +373,5 @@ let swiftPromise = JSPromise.async { - 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``. +- Long-running async work blocks rendering and input until it completes. Set `JavaScriptEventLoop.shared.yieldInterval` (for example, `.milliseconds(16)`) to yield to the JavaScript event loop between jobs. diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/Package-Output-Structure.md b/Sources/JavaScriptKit/Documentation.docc/Articles/Package-Output-Structure.md index 6f3d30ac9..b0b84469a 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/Package-Output-Structure.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/Package-Output-Structure.md @@ -128,6 +128,12 @@ PackageToJS uses `@bjorn3/browser_wasi_shim` for WASI packages by default. Pass `--wasi-runtime uwasi` to generate both platform wrappers against `uwasi`; this also adds `platforms/uwasi.js` to the package. +The `uwasi` wrappers import only the stdio, args, environ, clock, poll, proc and random +features, so file syscalls return `ENOSYS` and bundlers can drop `uwasi`'s file system. +With `--enable-code-coverage`, the Node wrapper adds an in-memory file system so the +test runner can read the coverage profile. To give an application a file system, pass +your own `wasi` object to `instantiate`. + The browser main-thread setup rejects blocking `poll_oneoff` clock waits instead of freezing the page. Run guests that require blocking waits in a worker. Node and browser workers use `uwasi`'s blocking implementation. diff --git a/Tests/BridgeJSRuntimeTests/ArraySupportTests.swift b/Tests/BridgeJSRuntimeTests/ArraySupportTests.swift index 90c4b138e..3ff17cbfa 100644 --- a/Tests/BridgeJSRuntimeTests/ArraySupportTests.swift +++ b/Tests/BridgeJSRuntimeTests/ArraySupportTests.swift @@ -195,7 +195,7 @@ final class ArraySupportTests: XCTestCase { @JS static func roundTripStructArray(_ v: [DataPoint]) -> [DataPoint] { v } @JS static func roundTripSwiftClassArray(_ v: [Greeter]) -> [Greeter] { v } @JS static func roundTripNamespacedSwiftClassArray(_ v: [Utils.Converter]) -> [Utils.Converter] { v } - @JS static func roundTripProtocolArray(_ v: [ArrayElementProtocol]) -> [ArrayElementProtocol] { v } + @JS static func roundTripProtocolArray(_ v: [any ArrayElementProtocol]) -> [any ArrayElementProtocol] { v } @JS static func roundTripJSClassArray(_ v: [ArrayElementObject]) -> [ArrayElementObject] { v } @JS static func roundTripOptionalIntArray(_ v: [Int?]) -> [Int?] { v } diff --git a/Tests/BridgeJSRuntimeTests/AsyncImportTests.swift b/Tests/BridgeJSRuntimeTests/AsyncImportTests.swift index a092d111c..17184c427 100644 --- a/Tests/BridgeJSRuntimeTests/AsyncImportTests.swift +++ b/Tests/BridgeJSRuntimeTests/AsyncImportTests.swift @@ -24,6 +24,8 @@ import JavaScriptKit @JSFunction static func jsAsyncRoundTripOptionalAssociatedValueEnum( _ v: AsyncImportedPayloadResult? ) async throws(JSException) -> AsyncImportedPayloadResult? + @JSFunction static func jsAsyncThrowSynchronously(_ message: String) async throws(JSException) -> Double + @JSFunction static func jsAsyncReturnNonPromise(_ v: Double) async throws(JSException) -> Double } @Suite struct AsyncImportTests { @@ -104,6 +106,19 @@ import JavaScriptKit } } + // MARK: - Non-Promise behavior + + @Test func asyncSynchronousThrowRejects() async throws { + let error = await #expect(throws: JSException.self) { + try await AsyncImportImports.jsAsyncThrowSynchronously("SyncFailure") + } + #expect(error?.thrownValue.object?["message"].string == "SyncFailure") + } + + @Test func asyncNonPromiseReturnResolves() async throws { + try #expect(await AsyncImportImports.jsAsyncReturnNonPromise(42) == 42) + } + // MARK: - Structured return type @Test func fetchWeatherData() async throws { diff --git a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift index 8778c2c8e..a3e60711f 100644 --- a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift +++ b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift @@ -22,6 +22,21 @@ func runJsWorks() -> Void @JS func roundTripString(v: String) -> String { return v } +@JS func describeReservedWordParameters(extension: Int, break: Double, function: Bool, in: String) -> String { + return "\(`extension`):\(`break`):\(function):\(`in`)" +} +@JS func describeBacktickedParameter(_ `in`: String) -> String { + return `in` +} +@JS func describeCollidingParameters(in: Int, _in: Int, instance: Int, swift: String) -> String { + return "\(`in`):\(_in):\(instance):\(swift)" +} +@JS protocol ReservedWordDescriber { + func describe(in: Int, for: String) -> String +} +@JS func describeWithReservedWordDescriber(_ describer: any ReservedWordDescriber) -> String { + return describer.describe(in: 1, for: "for") +} @JS func roundTripSwiftHeapObject(v: Greeter) -> Greeter { return v } @@ -58,6 +73,14 @@ func runJsWorks() -> Void return v } +@JS func makeJSValueString() -> JSValue { + return .string("makeJSValueString") +} + +@JS func makeJSValueObject() -> JSValue { + return .object(JSObject()) +} + @JS func roundTripOptionalJSValue(v: JSValue?) -> JSValue? { return v } @@ -95,6 +118,12 @@ struct TestError: Error { @JS func throwsWithDoubleResult() throws(JSException) -> Double { return 1.0 } @JS func throwsWithSwiftHeapObjectResult() throws(JSException) -> Greeter { return Greeter(name: "Test") } @JS func throwsWithJSObjectResult() throws(JSException) -> JSObject { return JSObject() } +@JS func throwsBeforeJSObjectResult() throws(JSException) -> JSObject { + throw JSException(JSError(message: "JSObjectResultError").jsValue) +} +@JS func throwsBeforeProtocolResult() throws(JSException) -> DataProcessor { + throw JSException(JSError(message: "ProtocolResultError").jsValue) +} @JS func zeroArgAsyncThrows() async throws(JSException) -> String { throw JSException(JSError(message: "ZeroArgAsyncThrowsError").jsValue) @@ -961,14 +990,18 @@ enum GraphOperations { func createOptionalGreeter() -> Greeter? func handleAPIResult(_ result: APIResult?) func getAPIResult() -> APIResult? + func validate(_ value: Int) throws(JSException) -> Int + func loadLabel(_ key: String) async throws(JSException) -> String + func reset() async throws(JSException) + func fetchCount() async -> Int } @JS class DataProcessorManager { @JS var processor: DataProcessor - @JS var backupProcessor: DataProcessor? + @JS var backupProcessor: (any DataProcessor)? - @JS init(processor: DataProcessor) { + @JS init(processor: any DataProcessor) { self.processor = processor self.backupProcessor = nil } @@ -1053,6 +1086,22 @@ enum GraphOperations { @JS func setProcessorAPIResult(_ apiResult: APIResult?) { processor.handleAPIResult(apiResult) } + + @JS func validateProcessorValue(_ value: Int) throws(JSException) -> Int { + return try processor.validate(value) + } + + @JS func loadProcessorLabel(_ key: String) async throws(JSException) -> String { + return try await processor.loadLabel(key) + } + + @JS func resetProcessor() async throws(JSException) { + try await processor.reset() + } + + @JS func fetchProcessorCount() async -> Int { + return await processor.fetchCount() + } } @JS class SwiftDataProcessor: DataProcessor { @@ -1117,6 +1166,25 @@ enum GraphOperations { @JS func getAPIResult() -> APIResult? { return apiResult } + + @JS func validate(_ value: Int) throws(JSException) -> Int { + guard value >= 0 else { + throw JSException(JSError(message: "SwiftDataProcessor rejects negative values").jsValue) + } + return value + } + + @JS func loadLabel(_ key: String) async throws(JSException) -> String { + return "\(label):\(key)" + } + + @JS func reset() async throws(JSException) { + count = 0 + } + + @JS func fetchCount() async -> Int { + return count + } } @JS class ProtocolReturnTests { @@ -1124,7 +1192,7 @@ enum GraphOperations { return SwiftDataProcessor() } - @JS static func createNativeProcessorOptional() -> DataProcessor? { + @JS static func createNativeProcessorOptional() -> (any DataProcessor)? { return SwiftDataProcessor() } @@ -1132,7 +1200,7 @@ enum GraphOperations { return nil } - @JS static func createNativeProcessorArray() -> [DataProcessor] { + @JS static func createNativeProcessorArray() -> [any DataProcessor] { let p1 = SwiftDataProcessor() p1.count = 10 let p2 = SwiftDataProcessor() @@ -1140,7 +1208,7 @@ enum GraphOperations { return [p1, p2] } - @JS static func createNativeProcessorDictionary() -> [String: DataProcessor] { + @JS static func createNativeProcessorDictionary() -> [String: any DataProcessor] { let p1 = SwiftDataProcessor() p1.count = 10 let p2 = SwiftDataProcessor() @@ -1317,12 +1385,12 @@ enum GraphOperations { } @JS func roundtripDataProcessor( - _ callback: @escaping (DataProcessor) -> DataProcessor - ) -> (DataProcessor) -> DataProcessor { + _ callback: @escaping (any DataProcessor) -> any DataProcessor + ) -> (any DataProcessor) -> any DataProcessor { return callback } - @JS func processOptionalDataProcessor(_ callback: (DataProcessor?) -> String) -> String { + @JS func processOptionalDataProcessor(_ callback: ((any DataProcessor)?) -> String) -> String { let processor = SwiftDataProcessor() processor.increment(by: 7) return callback(processor) + " | " + callback(nil) diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index 52799fa7c..8bfe460fc 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -4294,6 +4294,39 @@ fileprivate func bjs_ArrayElementProtocol_value_set_extern(_ jsObject: Int32, _ return bjs_ArrayElementProtocol_value_set_extern(jsObject, newValue) } +extension ReservedWordDescriber where Self: _BridgedSwiftProtocolWrapper { + func describe(`in`: Int, `for`: String) -> String { + let ret0 = `for`.bridgeJSWithLoweredParameter { (forWord0, forWord1, forWord2) in + let inValue = `in`.bridgeJSLowerParameter() + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let ret = bjs_ReservedWordDescriber_describe(jsObjectValue, inValue, forWord0, forWord1, forWord2) + return ret + } + let ret = ret0 + return String.bridgeJSLiftReturn(ret) + } +} + +struct AnyReservedWordDescriber: ReservedWordDescriber, _BridgedSwiftProtocolWrapper { + let jsObject: JSObject + + static func bridgeJSLiftParameter(_ value: Int32) -> Self { + return AnyReservedWordDescriber(jsObject: JSObject(id: UInt32(bitPattern: value))) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ReservedWordDescriber_describe") +fileprivate func bjs_ReservedWordDescriber_describe_extern(_ jsObject: Int32, _ `in`: Int32, _ forWord0: Int32, _ forWord1: Int32, _ forWord2: Int32) -> Int32 +#else +fileprivate func bjs_ReservedWordDescriber_describe_extern(_ jsObject: Int32, _ `in`: Int32, _ forWord0: Int32, _ forWord1: Int32, _ forWord2: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_ReservedWordDescriber_describe(_ jsObject: Int32, _ `in`: Int32, _ forWord0: Int32, _ forWord1: Int32, _ forWord2: Int32) -> Int32 { + return bjs_ReservedWordDescriber_describe_extern(jsObject, `in`, forWord0, forWord1, forWord2) +} + extension DataProcessor where Self: _BridgedSwiftProtocolWrapper { func increment(by amount: Int) -> Void { let amountValue = amount.bridgeJSLowerParameter() @@ -4366,6 +4399,39 @@ extension DataProcessor where Self: _BridgedSwiftProtocolWrapper { return Optional.bridgeJSLiftReturn(ret) } + func validate(_ value: Int) throws(JSException) -> Int { + let valueValue = value.bridgeJSLowerParameter() + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let ret = bjs_DataProcessor_validate(jsObjectValue, valueValue) + if let error = _swift_js_take_exception() { throw error } + return Int.bridgeJSLiftReturn(ret) + } + + func loadLabel(_ key: String) async throws(JSException) -> String { + let resolved = try await _bjs_awaitPromise(makeResolveClosure: { JSTypedClosure<(sending String) -> Void>.sending($0) }, makeRejectClosure: { JSTypedClosure<(sending JSValue) -> Void>.sending($0) }) { resolveRef, rejectRef in + key.bridgeJSWithLoweredParameter { (keyWord0, keyWord1, keyWord2) in + let jsObjectValue = jsObject.bridgeJSLowerParameter() + bjs_DataProcessor_loadLabel(resolveRef, rejectRef, jsObjectValue, keyWord0, keyWord1, keyWord2) + } + } + return resolved + } + + func reset() async throws(JSException) -> Void { + try await _bjs_awaitPromise(makeResolveClosure: { JSTypedClosure<() -> Void>($0) }, makeRejectClosure: { JSTypedClosure<(sending JSValue) -> Void>.sending($0) }) { resolveRef, rejectRef in + let jsObjectValue = jsObject.bridgeJSLowerParameter() + bjs_DataProcessor_reset(resolveRef, rejectRef, jsObjectValue) + } + } + + func fetchCount() async -> Int { + let resolved = try! await _bjs_awaitPromise(makeResolveClosure: { JSTypedClosure<(sending Int) -> Void>.sending($0) }, makeRejectClosure: { JSTypedClosure<(sending JSValue) -> Void>.sending($0) }) { resolveRef, rejectRef in + let jsObjectValue = jsObject.bridgeJSLowerParameter() + bjs_DataProcessor_fetchCount(resolveRef, rejectRef, jsObjectValue) + } + return resolved + } + var count: Int { get { let jsObjectValue = jsObject.bridgeJSLowerParameter() @@ -4634,6 +4700,54 @@ fileprivate func bjs_DataProcessor_getAPIResult_extern(_ jsObject: Int32) -> Int return bjs_DataProcessor_getAPIResult_extern(jsObject) } +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_validate") +fileprivate func bjs_DataProcessor_validate_extern(_ jsObject: Int32, _ value: Int32) -> Int32 +#else +fileprivate func bjs_DataProcessor_validate_extern(_ jsObject: Int32, _ value: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_DataProcessor_validate(_ jsObject: Int32, _ value: Int32) -> Int32 { + return bjs_DataProcessor_validate_extern(jsObject, value) +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_loadLabel") +fileprivate func bjs_DataProcessor_loadLabel_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ jsObject: Int32, _ keyWord0: Int32, _ keyWord1: Int32, _ keyWord2: Int32) -> Void +#else +fileprivate func bjs_DataProcessor_loadLabel_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ jsObject: Int32, _ keyWord0: Int32, _ keyWord1: Int32, _ keyWord2: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_DataProcessor_loadLabel(_ resolveRef: Int32, _ rejectRef: Int32, _ jsObject: Int32, _ keyWord0: Int32, _ keyWord1: Int32, _ keyWord2: Int32) -> Void { + return bjs_DataProcessor_loadLabel_extern(resolveRef, rejectRef, jsObject, keyWord0, keyWord1, keyWord2) +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_reset") +fileprivate func bjs_DataProcessor_reset_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ jsObject: Int32) -> Void +#else +fileprivate func bjs_DataProcessor_reset_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ jsObject: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_DataProcessor_reset(_ resolveRef: Int32, _ rejectRef: Int32, _ jsObject: Int32) -> Void { + return bjs_DataProcessor_reset_extern(resolveRef, rejectRef, jsObject) +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_fetchCount") +fileprivate func bjs_DataProcessor_fetchCount_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ jsObject: Int32) -> Void +#else +fileprivate func bjs_DataProcessor_fetchCount_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ jsObject: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_DataProcessor_fetchCount(_ resolveRef: Int32, _ rejectRef: Int32, _ jsObject: Int32) -> Void { + return bjs_DataProcessor_fetchCount_extern(resolveRef, rejectRef, jsObject) +} + #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_count_get") fileprivate func bjs_DataProcessor_count_get_extern(_ jsObject: Int32) -> Int32 @@ -10243,6 +10357,60 @@ public func _bjs_roundTripString(_ vBytes: Int32, _ vLength: Int32) -> Void { #endif } +@_expose(wasm, "bjs_describeReservedWordParameters") +@_cdecl("bjs_describeReservedWordParameters") +public func _bjs_describeReservedWordParameters(_ `extension`: Int32, _ `break`: Float64, _ function: Int32, _ inBytes: Int32, _ inLength: Int32) -> Void { + #if arch(wasm32) + let `in` = String.bridgeJSLiftParameter(inBytes, inLength) + let function = Bool.bridgeJSLiftParameter(function) + let `break` = Double.bridgeJSLiftParameter(`break`) + let `extension` = Int.bridgeJSLiftParameter(`extension`) + let ret = describeReservedWordParameters(extension: `extension`, break: `break`, function: function, in: `in`) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_describeBacktickedParameter") +@_cdecl("bjs_describeBacktickedParameter") +public func _bjs_describeBacktickedParameter(_ inBytes: Int32, _ inLength: Int32) -> Void { + #if arch(wasm32) + let `in` = String.bridgeJSLiftParameter(inBytes, inLength) + let ret = describeBacktickedParameter(_: `in`) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_describeCollidingParameters") +@_cdecl("bjs_describeCollidingParameters") +public func _bjs_describeCollidingParameters(_ `in`: Int32, _ _in: Int32, _ instance: Int32, _ swiftBytes: Int32, _ swiftLength: Int32) -> Void { + #if arch(wasm32) + let swift = String.bridgeJSLiftParameter(swiftBytes, swiftLength) + let instance = Int.bridgeJSLiftParameter(instance) + let _in = Int.bridgeJSLiftParameter(_in) + let `in` = Int.bridgeJSLiftParameter(`in`) + let ret = describeCollidingParameters(in: `in`, _in: _in, instance: instance, swift: swift) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_describeWithReservedWordDescriber") +@_cdecl("bjs_describeWithReservedWordDescriber") +public func _bjs_describeWithReservedWordDescriber(_ describer: Int32) -> Void { + #if arch(wasm32) + let describer = AnyReservedWordDescriber.bridgeJSLiftParameter(describer) + let ret = describeWithReservedWordDescriber(_: describer) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_roundTripSwiftHeapObject") @_cdecl("bjs_roundTripSwiftHeapObject") public func _bjs_roundTripSwiftHeapObject(_ v: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { @@ -10363,6 +10531,28 @@ public func _bjs_roundTripJSValue(_ vKind: Int32, _ vPayload1: Int32, _ vPayload #endif } +@_expose(wasm, "bjs_makeJSValueString") +@_cdecl("bjs_makeJSValueString") +public func _bjs_makeJSValueString() -> Void { + #if arch(wasm32) + let ret = makeJSValueString() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_makeJSValueObject") +@_cdecl("bjs_makeJSValueObject") +public func _bjs_makeJSValueObject() -> Void { + #if arch(wasm32) + let ret = makeJSValueObject() + 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 { @@ -10625,6 +10815,56 @@ public func _bjs_throwsWithJSObjectResult() -> Int32 { #endif } +@_expose(wasm, "bjs_throwsBeforeJSObjectResult") +@_cdecl("bjs_throwsBeforeJSObjectResult") +public func _bjs_throwsBeforeJSObjectResult() -> Int32 { + #if arch(wasm32) + do { + let ret = try throwsBeforeJSObjectResult() + 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: error.description) + withExtendedLifetime(jsError.jsObject) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } + return 0 + } + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_throwsBeforeProtocolResult") +@_cdecl("bjs_throwsBeforeProtocolResult") +public func _bjs_throwsBeforeProtocolResult() -> Int32 { + #if arch(wasm32) + do { + let ret = _bridgeJSUnwrapProtocolExportable(try throwsBeforeProtocolResult(), "DataProcessor") + return ret.bridgeJSLowerAsProtocolReturn() + } catch let error { + if let error = error.thrownValue.object { + withExtendedLifetime(error) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } else { + let jsError = JSError(message: error.description) + withExtendedLifetime(jsError.jsObject) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } + return 0 + } + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_zeroArgAsyncThrows") @_cdecl("bjs_zeroArgAsyncThrows") public func _bjs_zeroArgAsyncThrows() -> Int32 { @@ -14415,6 +14655,73 @@ public func _bjs_DataProcessorManager_setProcessorAPIResult(_ _self: UnsafeMutab #endif } +@_expose(wasm, "bjs_DataProcessorManager_validateProcessorValue") +@_cdecl("bjs_DataProcessorManager_validateProcessorValue") +public func _bjs_DataProcessorManager_validateProcessorValue(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Int32 { + #if arch(wasm32) + let value = Int.bridgeJSLiftParameter(value) + let _self = DataProcessorManager.bridgeJSLiftParameter(_self) + do { + let ret = try _self.validateProcessorValue(_: value) + 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: error.description) + withExtendedLifetime(jsError.jsObject) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } + return 0 + } + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_DataProcessorManager_loadProcessorLabel") +@_cdecl("bjs_DataProcessorManager_loadProcessorLabel") +public func _bjs_DataProcessorManager_loadProcessorLabel(_ _self: UnsafeMutableRawPointer, _ keyBytes: Int32, _ keyLength: Int32) -> Int32 { + #if arch(wasm32) + let key = String.bridgeJSLiftParameter(keyBytes, keyLength) + let _self = DataProcessorManager.bridgeJSLiftParameter(_self) + return _bjs_makePromise(resolve: Promise_resolve_SS, reject: Promise_reject) { () async throws(JSException) -> String in + return try await _self.loadProcessorLabel(_: key) + } + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_DataProcessorManager_resetProcessor") +@_cdecl("bjs_DataProcessorManager_resetProcessor") +public func _bjs_DataProcessorManager_resetProcessor(_ _self: UnsafeMutableRawPointer) -> Int32 { + #if arch(wasm32) + let _self = DataProcessorManager.bridgeJSLiftParameter(_self) + return _bjs_makePromise(resolve: Promise_resolve_y, reject: Promise_reject) { () async throws(JSException) -> Void in + try await _self.resetProcessor() + } + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_DataProcessorManager_fetchProcessorCount") +@_cdecl("bjs_DataProcessorManager_fetchProcessorCount") +public func _bjs_DataProcessorManager_fetchProcessorCount(_ _self: UnsafeMutableRawPointer) -> Int32 { + #if arch(wasm32) + let _self = DataProcessorManager.bridgeJSLiftParameter(_self) + return _bjs_makePromise(resolve: Promise_resolve_Si, reject: Promise_reject) { + return await _self.fetchProcessorCount() + } + #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 { @@ -14644,6 +14951,73 @@ public func _bjs_SwiftDataProcessor_getAPIResult(_ _self: UnsafeMutableRawPointe #endif } +@_expose(wasm, "bjs_SwiftDataProcessor_validate") +@_cdecl("bjs_SwiftDataProcessor_validate") +public func _bjs_SwiftDataProcessor_validate(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Int32 { + #if arch(wasm32) + let value = Int.bridgeJSLiftParameter(value) + let _self = SwiftDataProcessor.bridgeJSLiftParameter(_self) + do { + let ret = try _self.validate(_: value) + 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: error.description) + withExtendedLifetime(jsError.jsObject) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } + return 0 + } + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_SwiftDataProcessor_loadLabel") +@_cdecl("bjs_SwiftDataProcessor_loadLabel") +public func _bjs_SwiftDataProcessor_loadLabel(_ _self: UnsafeMutableRawPointer, _ keyBytes: Int32, _ keyLength: Int32) -> Int32 { + #if arch(wasm32) + let key = String.bridgeJSLiftParameter(keyBytes, keyLength) + let _self = SwiftDataProcessor.bridgeJSLiftParameter(_self) + return _bjs_makePromise(resolve: Promise_resolve_SS, reject: Promise_reject) { () async throws(JSException) -> String in + return try await _self.loadLabel(_: key) + } + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_SwiftDataProcessor_reset") +@_cdecl("bjs_SwiftDataProcessor_reset") +public func _bjs_SwiftDataProcessor_reset(_ _self: UnsafeMutableRawPointer) -> Int32 { + #if arch(wasm32) + let _self = SwiftDataProcessor.bridgeJSLiftParameter(_self) + return _bjs_makePromise(resolve: Promise_resolve_y, reject: Promise_reject) { () async throws(JSException) -> Void in + try await _self.reset() + } + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_SwiftDataProcessor_fetchCount") +@_cdecl("bjs_SwiftDataProcessor_fetchCount") +public func _bjs_SwiftDataProcessor_fetchCount(_ _self: UnsafeMutableRawPointer) -> Int32 { + #if arch(wasm32) + let _self = SwiftDataProcessor.bridgeJSLiftParameter(_self) + return _bjs_makePromise(resolve: Promise_resolve_Si, reject: Promise_reject) { + return await _self.fetchCount() + } + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_SwiftDataProcessor_count_get") @_cdecl("bjs_SwiftDataProcessor_count_get") public func _bjs_SwiftDataProcessor_count_get(_ _self: UnsafeMutableRawPointer) -> Int32 { @@ -17729,6 +18103,30 @@ fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripOptionalAssociatedValueE return bjs_AsyncImportImports_jsAsyncRoundTripOptionalAssociatedValueEnum_static_extern(resolveRef, rejectRef, vIsSome, vCaseId) } +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_AsyncImportImports_jsAsyncThrowSynchronously_static") +fileprivate func bjs_AsyncImportImports_jsAsyncThrowSynchronously_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ messageWord0: Int32, _ messageWord1: Int32, _ messageWord2: Int32) -> Void +#else +fileprivate func bjs_AsyncImportImports_jsAsyncThrowSynchronously_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ messageWord0: Int32, _ messageWord1: Int32, _ messageWord2: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_AsyncImportImports_jsAsyncThrowSynchronously_static(_ resolveRef: Int32, _ rejectRef: Int32, _ messageWord0: Int32, _ messageWord1: Int32, _ messageWord2: Int32) -> Void { + return bjs_AsyncImportImports_jsAsyncThrowSynchronously_static_extern(resolveRef, rejectRef, messageWord0, messageWord1, messageWord2) +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_AsyncImportImports_jsAsyncReturnNonPromise_static") +fileprivate func bjs_AsyncImportImports_jsAsyncReturnNonPromise_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ v: Float64) -> Void +#else +fileprivate func bjs_AsyncImportImports_jsAsyncReturnNonPromise_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ v: Float64) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_AsyncImportImports_jsAsyncReturnNonPromise_static(_ resolveRef: Int32, _ rejectRef: Int32, _ v: Float64) -> Void { + return bjs_AsyncImportImports_jsAsyncReturnNonPromise_static_extern(resolveRef, rejectRef, v) +} + func _$AsyncImportImports_jsAsyncRoundTripVoid() async throws(JSException) -> Void { try await _bjs_awaitPromise(makeResolveClosure: { JSTypedClosure<() -> Void>($0) @@ -17874,6 +18272,31 @@ func _$AsyncImportImports_jsAsyncRoundTripOptionalAssociatedValueEnum(_ v: Optio return resolved } +func _$AsyncImportImports_jsAsyncThrowSynchronously(_ message: String) async throws(JSException) -> Double { + let resolved = try await _bjs_awaitPromise(makeResolveClosure: { + JSTypedClosure<(sending Double) -> Void>.sending($0) + }, makeRejectClosure: { + JSTypedClosure<(sending JSValue) -> Void>.sending($0) + }) { resolveRef, rejectRef in + message.bridgeJSWithLoweredParameter { (messageWord0, messageWord1, messageWord2) in + bjs_AsyncImportImports_jsAsyncThrowSynchronously_static(resolveRef, rejectRef, messageWord0, messageWord1, messageWord2) + } + } + return resolved +} + +func _$AsyncImportImports_jsAsyncReturnNonPromise(_ v: Double) async throws(JSException) -> Double { + let resolved = try await _bjs_awaitPromise(makeResolveClosure: { + JSTypedClosure<(sending Double) -> Void>.sending($0) + }, makeRejectClosure: { + JSTypedClosure<(sending JSValue) -> Void>.sending($0) + }) { resolveRef, rejectRef in + let vValue = v.bridgeJSLowerParameter() + bjs_AsyncImportImports_jsAsyncReturnNonPromise_static(resolveRef, rejectRef, vValue) + } + return resolved +} + #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureAsyncImports_runJsClosureAsyncTests_static") fileprivate func bjs_ClosureAsyncImports_runJsClosureAsyncTests_static_extern(_ resolveRef: Int32, _ rejectRef: Int32) -> Void @@ -19696,6 +20119,32 @@ func _$jsJoinStringThenStackParams(_ s: String, _ a: Optional<[Int]>, _ b: [Int] return String.bridgeJSLiftReturn(ret) } +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsDescribeReservedWordParameters") +fileprivate func bjs_jsDescribeReservedWordParameters_extern(_ `in`: Int32, _ forWord0: Int32, _ forWord1: Int32, _ forWord2: Int32, _ `default`: Int32) -> Int32 +#else +fileprivate func bjs_jsDescribeReservedWordParameters_extern(_ `in`: Int32, _ forWord0: Int32, _ forWord1: Int32, _ forWord2: Int32, _ `default`: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_jsDescribeReservedWordParameters(_ `in`: Int32, _ forWord0: Int32, _ forWord1: Int32, _ forWord2: Int32, _ `default`: Int32) -> Int32 { + return bjs_jsDescribeReservedWordParameters_extern(`in`, forWord0, forWord1, forWord2, `default`) +} + +func _$jsDescribeReservedWordParameters(_ `in`: Int, _ `for`: String, _ `default`: Bool) throws(JSException) -> String { + let ret0 = `for`.bridgeJSWithLoweredParameter { (forWord0, forWord1, forWord2) in + let defaultValue = `default`.bridgeJSLowerParameter() + let inValue = `in`.bridgeJSLowerParameter() + let ret = bjs_jsDescribeReservedWordParameters(inValue, forWord0, forWord1, forWord2, defaultValue) + return ret + } + let ret = ret0 + if let error = _swift_js_take_exception() { + throw error + } + return String.bridgeJSLiftReturn(ret) +} + #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsGenericRoundTrip") fileprivate func bjs_jsGenericRoundTrip_extern(_ _generic0TypeId: Int32) -> Void diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json index d649d4e76..fb4d924e7 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json @@ -3019,6 +3019,99 @@ } } + }, + { + "abiName" : "bjs_DataProcessorManager_validateProcessorValue", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : true + }, + "name" : "validateProcessorValue", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + } + ], + "returnType" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + }, + { + "abiName" : "bjs_DataProcessorManager_loadProcessorLabel", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : true + }, + "name" : "loadProcessorLabel", + "parameters" : [ + { + "label" : "_", + "name" : "key", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_DataProcessorManager_resetProcessor", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : true + }, + "name" : "resetProcessor", + "parameters" : [ + + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_DataProcessorManager_fetchProcessorCount", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : false + }, + "name" : "fetchProcessorCount", + "parameters" : [ + + ], + "returnType" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } } ], "name" : "DataProcessorManager", @@ -3325,6 +3418,99 @@ "_1" : "null" } } + }, + { + "abiName" : "bjs_SwiftDataProcessor_validate", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : true + }, + "name" : "validate", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + } + ], + "returnType" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + }, + { + "abiName" : "bjs_SwiftDataProcessor_loadLabel", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : true + }, + "name" : "loadLabel", + "parameters" : [ + { + "label" : "_", + "name" : "key", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_SwiftDataProcessor_reset", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : true + }, + "name" : "reset", + "parameters" : [ + + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_SwiftDataProcessor_fetchCount", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : false + }, + "name" : "fetchCount", + "parameters" : [ + + ], + "returnType" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } } ], "name" : "SwiftDataProcessor", @@ -15029,111 +15215,277 @@ } }, { - "abiName" : "bjs_roundTripSwiftHeapObject", + "abiName" : "bjs_describeReservedWordParameters", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripSwiftHeapObject", + "name" : "describeReservedWordParameters", "parameters" : [ { - "label" : "v", - "name" : "v", + "label" : "extension", + "name" : "extension", "type" : { - "swiftHeapObject" : { - "_0" : "Greeter" + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } } } - } - ], - "returnType" : { - "swiftHeapObject" : { - "_0" : "Greeter" - } - } - }, - { - "abiName" : "bjs_roundTripUnsafeRawPointer", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripUnsafeRawPointer", - "parameters" : [ + }, { - "label" : "v", - "name" : "v", + "label" : "break", + "name" : "break", "type" : { - "unsafePointer" : { - "_0" : { - "kind" : "unsafeRawPointer" - } + "double" : { + + } + } + }, + { + "label" : "function", + "name" : "function", + "type" : { + "bool" : { + + } + } + }, + { + "label" : "in", + "name" : "in", + "type" : { + "string" : { + } } } ], "returnType" : { - "unsafePointer" : { - "_0" : { - "kind" : "unsafeRawPointer" - } + "string" : { + } } }, { - "abiName" : "bjs_roundTripUnsafeMutableRawPointer", + "abiName" : "bjs_describeBacktickedParameter", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripUnsafeMutableRawPointer", + "name" : "describeBacktickedParameter", "parameters" : [ { - "label" : "v", - "name" : "v", + "label" : "_", + "name" : "in", "type" : { - "unsafePointer" : { - "_0" : { - "kind" : "unsafeMutableRawPointer" - } + "string" : { + } } } ], "returnType" : { - "unsafePointer" : { - "_0" : { - "kind" : "unsafeMutableRawPointer" - } + "string" : { + } } }, { - "abiName" : "bjs_roundTripOpaquePointer", + "abiName" : "bjs_describeCollidingParameters", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripOpaquePointer", + "name" : "describeCollidingParameters", "parameters" : [ { - "label" : "v", - "name" : "v", + "label" : "in", + "name" : "in", "type" : { - "unsafePointer" : { + "integer" : { "_0" : { - "kind" : "opaquePointer" + "isSigned" : true, + "width" : "word" } } } - } - ], - "returnType" : { - "unsafePointer" : { + }, + { + "label" : "_in", + "name" : "_in", + "type" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + }, + { + "label" : "instance", + "name" : "instance", + "type" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + }, + { + "label" : "swift", + "name" : "swift", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_describeWithReservedWordDescriber", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "describeWithReservedWordDescriber", + "parameters" : [ + { + "label" : "_", + "name" : "describer", + "type" : { + "swiftProtocol" : { + "_0" : "ReservedWordDescriber" + } + } + } + ], + "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" + } + } + } + } + ], + "returnType" : { + "unsafePointer" : { "_0" : { "kind" : "opaquePointer" } @@ -15334,6 +15686,40 @@ } } }, + { + "abiName" : "bjs_makeJSValueString", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeJSValueString", + "parameters" : [ + + ], + "returnType" : { + "jsValue" : { + + } + } + }, + { + "abiName" : "bjs_makeJSValueObject", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeJSValueObject", + "parameters" : [ + + ], + "returnType" : { + "jsValue" : { + + } + } + }, { "abiName" : "bjs_roundTripOptionalJSValue", "effects" : { @@ -15619,6 +16005,40 @@ } } }, + { + "abiName" : "bjs_throwsBeforeJSObjectResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : true + }, + "name" : "throwsBeforeJSObjectResult", + "parameters" : [ + + ], + "returnType" : { + "jsObject" : { + + } + } + }, + { + "abiName" : "bjs_throwsBeforeProtocolResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : true + }, + "name" : "throwsBeforeProtocolResult", + "parameters" : [ + + ], + "returnType" : { + "swiftProtocol" : { + "_0" : "DataProcessor" + } + } + }, { "abiName" : "bjs_zeroArgAsyncThrows", "effects" : { @@ -19073,6 +19493,51 @@ } ] }, + { + "methods" : [ + { + "abiName" : "bjs_ReservedWordDescriber_describe", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "describe", + "parameters" : [ + { + "label" : "in", + "name" : "in", + "type" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + }, + { + "label" : "for", + "name" : "for", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "string" : { + + } + } + } + ], + "name" : "ReservedWordDescriber", + "properties" : [ + + ] + }, { "methods" : [ { @@ -19336,6 +19801,99 @@ "_1" : "null" } } + }, + { + "abiName" : "bjs_DataProcessor_validate", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : true + }, + "name" : "validate", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + } + ], + "returnType" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + }, + { + "abiName" : "bjs_DataProcessor_loadLabel", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : true + }, + "name" : "loadLabel", + "parameters" : [ + { + "label" : "_", + "name" : "key", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_DataProcessor_reset", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : true + }, + "name" : "reset", + "parameters" : [ + + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_DataProcessor_fetchCount", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : false + }, + "name" : "fetchCount", + "parameters" : [ + + ], + "returnType" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } } ], "name" : "DataProcessor", @@ -23286,6 +23844,54 @@ "_1" : "null" } } + }, + { + "accessLevel" : "internal", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : true + }, + "name" : "jsAsyncThrowSynchronously", + "parameters" : [ + { + "name" : "message", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "double" : { + + } + } + }, + { + "accessLevel" : "internal", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : true + }, + "name" : "jsAsyncReturnNonPromise", + "parameters" : [ + { + "name" : "v", + "type" : { + "double" : { + + } + } + } + ], + "returnType" : { + "double" : { + + } + } } ] } @@ -25924,6 +26530,49 @@ "returnType" : { "string" : { + } + } + }, + { + "accessLevel" : "internal", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : true + }, + "name" : "jsDescribeReservedWordParameters", + "parameters" : [ + { + "name" : "in", + "type" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + }, + { + "name" : "for", + "type" : { + "string" : { + + } + } + }, + { + "name" : "default", + "type" : { + "bool" : { + + } + } + } + ], + "returnType" : { + "string" : { + } } } diff --git a/Tests/BridgeJSRuntimeTests/ImportAPITests.swift b/Tests/BridgeJSRuntimeTests/ImportAPITests.swift index c98ab3e61..b3e921672 100644 --- a/Tests/BridgeJSRuntimeTests/ImportAPITests.swift +++ b/Tests/BridgeJSRuntimeTests/ImportAPITests.swift @@ -31,6 +31,12 @@ import JavaScriptKit _ b: [Int] ) throws(JSException) -> String +@JSFunction func jsDescribeReservedWordParameters( + in: Int, + for: String, + _ `default`: Bool +) throws(JSException) -> String + class ImportAPITests: XCTestCase { func testRoundTripVoid() throws { try jsRoundTripVoid() @@ -211,4 +217,8 @@ class ImportAPITests: XCTestCase { #""s"|[1,2]|[7,8,9]"# ) } + + func testReservedWordParameters() throws { + XCTAssertEqual(try jsDescribeReservedWordParameters(in: 1, for: "for", true), "1:for:true") + } } diff --git a/Tests/BridgeJSRuntimeTests/JavaScript/AsyncImportTests.mjs b/Tests/BridgeJSRuntimeTests/JavaScript/AsyncImportTests.mjs index 9be7af1be..a0f9a6ebd 100644 --- a/Tests/BridgeJSRuntimeTests/JavaScript/AsyncImportTests.mjs +++ b/Tests/BridgeJSRuntimeTests/JavaScript/AsyncImportTests.mjs @@ -44,6 +44,12 @@ export function getImports(importsContext) { jsAsyncRoundTripOptionalAssociatedValueEnum: (v) => { return Promise.resolve(v); }, + jsAsyncThrowSynchronously: (message) => { + throw new Error(message); + }, + jsAsyncReturnNonPromise: (v) => { + return v; + }, }; } diff --git a/Tests/BridgeJSRuntimeTests/JavaScript/ClosureAsyncTests.mjs b/Tests/BridgeJSRuntimeTests/JavaScript/ClosureAsyncTests.mjs index 3267d8fd6..07b1ec1ed 100644 --- a/Tests/BridgeJSRuntimeTests/JavaScript/ClosureAsyncTests.mjs +++ b/Tests/BridgeJSRuntimeTests/JavaScript/ClosureAsyncTests.mjs @@ -38,6 +38,14 @@ export async function runJsClosureAsyncTests(exports) { assert.notEqual(directionAReject, null); assert.equal(directionAReject.message, "CallbackRejected"); + await assert.rejects( + () => exports.awaitAsyncCallback(() => { + throw new Error("CallbackThrewSynchronously"); + }), + (error) => error instanceof Error && error.message === "CallbackThrewSynchronously" + ); + assert.equal(await exports.awaitAsyncCallback((req) => `plain-${req}`), "swift-saw:plain-request"); + const parser = exports.makeAsyncParser(); const parsed = parser("42"); diff --git a/Tests/BridgeJSRuntimeTests/JavaScript/StringABITests.mjs b/Tests/BridgeJSRuntimeTests/JavaScript/StringABITests.mjs index 8468e1faf..1ff321261 100644 --- a/Tests/BridgeJSRuntimeTests/JavaScript/StringABITests.mjs +++ b/Tests/BridgeJSRuntimeTests/JavaScript/StringABITests.mjs @@ -38,16 +38,15 @@ export function runJsStringABITests(rootExports) { assert.equal(exports.immortalSubstring(), immortal.slice(10)); assert.equal(exports.optionalNone(), null); assert.equal(exports.optionalSome(), immortal); - const expected = samples.map((s) => s.startsWith("\ufeff") ? s.slice(1) : s); for (let i = 0; i < samples.length; i++) { - assert.equal(exports.echo(samples[i]), expected[i]); - assert.equal(exports.echoOptional(samples[i]), expected[i]); + assert.equal(exports.echo(samples[i]), samples[i]); + assert.equal(exports.echoOptional(samples[i]), samples[i]); } - assert.deepEqual(exports.echoArray(samples), expected); + assert.deepEqual(exports.echoArray(samples), samples); } const samples = [ "abcdefé", "abcdefgé", "abcdefghé", "abcdefghié", "abc€", "abcdefg€", - "abc😄", "abcdef😄", "abcdefg😄", "a\0b", "\ufeffx", "x\ufeff", + "abc😄", "abcdef😄", "abcdefg😄", "a\0b", "\ufeff", "\ufeffx", "\ufeffabcde", "\ufeffabcdef", "x\ufeff", "\ufeff\ufeffx", "\ufeffabcdefghijk", "abc\ufeffdefghijk", "\ufeff\ufeffabcdefghijk", ]; diff --git a/Tests/BridgeJSRuntimeTests/StringABITests.swift b/Tests/BridgeJSRuntimeTests/StringABITests.swift index c3f424011..5d2cae9b0 100644 --- a/Tests/BridgeJSRuntimeTests/StringABITests.swift +++ b/Tests/BridgeJSRuntimeTests/StringABITests.swift @@ -43,15 +43,14 @@ final class StringABITests: XCTestCase { let samples = [ "abcdefé", "abcdefgé", "abcdefghé", "abcdefghié", "abc€", "abcdefg€", "abc😄", "abcdef😄", "abcdefg😄", "a\0b", - "\u{FEFF}x", "x\u{FEFF}", "\u{FEFF}\u{FEFF}x", + "\u{FEFF}", "\u{FEFF}x", "\u{FEFF}abcde", "\u{FEFF}abcdef", "x\u{FEFF}", "\u{FEFF}\u{FEFF}x", "\u{FEFF}abcdefghijk", "abc\u{FEFF}defghijk", "\u{FEFF}\u{FEFF}abcdefghijk", ] - let expected = samples.map { $0.first == "\u{FEFF}" ? String($0.dropFirst()) : $0 } - for (input, output) in zip(samples, expected) { - try XCTAssertEqual(StringABIImports.jsEcho(input), output) - try XCTAssertEqual(StringABIImports.jsEchoOptional(input), output) + for input in samples { + try XCTAssertEqual(StringABIImports.jsEcho(input), input) + try XCTAssertEqual(StringABIImports.jsEchoOptional(input), input) } - try XCTAssertEqual(StringABIImports.jsEchoArray(samples), expected) + try XCTAssertEqual(StringABIImports.jsEchoArray(samples), samples) } func testImportEchoesSmallStrings() throws { diff --git a/Tests/JavaScriptEventLoopTests/JavaScriptEventLoopTests.swift b/Tests/JavaScriptEventLoopTests/JavaScriptEventLoopTests.swift index 8fbbd817f..7fbb712a7 100644 --- a/Tests/JavaScriptEventLoopTests/JavaScriptEventLoopTests.swift +++ b/Tests/JavaScriptEventLoopTests/JavaScriptEventLoopTests.swift @@ -113,6 +113,113 @@ final class JavaScriptEventLoopTests: XCTestCase { XCTAssertEqual(context.completed, ["t4", "t3", "t5"]) } + final class OrderContext: @unchecked Sendable { + var completed: [String] = [] + var expectedCount = 0 + var continuation: CheckedContinuation? + + func record(_ name: String) { + completed.append(name) + if completed.count == expectedCount { + continuation?.resume() + continuation = nil + } + } + } + + /// Starts tasks without awaiting them, so no await raises the priority of a queued task. + func runUnawaited(expectedCount: Int, _ start: (OrderContext) -> Void) async -> [String] { + let context = OrderContext() + context.expectedCount = expectedCount + await withCheckedContinuation { continuation in + context.continuation = continuation + start(context) + } + return context.completed + } + + func testTaskPriorityOrderWithMixedPriorities() async throws { + let burst: [(String, TaskPriority)] = [ + ("low1", .low), ("medium1", .medium), ("low2", .low), ("high1", .high), + ("medium2", .medium), ("low3", .low), ("high2", .high), ("medium3", .medium), + ] + let burstOrder = await runUnawaited(expectedCount: burst.count) { context in + for (name, priority) in burst { + Task(priority: priority) { context.record(name) } + } + } + XCTAssertEqual(burstOrder, ["high1", "high2", "medium1", "medium2", "medium3", "low1", "low2", "low3"]) + + let nestedOrder = await runUnawaited(expectedCount: 7) { context in + Task(priority: .medium) { + context.record("outer") + let nested: [(String, TaskPriority)] = [ + ("nestedLow1", .low), ("nestedHigh", .high), ("nestedMedium", .medium), ("nestedLow2", .low), + ] + for (name, priority) in nested { + Task(priority: priority) { context.record(name) } + } + } + Task(priority: .medium) { context.record("medium") } + Task(priority: .low) { context.record("low") } + } + XCTAssertEqual( + nestedOrder, + ["outer", "nestedHigh", "medium", "nestedMedium", "low", "nestedLow1", "nestedLow2"] + ) + + let priorities: [TaskPriority] = [ + .low, .high, .background, .medium, TaskPriority(rawValue: 22), TaskPriority(rawValue: 5), + ] + let many = (0..<600).map { index in ("\(index)", priorities[index % priorities.count]) } + let manyOrder = await runUnawaited(expectedCount: many.count) { context in + for (name, priority) in many { + Task(priority: priority) { context.record(name) } + } + } + let expectedManyOrder = many.enumerated() + .sorted { lhs, rhs in + lhs.element.1.rawValue != rhs.element.1.rawValue + ? lhs.element.1.rawValue > rhs.element.1.rawValue + : lhs.offset < rhs.offset + } + .map(\.element.0) + XCTAssertEqual(manyOrder, expectedManyOrder) + } + + func testTaskPriorityOrderAfterQueueEmpties() async throws { + let rounds: [[(String, TaskPriority)]] = [ + [("low1", .low), ("low2", .low), ("high1", .high), ("low3", .low)], + [("high1", .high), ("medium1", .medium), ("high2", .high), ("low1", .low)], + [("medium1", .medium), ("medium2", .medium), ("medium3", .medium)], + ] + let expectedOrders = [ + ["high1", "low1", "low2", "low3"], + ["high1", "high2", "medium1", "low1"], + ["medium1", "medium2", "medium3"], + ] + for (round, expectedOrder) in zip(rounds, expectedOrders) { + let order = await runUnawaited(expectedCount: round.count) { context in + for (name, priority) in round { + Task(priority: priority) { context.record(name) } + } + } + XCTAssertEqual(order, expectedOrder) + } + } + + func testTaskPriorityOrderAfterSingleJobRunIsClaimed() async throws { + let order = await runUnawaited(expectedCount: 4) { context in + Task(priority: .low) { context.record("low1") } + Task(priority: .low) { context.record("low2") } + Task(priority: .high) { + context.record("high") + Task(priority: .low) { context.record("low3") } + } + } + XCTAssertEqual(order, ["high", "low1", "low2", "low3"]) + } + // MARK: - Promise Tests func testPromiseResolution() async throws { diff --git a/Tests/JavaScriptEventLoopTests/JavaScriptEventLoopYieldIntervalTests.swift b/Tests/JavaScriptEventLoopTests/JavaScriptEventLoopYieldIntervalTests.swift new file mode 100644 index 000000000..a18c162ce --- /dev/null +++ b/Tests/JavaScriptEventLoopTests/JavaScriptEventLoopYieldIntervalTests.swift @@ -0,0 +1,106 @@ +import JavaScriptEventLoop +import JavaScriptKit +import XCTest + +final class JavaScriptEventLoopYieldIntervalTests: XCTestCase { + final class Box: @unchecked Sendable { + var value: Value + init(_ value: Value) { self.value = value } + } + + override func tearDown() { + JavaScriptEventLoop.shared.yieldInterval = nil + super.tearDown() + } + + static func busyWait(milliseconds: Int) { + let end = ContinuousClock.now + .milliseconds(milliseconds) + while ContinuousClock.now < end {} + } + + /// Returns, for each busy task, whether a JavaScript timer scheduled before them had fired. + func timerRanAfterEachTask(count: Int, milliseconds: Int) async -> [Bool] { + let timerRan = Box(false) + _ = JSObject.global.setTimeout!( + JSOneshotClosure { _ in + timerRan.value = true + return .undefined + }, + 0 + ) + let observed = Box([Bool]()) + let tasks = (0..) in + @Sendable func record(_ name: String) { + Self.busyWait(milliseconds: 1) + order.value.append(name) + if order.value.count == expectedOrder.count { continuation.resume() } + } + let priorities: [(String, TaskPriority)] = [("l", .low), ("m", .medium), ("h", .high)] + for index in 0..<12 { + let (prefix, priority) = priorities[index % 3] + let name = "\(prefix)\(index / 3)" + Task(priority: priority) { + record(name) + if name == "h0" { + Task(priority: .low) { record("l4") } + Task(priority: .high) { record("h4") } + } + } + } + } + XCTAssertEqual(order.value, expectedOrder) + } +} diff --git a/Tests/JavaScriptKitTests/JSTypedArrayTests.swift b/Tests/JavaScriptKitTests/JSTypedArrayTests.swift index a4649879e..ad12a4e81 100644 --- a/Tests/JavaScriptKitTests/JSTypedArrayTests.swift +++ b/Tests/JavaScriptKitTests/JSTypedArrayTests.swift @@ -110,6 +110,84 @@ final class JSTypedArrayTests: XCTestCase { } } + func testTypedArrayWithByteOffset() { + // A view over part of a larger `ArrayBuffer`: `byteOffset` is non-zero and + // `byteLength` is smaller than the backing buffer. Copying the whole + // buffer instead of the view's window would both shift the bytes and + // write past the end of the destination, which is sized from `length`. + let backingLength = 32 + let viewOffset = 8 + let viewLength = 8 + + let arrayBuffer = JSObject.global.ArrayBuffer.function!.new(backingLength) + let wholeBuffer = JSTypedArray( + unsafelyWrapping: JSObject.global.Uint8Array.function!.new(arrayBuffer) + ) + for i in 0..( + unsafelyWrapping: JSObject.global.Uint8Array.function!.new( + arrayBuffer, + viewOffset, + viewLength + ) + ) + XCTAssertEqual(view.length, viewLength) + XCTAssertEqual(view.lengthInBytes, viewLength) + + let expected = (0...allocate(capacity: backingLength) + defer { storage.deallocate() } + storage.initialize(repeating: sentinel) + let destination = UnsafeMutableBufferPointer(rebasing: storage[0..(elements).jsObject.buffer.object! + let view = JSTypedArray( + unsafelyWrapping: JSObject.global.Int32Array.function!.new( + arrayBuffer, + viewOffsetInBytes, + viewLength + ) + ) + XCTAssertEqual(view.length, viewLength) + XCTAssertEqual(view.lengthInBytes, viewLength * MemoryLayout.size) + + let expected: [Int32] = [3, 4, 5, 6] + XCTAssertEqual(view.withUnsafeBytes { Array($0) }, expected) + + let sentinel = Int32(bitPattern: 0xDEAD_BEEF) + let storage = UnsafeMutableBufferPointer.allocate(capacity: elements.count) + defer { storage.deallocate() } + storage.initialize(repeating: sentinel) + let destination = UnsafeMutableBufferPointer(rebasing: storage[0..(length: 100) for i in 0..<100 { diff --git a/Tests/prelude.mjs b/Tests/prelude.mjs index 8a109bcb5..6c53eb59f 100644 --- a/Tests/prelude.mjs +++ b/Tests/prelude.mjs @@ -145,6 +145,7 @@ export async function setupOptions(options, context) { throw new Error("No exports!?"); } await runAsyncWorksTests(exports); + await testAsyncProtocolSupport(exports); return; }, AsyncImportImports: getAsyncImportImports(importsContext), @@ -163,6 +164,7 @@ export async function setupOptions(options, context) { jsJoinOptionalStructThenArray: joinStackParams, jsJoinEnumThenArray: joinStackParams, jsJoinStringThenStackParams: joinStackParams, + jsDescribeReservedWordParameters: (a, b, c) => `${a}:${b}:${c}`, jsGenericRoundTrip: (v) => v, jsGenericRoundTripClass: (v) => v, jsGenericParsePoint: (json) => JSON.parse(json), @@ -225,7 +227,7 @@ export async function setupOptions(options, context) { }; }, addToCoreImports(importObject, importsContext) { - const { getInstance, getExports } = importsContext; + const { getInstance, getExports, _swift } = importsContext; options.addToCoreImports?.(importObject, importsContext); importObject["JavaScriptEventLoopTestSupportTests"] = { "isMainThread": () => context.isMainThread, @@ -236,7 +238,7 @@ export async function setupOptions(options, context) { if (!exports) { throw new Error("No exports!?"); } - return BridgeJSRuntimeTests_runJsWorks(getInstance(), exports); + return BridgeJSRuntimeTests_runJsWorks(getInstance(), exports, _swift); } bridgeJSRuntimeTests["runJsStructWorks"] = () => { const exports = getExports(); @@ -265,7 +267,7 @@ export async function setupOptions(options, context) { import assert from "node:assert"; /** @param {import('./../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports */ -function BridgeJSRuntimeTests_runJsWorks(instance, exports) { +function BridgeJSRuntimeTests_runJsWorks(instance, exports, swift) { exports.roundTripVoid(); for (const v of [ 0.0, 1.0, -1.0, @@ -304,6 +306,13 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { ]) { assert.equal(exports.roundTripString(v), v); } + assert.equal(exports.describeReservedWordParameters(1, 2.5, true, "in"), "1:2.5:true:in"); + assert.equal(exports.describeBacktickedParameter("in"), "in"); + assert.equal(exports.describeCollidingParameters(1, 2, 3, "swift"), "1:2:3:swift"); + assert.equal( + exports.describeWithReservedWordDescriber({ describe: (a, b) => `${a}:${b}` }), + "1:for" + ); const dict = { a: 1, b: 2 }; assert.deepEqual(exports.roundTripDictionaryExport(dict), dict); const optDict = { hello: "world" }; @@ -601,6 +610,17 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { const result = exports.roundTripJSValue(value); assert.strictEqual(result, value); } + assert.strictEqual(exports.makeJSValueString(), "makeJSValueString"); + const madeObject = exports.makeJSValueObject(); + assert.deepStrictEqual(madeObject, {}); + + const isRetained = (value) => swift.memory._slotByValue.has(value); + assert.equal(isRetained(madeObject), false); + for (const value of [{}, "roundTripJSValue-ownership", Symbol("ownership"), 0xfedcba9876543210n]) { + assert.strictEqual(exports.roundTripJSValue(value), value); + assert.deepStrictEqual(exports.roundTripOptionalJSValueArray([value]), [value]); + assert.equal(isRetained(value), false); + } assert.strictEqual(exports.roundTripOptionalJSValue(null), null); assert.strictEqual(exports.roundTripOptionalJSValue(undefined), null); @@ -620,6 +640,9 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { assert.fail("Expected no error"); } + assert.throws(() => exports.throwsBeforeJSObjectResult(), { name: "Error", message: "JSObjectResultError" }); + assert.throws(() => exports.throwsBeforeProtocolResult(), { name: "Error", message: "ProtocolResultError" }); + // Test enums assert.equal(exports.Direction.North, 0); assert.equal(exports.Direction.South, 1); @@ -1311,6 +1334,102 @@ function setupTestGlobals(global) { }; } +/** @param {import('./../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports */ +async function testAsyncProtocolSupport(exports) { + let processorValue = 3; + let shouldRejectReset = false; + const jsProcessor = { + count: 0, + name: "AsyncJSProcessor", + optionalTag: null, + direction: null, + optionalTheme: null, + httpStatus: null, + apiResult: null, + helper: new exports.Greeter("AsyncHelper"), + optionalHelper: null, + optionalCount: null, + increment(amount) { processorValue += amount; }, + getValue() { return processorValue; }, + setLabelElements(labelPrefix, labelSuffix) { }, + getLabel() { return "async"; }, + isEven() { return processorValue % 2 === 0; }, + processGreeter(greeter) { return ""; }, + createGreeter() { return new exports.Greeter("AsyncGreeter"); }, + processOptionalGreeter(greeter) { return ""; }, + createOptionalGreeter() { return null; }, + handleAPIResult(result) { }, + getAPIResult() { return { tag: exports.APIResult.Tag.Info }; }, + validate(value) { return value; }, + loadLabel(key) { + if (key === "invalid") { + throw new Error("Invalid key thrown synchronously"); + } + return (async () => { + await Promise.resolve(); + if (key === "missing") { + throw new Error(`No label for ${key}`); + } + return `async:${key}`; + })(); + }, + async reset() { + await Promise.resolve(); + if (shouldRejectReset) { + throw new Error("Reset rejected"); + } + processorValue = 0; + }, + fetchCount() { return Promise.resolve(processorValue); } + }; + + const jsManager = new exports.DataProcessorManager(jsProcessor); + + assert.equal(await jsManager.loadProcessorLabel("key"), "async:key"); + await assert.rejects( + () => jsManager.loadProcessorLabel("missing"), + (error) => error instanceof Error && error.message === "No label for missing" + ); + await assert.rejects( + () => jsManager.loadProcessorLabel("invalid"), + (error) => error instanceof Error && error.message === "Invalid key thrown synchronously" + ); + const [firstLabel, secondLabel] = await Promise.all([ + jsManager.loadProcessorLabel("first"), + jsManager.loadProcessorLabel("second"), + ]); + assert.equal(firstLabel, "async:first"); + assert.equal(secondLabel, "async:second"); + + assert.equal(await jsManager.fetchProcessorCount(), 3); + await jsManager.resetProcessor(); + assert.equal(await jsManager.fetchProcessorCount(), 0); + + shouldRejectReset = true; + jsManager.incrementByAmount(2); + await assert.rejects( + () => jsManager.resetProcessor(), + (error) => error instanceof Error && error.message === "Reset rejected" + ); + assert.equal(await jsManager.fetchProcessorCount(), 2); + + jsManager.release(); + jsProcessor.helper.release(); + + const swiftProcessor = new exports.SwiftDataProcessor(); + const swiftManager = new exports.DataProcessorManager(swiftProcessor); + + swiftManager.setProcessorLabel("Swift", "Label"); + swiftManager.incrementByAmount(4); + assert.equal(await swiftManager.loadProcessorLabel("key"), "SwiftLabel:key"); + assert.equal(await swiftManager.fetchProcessorCount(), 4); + await swiftManager.resetProcessor(); + assert.equal(await swiftManager.fetchProcessorCount(), 0); + + swiftManager.release(); + swiftProcessor.release(); +} + /** @param {import('./../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports */ function testProtocolSupport(exports) { let processorValue = 0; @@ -1340,7 +1459,16 @@ function testProtocolSupport(exports) { }, createOptionalGreeter() { return new exports.Greeter("JSOptionalGreeter"); }, handleAPIResult(result) { lastAPIResult = result; }, - getAPIResult() { return lastAPIResult; } + getAPIResult() { return lastAPIResult; }, + validate(value) { + if (value < 0) { + throw new Error("JSProcessor rejects negative values"); + } + return value * 2; + }, + async loadLabel(key) { return `${processorLabel}:${key}`; }, + async reset() { processorValue = 0; }, + async fetchCount() { return processorValue; } }; const successResult = { tag: exports.Utilities.Result.Tag.Success, param0: "Operation completed" }; @@ -1444,6 +1572,13 @@ function testProtocolSupport(exports) { jsProcessor.optionalCount = null; assert.equal(jsProcessor.optionalCount, null); + assert.equal(jsManager.validateProcessorValue(21), 42); + assert.throws( + () => jsManager.validateProcessorValue(-1), + (error) => error instanceof Error && error.message === "JSProcessor rejects negative values" + ); + assert.equal(jsManager.validateProcessorValue(5), 10); + newHelper.release(); optHelper.release(); jsManager.release(); @@ -1497,6 +1632,9 @@ function testProtocolSupport(exports) { swiftManager.setProcessorAPIResult(successResult); assert.deepEqual(swiftProcessor.getAPIResult(), successResult); + assert.equal(swiftManager.validateProcessorValue(7), 7); + assert.throws(() => swiftManager.validateProcessorValue(-1), /SwiftDataProcessor rejects negative values/); + swiftManager.release(); swiftProcessor.release(); @@ -1522,7 +1660,11 @@ function testProtocolSupport(exports) { processOptionalGreeter(greeter) { return ""; }, createOptionalGreeter() { return null; }, handleAPIResult(result) { }, - getAPIResult() { return { tag: exports.APIResult.Tag.Info }; } + getAPIResult() { return { tag: exports.APIResult.Tag.Info }; }, + validate(value) { return value; }, + async loadLabel(key) { return ""; }, + async reset() { }, + async fetchCount() { return 0; } }; let mainValue = 0; @@ -1547,7 +1689,11 @@ function testProtocolSupport(exports) { processOptionalGreeter(greeter) { return ""; }, createOptionalGreeter() { return null; }, handleAPIResult(result) { }, - getAPIResult() { return { tag: exports.APIResult.Tag.Info }; } + getAPIResult() { return { tag: exports.APIResult.Tag.Info }; }, + validate(value) { return value; }, + async loadLabel(key) { return ""; }, + async reset() { }, + async fetchCount() { return 0; } }; const managerWithOptional = new exports.DataProcessorManager(mainProcessor);