pass importSource to bind()

Author: rmorshea

docs/source/javascript-components.rst

@@ -73,7 +73,12 @@ adheres to the following interface:
         loadImportSource(source: string, sourceType: "NAME" | "URL") => Module;
     }
 
-    type bind = (node: HTMLElement, context: LayoutContext) => ({
+    type ImportSource = {
+        source: string;
+        sourceType: string;
+    }
+
+    type bind = (node: HTMLElement, context: LayoutContext, source: ImportSource) => ({
         render(component: any, props: Object, childModels: Array<any>): void;
         unmount(): void;
     });

src/client/packages/idom-client-react/package.json

@@ -1,7 +1,7 @@
 {
   "name": "idom-client-react",
   "description": "A client for IDOM implemented in React",
-  "version": "0.9.2",
+  "version": "0.10.0",
   "author": "Ryan Morshead",
   "license": "MIT",
   "type": "module",

src/client/packages/idom-client-react/src/component.js

@@ -36,6 +36,33 @@ export function Element({ model }) {
   }
 }
 
+export function elementChildren(modelChildren) {
+  if (!modelChildren) {
+    return [];
+  } else {
+    return modelChildren.map((child) => {
+      switch (typeof child) {
+        case "object":
+          return html`<${Element} key=${child.key} model=${child} />`;
+        case "string":
+          return child;
+      }
+    });
+  }
+}
+
+export function elementAttributes(model, sendEvent) {
+  const attributes = Object.assign({}, model.attributes);
+
+  if (model.eventHandlers) {
+    for (const [eventName, eventSpec] of Object.entries(model.eventHandlers)) {
+      attributes[eventName] = eventHandler(sendEvent, eventSpec);
+    }
+  }
+
+  return attributes;
+}
+
 function StandardElement({ model }) {
   const config = React.useContext(LayoutConfigContext);
   const children = elementChildren(model.children);
@@ -95,33 +122,6 @@ function RenderImportedElement({ model, importSource }) {
   return html`<div ref=${mountPoint} />`;
 }
 
-export function elementChildren(modelChildren) {
-  if (!modelChildren) {
-    return [];
-  } else {
-    return modelChildren.map((child) => {
-      switch (typeof child) {
-        case "object":
-          return html`<${Element} key=${child.key} model=${child} />`;
-        case "string":
-          return child;
-      }
-    });
-  }
-}
-
-export function elementAttributes(model, sendEvent) {
-  const attributes = Object.assign({}, model.attributes);
-
-  if (model.eventHandlers) {
-    for (const [eventName, eventSpec] of Object.entries(model.eventHandlers)) {
-      attributes[eventName] = eventHandler(sendEvent, eventSpec);
-    }
-  }
-
-  return attributes;
-}
-
 function eventHandler(sendEvent, eventSpec) {
   return function () {
     const data = Array.from(arguments).map((value) => {
@@ -152,7 +152,11 @@ function loadImportSource(config, importSource) {
         return {
           data: importSource,
           bind: (node) => {
-            const binding = module.bind(node, config);
+            const shortImportSource = {
+              source: importSource.source,
+              sourceType: importSource.sourceType,
+            };
+            const binding = module.bind(node, config, shortImportSource);
             if (
               typeof binding.render == "function" &&
               typeof binding.unmount == "function"