@soundscript/soundscript 0.1.16 → 0.1.17

package/project-transform/src/compiler/toolchain.js

@@ -53,9 +53,11 @@ function rebaseWrapperModuleSpecifier(binding, projectPath) {
 }
 function createRuntimeWrapperModuleText(jsHostImports, projectPath) {
     const wrapperBindings = jsHostImports.map((binding) => ({
+        bindingKind: binding.bindingKind,
         exportName: binding.exportName,
         hostImportName: binding.hostImportName,
         importKind: binding.importKind,
+        memberName: binding.memberName,
         moduleSpecifier: rebaseWrapperModuleSpecifier(binding, projectPath),
         originalModuleSpecifier: binding.moduleSpecifier,
         relative: isRelativeModuleSpecifier(binding.moduleSpecifier),
@@ -93,10 +95,40 @@ function createRuntimeWrapperModuleText(jsHostImports, projectPath) {
         "    const exportedValue = binding.importKind === 'default'",
         '      ? hostModule.default',
         '      : hostModule[binding.exportName];',
-        "    if (typeof exportedValue !== 'function') {",
-        "      throw new TypeError(`Expected interop import \"${binding.hostImportName}\" to resolve to a function.`);",
-        '    }',
-        '    hostFunctions[binding.hostImportName] = exportedValue;',
+        "    hostFunctions[binding.hostImportName] = binding.bindingKind === 'constructor'",
+        '      ? (() => {',
+        "        if (typeof exportedValue !== 'function') {",
+        "          throw new TypeError(`Expected interop import \"${binding.hostImportName}\" to resolve to a constructor.`);",
+        '        }',
+        '        return (...args) => new exportedValue(...args);',
+        '      })()',
+        "      : binding.bindingKind === 'property'",
+        '      ? (() => {',
+        '        if (binding.memberName === undefined) {',
+        '          return () => exportedValue;',
+        '        }',
+        "        if ((typeof exportedValue !== 'function' && typeof exportedValue !== 'object') || exportedValue === null) {",
+        "          throw new TypeError(`Expected interop import \"${binding.hostImportName}\" to resolve to a property owner.`);",
+        '        }',
+        '        return () => exportedValue[binding.memberName];',
+        '      })()',
+        "      : binding.bindingKind === 'static_method'",
+        '      ? (() => {',
+        "        if ((typeof exportedValue !== 'function' && typeof exportedValue !== 'object') || exportedValue === null) {",
+        "          throw new TypeError(`Expected interop import \"${binding.hostImportName}\" to resolve to a static method owner.`);",
+        '        }',
+        '        const methodValue = exportedValue[binding.memberName];',
+        "        if (typeof methodValue !== 'function') {",
+        "          throw new TypeError(`Expected interop import \"${binding.hostImportName}\" to resolve to a function.`);",
+        '        }',
+        '        return (...args) => exportedValue[binding.memberName](...args);',
+        '      })()',
+        '      : (() => {',
+        "        if (typeof exportedValue !== 'function') {",
+        "          throw new TypeError(`Expected interop import \"${binding.hostImportName}\" to resolve to a function.`);",
+        '        }',
+        '        return exportedValue;',
+        '      })();',
         '  }',
         '  return hostFunctions;',
         '}',

package/project-transform/src/compiler/toolchain.ts

@@ -97,9 +97,11 @@ function createRuntimeWrapperModuleText(
   projectPath: string,
 ): string {
   const wrapperBindings = jsHostImports.map((binding) => ({
+    bindingKind: binding.bindingKind,
     exportName: binding.exportName,
     hostImportName: binding.hostImportName,
     importKind: binding.importKind,
+    memberName: binding.memberName,
     moduleSpecifier: rebaseWrapperModuleSpecifier(binding, projectPath),
     originalModuleSpecifier: binding.moduleSpecifier,
     relative: isRelativeModuleSpecifier(binding.moduleSpecifier),
@@ -137,10 +139,40 @@ function createRuntimeWrapperModuleText(
     "    const exportedValue = binding.importKind === 'default'",
     '      ? hostModule.default',
     '      : hostModule[binding.exportName];',
-    "    if (typeof exportedValue !== 'function') {",
-    "      throw new TypeError(`Expected interop import \"${binding.hostImportName}\" to resolve to a function.`);",
-    '    }',
-    '    hostFunctions[binding.hostImportName] = exportedValue;',
+    "    hostFunctions[binding.hostImportName] = binding.bindingKind === 'constructor'",
+    '      ? (() => {',
+    "        if (typeof exportedValue !== 'function') {",
+    "          throw new TypeError(`Expected interop import \"${binding.hostImportName}\" to resolve to a constructor.`);",
+    '        }',
+    '        return (...args) => new exportedValue(...args);',
+    '      })()',
+    "      : binding.bindingKind === 'property'",
+    '      ? (() => {',
+    '        if (binding.memberName === undefined) {',
+    '          return () => exportedValue;',
+    '        }',
+    "        if ((typeof exportedValue !== 'function' && typeof exportedValue !== 'object') || exportedValue === null) {",
+    "          throw new TypeError(`Expected interop import \"${binding.hostImportName}\" to resolve to a property owner.`);",
+    '        }',
+    '        return () => exportedValue[binding.memberName];',
+    '      })()',
+    "      : binding.bindingKind === 'static_method'",
+    '      ? (() => {',
+    "        if ((typeof exportedValue !== 'function' && typeof exportedValue !== 'object') || exportedValue === null) {",
+    "          throw new TypeError(`Expected interop import \"${binding.hostImportName}\" to resolve to a static method owner.`);",
+    '        }',
+    '        const methodValue = exportedValue[binding.memberName];',
+    "        if (typeof methodValue !== 'function') {",
+    "          throw new TypeError(`Expected interop import \"${binding.hostImportName}\" to resolve to a function.`);",
+    '        }',
+    '        return (...args) => exportedValue[binding.memberName](...args);',
+    '      })()',
+    '      : (() => {',
+    "        if (typeof exportedValue !== 'function') {",
+    "          throw new TypeError(`Expected interop import \"${binding.hostImportName}\" to resolve to a function.`);",
+    '        }',
+    '        return exportedValue;',
+    '      })();',
     '  }',
     '  return hostFunctions;',
     '}',

package/project-transform/src/compiler/wasm_js_host_runtime.js

@@ -634,6 +634,140 @@ function createJsHostImports(instanceCell) {
                 return created;
             },
         },
+        soundscript_async_generator: {
+            wrap: (step) => {
+                if (typeof step !== 'function') {
+                    throw new TypeError('Expected host-callable async generator step.');
+                }
+                return {
+                    next(value) {
+                        return Promise.resolve(step(0, value));
+                    },
+                    return(value) {
+                        return Promise.resolve(step(1, value));
+                    },
+                    throw(value) {
+                        return Promise.resolve(step(2, value));
+                    },
+                };
+            },
+            step: (step, mode, value, candidate) => {
+                const instance = instanceCell.instance;
+                if (!instance) {
+                    throw new Error('Async generator bridge invoked before instantiation completed.');
+                }
+                const fulfill = instance.exports.__soundscript_async_generator_step_bridge_fulfill;
+                const fulfillStringArray = instance.exports.__soundscript_async_generator_step_bridge_fulfill_string_array;
+                const fulfillNumberArray = instance.exports.__soundscript_async_generator_step_bridge_fulfill_number_array;
+                const fulfillBooleanArray = instance.exports.__soundscript_async_generator_step_bridge_fulfill_boolean_array;
+                const fulfillTaggedArray = instance.exports.__soundscript_async_generator_step_bridge_fulfill_tagged_array;
+                const reject = instance.exports.__soundscript_promise_bridge_reject;
+                if (typeof fulfill !== 'function' || typeof reject !== 'function') {
+                    throw new Error('Missing async generator bridge helpers.');
+                }
+                Promise.resolve()
+                    .then(() => {
+                    if (typeof step !== 'function') {
+                        throw new TypeError('Expected host-callable async generator step.');
+                    }
+                    return step(mode, value);
+                })
+                    .then((result) => {
+                    if ((typeof result !== 'object' && typeof result !== 'function') || result === null) {
+                        throw new TypeError('Expected async generator step to produce an iterator result object.');
+                    }
+                    const iteratorResult = result;
+                    const yieldedValue = Object.hasOwn(iteratorResult, 'value')
+                        ? iteratorResult.value
+                        : undefined;
+                    if (Array.isArray(yieldedValue)) {
+                        const done = iteratorResult.done ? 1 : 0;
+                        if (yieldedValue.length === 0) {
+                            if (typeof fulfillTaggedArray !== 'function') {
+                                throw new Error('Missing async generator tagged-array bridge helper.');
+                            }
+                            fulfillTaggedArray(candidate, done, yieldedValue);
+                            return;
+                        }
+                        if (yieldedValue.every((entry) => typeof entry === 'string')) {
+                            if (typeof fulfillStringArray !== 'function') {
+                                throw new Error('Missing async generator string-array bridge helper.');
+                            }
+                            fulfillStringArray(candidate, done, yieldedValue);
+                            return;
+                        }
+                        if (yieldedValue.every((entry) => typeof entry === 'number')) {
+                            if (typeof fulfillNumberArray !== 'function') {
+                                throw new Error('Missing async generator number-array bridge helper.');
+                            }
+                            fulfillNumberArray(candidate, done, yieldedValue);
+                            return;
+                        }
+                        if (yieldedValue.every((entry) => typeof entry === 'boolean')) {
+                            if (typeof fulfillBooleanArray !== 'function') {
+                                throw new Error('Missing async generator boolean-array bridge helper.');
+                            }
+                            fulfillBooleanArray(candidate, done, yieldedValue);
+                            return;
+                        }
+                        if (typeof fulfillTaggedArray !== 'function') {
+                            throw new Error('Missing async generator tagged-array bridge helper.');
+                        }
+                        fulfillTaggedArray(candidate, done, yieldedValue);
+                        return;
+                    }
+                    fulfill(candidate, iteratorResult.done ? 1 : 0, yieldedValue);
+                }, (error) => {
+                    reject(candidate, error);
+                });
+            },
+        },
+        soundscript_generator: {
+            wrap: (step) => {
+                if (typeof step !== 'function') {
+                    throw new TypeError('Expected host-callable generator step.');
+                }
+                return {
+                    next(value) {
+                        return step(0, value);
+                    },
+                    return(value) {
+                        return step(1, value);
+                    },
+                    throw(value) {
+                        return step(2, value);
+                    },
+                };
+            },
+        },
+        soundscript_throw: {
+            throw: (value) => {
+                throw value;
+            },
+            try_tagged: (callback) => {
+                if (typeof callback !== 'function') {
+                    throw new TypeError('Expected JS function for soundscript_throw.try_tagged.');
+                }
+                try {
+                    return { threw: false, value: callback() };
+                }
+                catch (error) {
+                    return { threw: true, value: error };
+                }
+            },
+            try_result_threw: (result) => {
+                if ((typeof result !== 'object' && typeof result !== 'function') || result === null) {
+                    throw new TypeError('Expected JS object for soundscript_throw.try_result_threw.');
+                }
+                return Number(Boolean(result.threw));
+            },
+            try_result_value: (result) => {
+                if ((typeof result !== 'object' && typeof result !== 'function') || result === null) {
+                    throw new TypeError('Expected JS object for soundscript_throw.try_result_value.');
+                }
+                return result.value;
+            },
+        },
     };
 }
 export async function instantiateSoundscriptWasmModule(wasmSource, options = {}) {

package/project-transform/src/compiler/wasm_js_host_runtime.ts

@@ -727,6 +727,152 @@ function createJsHostImports(
         return created;
       },
     },
+    soundscript_async_generator: {
+      wrap: (step: unknown) => {
+        if (typeof step !== 'function') {
+          throw new TypeError('Expected host-callable async generator step.');
+        }
+        return {
+          next(value?: unknown) {
+            return Promise.resolve(step(0, value));
+          },
+          return(value?: unknown) {
+            return Promise.resolve(step(1, value));
+          },
+          throw(value?: unknown) {
+            return Promise.resolve(step(2, value));
+          },
+        };
+      },
+      step: (step: unknown, mode: number, value: unknown, candidate: unknown) => {
+        const instance = instanceCell.instance;
+        if (!instance) {
+          throw new Error('Async generator bridge invoked before instantiation completed.');
+        }
+        const fulfill = instance.exports.__soundscript_async_generator_step_bridge_fulfill;
+        const fulfillStringArray =
+          instance.exports.__soundscript_async_generator_step_bridge_fulfill_string_array;
+        const fulfillNumberArray =
+          instance.exports.__soundscript_async_generator_step_bridge_fulfill_number_array;
+        const fulfillBooleanArray =
+          instance.exports.__soundscript_async_generator_step_bridge_fulfill_boolean_array;
+        const fulfillTaggedArray =
+          instance.exports.__soundscript_async_generator_step_bridge_fulfill_tagged_array;
+        const reject = instance.exports.__soundscript_promise_bridge_reject;
+        if (typeof fulfill !== 'function' || typeof reject !== 'function') {
+          throw new Error('Missing async generator bridge helpers.');
+        }
+        Promise.resolve()
+          .then(() => {
+            if (typeof step !== 'function') {
+              throw new TypeError('Expected host-callable async generator step.');
+            }
+            return step(mode, value);
+          })
+          .then(
+            (result) => {
+              if ((typeof result !== 'object' && typeof result !== 'function') || result === null) {
+                throw new TypeError(
+                  'Expected async generator step to produce an iterator result object.',
+                );
+              }
+              const iteratorResult = result as Record<string, unknown>;
+              const yieldedValue = Object.hasOwn(iteratorResult, 'value')
+                ? iteratorResult.value
+                : undefined;
+              if (Array.isArray(yieldedValue)) {
+                const done = iteratorResult.done ? 1 : 0;
+                if (yieldedValue.length === 0) {
+                  if (typeof fulfillTaggedArray !== 'function') {
+                    throw new Error('Missing async generator tagged-array bridge helper.');
+                  }
+                  fulfillTaggedArray(candidate, done, yieldedValue);
+                  return;
+                }
+                if (yieldedValue.every((entry) => typeof entry === 'string')) {
+                  if (typeof fulfillStringArray !== 'function') {
+                    throw new Error('Missing async generator string-array bridge helper.');
+                  }
+                  fulfillStringArray(candidate, done, yieldedValue);
+                  return;
+                }
+                if (yieldedValue.every((entry) => typeof entry === 'number')) {
+                  if (typeof fulfillNumberArray !== 'function') {
+                    throw new Error('Missing async generator number-array bridge helper.');
+                  }
+                  fulfillNumberArray(candidate, done, yieldedValue);
+                  return;
+                }
+                if (yieldedValue.every((entry) => typeof entry === 'boolean')) {
+                  if (typeof fulfillBooleanArray !== 'function') {
+                    throw new Error('Missing async generator boolean-array bridge helper.');
+                  }
+                  fulfillBooleanArray(candidate, done, yieldedValue);
+                  return;
+                }
+                if (typeof fulfillTaggedArray !== 'function') {
+                  throw new Error('Missing async generator tagged-array bridge helper.');
+                }
+                fulfillTaggedArray(candidate, done, yieldedValue);
+                return;
+              }
+              fulfill(
+                candidate,
+                iteratorResult.done ? 1 : 0,
+                yieldedValue,
+              );
+            },
+            (error) => {
+              reject(candidate, error);
+            },
+          );
+      },
+    },
+    soundscript_generator: {
+      wrap: (step: unknown) => {
+        if (typeof step !== 'function') {
+          throw new TypeError('Expected host-callable generator step.');
+        }
+        return {
+          next(value?: unknown) {
+            return step(0, value);
+          },
+          return(value?: unknown) {
+            return step(1, value);
+          },
+          throw(value?: unknown) {
+            return step(2, value);
+          },
+        };
+      },
+    },
+    soundscript_throw: {
+      throw: (value: unknown) => {
+        throw value;
+      },
+      try_tagged: (callback: unknown) => {
+        if (typeof callback !== 'function') {
+          throw new TypeError('Expected JS function for soundscript_throw.try_tagged.');
+        }
+        try {
+          return { threw: false, value: callback() };
+        } catch (error) {
+          return { threw: true, value: error };
+        }
+      },
+      try_result_threw: (result: unknown) => {
+        if ((typeof result !== 'object' && typeof result !== 'function') || result === null) {
+          throw new TypeError('Expected JS object for soundscript_throw.try_result_threw.');
+        }
+        return Number(Boolean((result as { threw?: unknown }).threw));
+      },
+      try_result_value: (result: unknown) => {
+        if ((typeof result !== 'object' && typeof result !== 'function') || result === null) {
+          throw new TypeError('Expected JS object for soundscript_throw.try_result_value.');
+        }
+        return (result as { value?: unknown }).value;
+      },
+    },
   };
 }
 

package/project-transform/src/compiler/wat_arrays.js

@@ -3016,7 +3016,10 @@ export function emitOwnedArrayBoundaryHelpers(module, options) {
         throw createUnsupportedHeapRuntimeBackendError('Owned string-array host boundaries require the owned string runtime.');
     }
     const taggedKindSets = usesTaggedParamBoundary || usesTaggedParamCopyBack || usesTaggedResultBoundary
-        ? collectTaggedArrayBoundaryKindSets(module, layoutsByRepresentationName)
+        ? [
+            ...collectTaggedArrayBoundaryKindSets(module, layoutsByRepresentationName),
+            ...(options.extraTaggedKindSets ?? []),
+        ]
         : [];
     return [
         ...(usesStringParamBoundary ? emitHostArrayToOwnedArrayHelper('string', indent) : []),

package/project-transform/src/compiler/wat_arrays.ts

@@ -44,6 +44,7 @@ export interface OwnedArrayTypeUsage {
 export interface OwnedArrayBoundaryHelperOptions extends ArrayRuntimeImportUsage {
   indent(level: number): string;
   createUnsupportedHeapRuntimeBackendError(message: string): CompilerUnsupportedError;
+  extraTaggedKindSets?: readonly CompilerFunctionHostTaggedArrayBoundaryIR[];
   fallbackObjectWatTypeId?: string;
   layoutsByRepresentationName?: ReadonlyMap<string, {
     watTypeId: string;
@@ -3554,7 +3555,10 @@ export function emitOwnedArrayBoundaryHelpers(
     );
   }
   const taggedKindSets = usesTaggedParamBoundary || usesTaggedParamCopyBack || usesTaggedResultBoundary
-    ? collectTaggedArrayBoundaryKindSets(module, layoutsByRepresentationName)
+    ? [
+      ...collectTaggedArrayBoundaryKindSets(module, layoutsByRepresentationName),
+      ...(options.extraTaggedKindSets ?? []),
+    ]
     : [];
 
   return [