Update embedding and JS API

Author: bvisness

document/core/appendix/embedding.rst

@@ -188,30 +188,40 @@ Modules
 .. index:: import
 .. _embed-module-imports:
 
-:math:`\F{module\_imports}(\module) : (\name, \name, \externtype)^\ast`
-.......................................................................
+:math:`\F{module\_imports}(\module) : (\name, (\name, \externtype)^\ast)^\ast`
+..............................................................................
 
 1. Pre-condition: :math:`\module` is :ref:`valid <valid-module>` with the external import types :math:`\externtype^\ast` and external export types :math:`{\externtype'}^\ast`.
 
-2. Let :math:`\import^\ast` be the :ref:`imports <syntax-import>` of :math:`\module`.
+2. Let :math:`\importmod^\ast` be the :ref:`import modules <syntax-importmod>` of :math:`\module`.
 
-3. Assert: the length of :math:`\import^\ast` equals the length of :math:`\externtype^\ast`.
+3. Assert: the sum of the lengths of the items of :math:`\importmod^\ast` equals the length of :math:`\externtype^\ast`.
 
-4. For each :math:`\import_i` in :math:`\import^\ast` and corresponding :math:`\externtype_i` in :math:`\externtype^\ast`, do:
+4. Let :math:`n = 0`.
 
-  a. Let :math:`\IMPORT~\X{nm}_{i1}~\X{nm}_{i2}~\X{xt}_i` be the deconstruction of :math:`\import_i`.
+5. For each :math:`\importmod_i` in :math:`\importmod^\ast`:
 
-  b. Let :math:`\X{result}_i` be the triple :math:`(\X{nm}_{i1}, \X{nm}_{i2}, \externtype_i)`.
+  a. Let :math:`\IMPORTMOD~\X{nm}_1~\X{imports}` be the deconstruction of :math:`\importmod_i`.
 
-5. Return the concatenation of all :math:`\X{result}_i`, in index order.
+  b. For each :math:`\import_j` in :math:`\X{imports}` and corresponding :math:`\externtype_n` in :math:`\externtype^\ast`, do:
+
+    i. Let :math:`\IMPORT~\X{nm}_2~\X{xt}_j` be the deconstruction of :math:`\import_j`.
+
+    ii. Let :math:`\X{resultimport}_n` be the pair :math:`(\X{nm}_2, \externtype_n)`.
+
+    iii. Increment :math:`n`.
+
+  c. Let :math:`\X{result}_i` be the pair :math:`(\X{nm}_1, \X{resultimports})`, where :math:`\X{resultimports}` is the concatenation of all :math:`\X{resultimport}_i`, in index order.
+
+6. Return the concatenation of all :math:`\X{result}_i`, in index order.
 
-6. Post-condition: each :math:`\externtype_i` is :ref:`valid <valid-externtype>` under the empty :ref:`context <context>`.
+7. Post-condition: each :math:`\externtype_i` is :ref:`valid <valid-externtype>` under the empty :ref:`context <context>`.
 
 .. math::
    ~ \\
    \begin{array}{lclll}
-   \F{module\_imports}(m) &=& (\X{nm}_1, \X{nm}_2, \externtype)^\ast \\
-     && \qquad (\iff (\IMPORT~\X{nm}_1~\X{nm}_2~\X{xt}^\ast)^\ast \in m \wedge {} \vdashmodule m : \externtype^\ast \rightarrow {\externtype'}^\ast) \\
+   \F{module\_imports}(m) &=& (\X{nm}_1, (\X{nm}_2, \externtype)^\ast)^\ast \\
+     && \qquad (\iff (\IMPORTMOD~\X{nm}_1~(\IMPORT~\X{nm}_2~\X{xt})^\ast)^\ast \in m \wedge {} \vdashmodule m : \externtype^\ast \rightarrow {\externtype'}^\ast) \\
    \end{array}
 
 

document/js-api/index.bs

@@ -498,55 +498,56 @@ To <dfn>instantiate imported strings</dfn> with module |module| and |importedStr
         1. Let |exportsObject| be the result of [=instantiate imported strings=] with |module| and |importedStringModule|
         1. [=map/set|Set=] |builtinOrStringImports|[|importedStringModule|] to |exportsObject|
     1. Let |imports| be « ».
-    1. [=list/iterate|For each=] (|moduleName|, |componentName|, |externtype|) of [=module_imports=](|module|),
+    1. [=list/iterate|For each=] (|moduleName|, |moduleImports|) of [=module_imports=](|module|),
         1. If |builtinOrStringImports| [=map/exist|contains=] |moduleName|,
             1. Let |o| be |builtinOrStringImports|[|moduleName|].
-            1. If |o| [=is not an Object=] or if |o| [=map/exist|does not contain=] |componentName|,
+            1. If |o| [=is not an Object=] or if |o| [=map/exist|does not contain=] |itemName|,
                 1. Set |o| to [=?=] [$Get$](|importObject|, |moduleName|).
         1. Else,
             1. Let |o| be [=?=] [$Get$](|importObject|, |moduleName|).
-        1. If |o| [=is not an Object=], throw a {{TypeError}} exception.
-        1. Let |v| be [=?=] [$Get$](|o|, |componentName|).
-        1. If |externtype| is of the form [=external-type/func=] |functype|,
-            1. If [$IsCallable$](|v|) is false, throw a {{LinkError}} exception.
-            1. If |v| has a \[[FunctionAddress]] internal slot, and therefore is an [=Exported Function=],
-                1. Let |funcaddr| be the value of |v|'s \[[FunctionAddress]] internal slot.
-            1. Otherwise,
-                1. [=Create a host function=] from |v| and |functype|, and let |funcaddr| be the result.
-                1. Let |index| be the number of external functions in |imports|. This value |index| is known as the <dfn>index of the host function</dfn> |funcaddr|.
-            1. Let |externfunc| be the [=external value=] [=external value|func=] |funcaddr|.
-            1. [=list/Append=] |externfunc| to |imports|.
-        1. If |externtype| is of the form [=external-type/global=] <var ignore>mut</var> |valtype|,
-            1. If |v| [=implements=] {{Global}},
-                1. Let |globaladdr| be |v|.\[[Global]].
-            1. Otherwise,
-                1. If |valtype| is [=i64=] and |v| [=is not a BigInt=],
-                    1. Throw a {{LinkError}} exception.
-                1. If |valtype| is one of [=i32=], [=f32=] or [=f64=] and |v| [=is not a Number=],
-                    1. Throw a {{LinkError}} exception.
-                1. If |valtype| is [=v128=],
-                    1. Throw a {{LinkError}} exception.
-                1. Let |value| be [=ToWebAssemblyValue=](|v|, |valtype|). If this operation throws a {{TypeError}}, catch it, and throw a {{LinkError}} exception.
-                1. Let |store| be the [=surrounding agent=]'s [=associated store=].
-                1. Let (|store|, |globaladdr|) be [=global_alloc=](|store|, [=const=] |valtype|, |value|).
-                1. Set the [=surrounding agent=]'s [=associated store=] to |store|.
-            1. Let |externglobal| be [=external value|global=] |globaladdr|.
-            1. [=list/Append=] |externglobal| to |imports|.
-        1. If |externtype| is of the form [=external-type/mem=] <var ignore>memtype</var>,
-            1. If |v| does not [=implement=] {{Memory}}, throw a {{LinkError}} exception.
-            1. Let |externmem| be the [=external value=] [=external value|mem=] |v|.\[[Memory]].
-            1. [=list/Append=] |externmem| to |imports|.
-        1. If |externtype| is of the form [=external-type/table=] <var ignore>tabletype</var>,
-            1. If |v| does not [=implement=] {{Table}}, throw a {{LinkError}} exception.
-            1. Let |tableaddr| be |v|.\[[Table]].
-            1. Let |externtable| be the [=external value=] [=external value|table=] |tableaddr|.
-            1. [=list/Append=] |externtable| to |imports|.
-        1. If |externtype| is of the form [=external-type/tag=] |attribute| <var ignore>functype</var>,
-            1. Assert: |attribute| is [=tagtype/attribute/exception=].
-            1. If |v| does not [=implement=] {{Tag}}, throw a {{LinkError}} exception.
-            1. Let |tagaddr| be |v|.\[[Address]].
-            1. Let |externtag| be the [=external value=] [=external value/tag=] |tagaddr|.
-            1. [=list/Append=] |externtag| to |imports|.
+        1. [=list/iterate|For each=] (|itemName|, |externtype|) of |moduleImports|,
+            1. If |o| [=is not an Object=], throw a {{TypeError}} exception.
+            1. Let |v| be [=?=] [$Get$](|o|, |itemName|).
+            1. If |externtype| is of the form [=external-type/func=] |functype|,
+                1. If [$IsCallable$](|v|) is false, throw a {{LinkError}} exception.
+                1. If |v| has a \[[FunctionAddress]] internal slot, and therefore is an [=Exported Function=],
+                    1. Let |funcaddr| be the value of |v|'s \[[FunctionAddress]] internal slot.
+                1. Otherwise,
+                    1. [=Create a host function=] from |v| and |functype|, and let |funcaddr| be the result.
+                    1. Let |index| be the number of external functions in |imports|. This value |index| is known as the <dfn>index of the host function</dfn> |funcaddr|.
+                1. Let |externfunc| be the [=external value=] [=external value|func=] |funcaddr|.
+                1. [=list/Append=] |externfunc| to |imports|.
+            1. If |externtype| is of the form [=external-type/global=] <var ignore>mut</var> |valtype|,
+                1. If |v| [=implements=] {{Global}},
+                    1. Let |globaladdr| be |v|.\[[Global]].
+                1. Otherwise,
+                    1. If |valtype| is [=i64=] and |v| [=is not a BigInt=],
+                        1. Throw a {{LinkError}} exception.
+                    1. If |valtype| is one of [=i32=], [=f32=] or [=f64=] and |v| [=is not a Number=],
+                        1. Throw a {{LinkError}} exception.
+                    1. If |valtype| is [=v128=],
+                        1. Throw a {{LinkError}} exception.
+                    1. Let |value| be [=ToWebAssemblyValue=](|v|, |valtype|). If this operation throws a {{TypeError}}, catch it, and throw a {{LinkError}} exception.
+                    1. Let |store| be the [=surrounding agent=]'s [=associated store=].
+                    1. Let (|store|, |globaladdr|) be [=global_alloc=](|store|, [=const=] |valtype|, |value|).
+                    1. Set the [=surrounding agent=]'s [=associated store=] to |store|.
+                1. Let |externglobal| be [=external value|global=] |globaladdr|.
+                1. [=list/Append=] |externglobal| to |imports|.
+            1. If |externtype| is of the form [=external-type/mem=] <var ignore>memtype</var>,
+                1. If |v| does not [=implement=] {{Memory}}, throw a {{LinkError}} exception.
+                1. Let |externmem| be the [=external value=] [=external value|mem=] |v|.\[[Memory]].
+                1. [=list/Append=] |externmem| to |imports|.
+            1. If |externtype| is of the form [=external-type/table=] <var ignore>tabletype</var>,
+                1. If |v| does not [=implement=] {{Table}}, throw a {{LinkError}} exception.
+                1. Let |tableaddr| be |v|.\[[Table]].
+                1. Let |externtable| be the [=external value=] [=external value|table=] |tableaddr|.
+                1. [=list/Append=] |externtable| to |imports|.
+            1. If |externtype| is of the form [=external-type/tag=] |attribute| <var ignore>functype</var>,
+                1. Assert: |attribute| is [=tagtype/attribute/exception=].
+                1. If |v| does not [=implement=] {{Tag}}, throw a {{LinkError}} exception.
+                1. Let |tagaddr| be |v|.\[[Address]].
+                1. Let |externtag| be the [=external value=] [=external value/tag=] |tagaddr|.
+                1. [=list/Append=] |externtag| to |imports|.
     1. Return |imports|.
 
 Note: This algorithm only verifies the right kind of JavaScript values are passed.