Merge pull request pyscript#25 from anaconda/mattpap/esm_import_module

fpliger · web-flow · commit 6525faf1626f · 2022-04-18T10:16:32.000-05:00
Allow `import d3` instead of `from esm import d3`
diff --git a/pyscriptjs/examples/d3.html b/pyscriptjs/examples/d3.html
@@ -109,7 +109,7 @@
 
 <py-script>
 from pyodide import create_proxy, to_js
-from esm import d3
+import d3
 
 fruits = [
   dict(name="🍊", count=21),
diff --git a/pyscriptjs/src/components/pyscript.ts b/pyscriptjs/src/components/pyscript.ts
@@ -247,8 +247,6 @@ export class PyScript extends HTMLElement {
     }
 
     protected async _register_esm(pyodide: PyodideInterface): Promise<void> {
-      const imports: {[key: string]: unknown} = {}
-
       for (const node of document.querySelectorAll("script[type='importmap']")) {
         const importmap = (() => {
           try {
@@ -265,17 +263,19 @@ export class PyScript extends HTMLElement {
           if (typeof name != "string" || typeof url != "string")
             continue
 
+          let exports: object
           try {
             // XXX: pyodide doesn't like Module(), failing with
             // "can't read 'name' of undefined" at import time
-            imports[name] = {...await import(url)}
+            exports = {...await import(url)}
           } catch {
-            console.error(`failed to fetch '${url}' for '${name}'`)
+            console.warn(`failed to fetch '${url}' for '${name}'`)
+            continue
           }
+
+          pyodide.registerJsModule(name, exports)
         }
       }
-
-      pyodide.registerJsModule("esm", imports)
     }
 
     async evaluate(): Promise<void> {

Original file line number	Diff line number	Diff line change
`@@ -247,8 +247,6 @@ export class PyScript extends HTMLElement {`
`247`	`247`	`}`
`248`	`248`
`249`	`249`	`protected async _register_esm(pyodide: PyodideInterface): Promise<void> {`
`250`		`- const imports: {[key: string]: unknown} = {}`
`251`		`-`
`252`	`250`	`for (const node of document.querySelectorAll("script[type='importmap']")) {`
`253`	`251`	`const importmap = (() => {`
`254`	`252`	`try {`
`@@ -265,17 +263,19 @@ export class PyScript extends HTMLElement {`
`265`	`263`	`if (typeof name != "string" \|\| typeof url != "string")`
`266`	`264`	`continue`
`267`	`265`
	`266`	`+ let exports: object`
`268`	`267`	`try {`
`269`	`268`	`// XXX: pyodide doesn't like Module(), failing with`
`270`	`269`	`// "can't read 'name' of undefined" at import time`
`271`		`- imports[name] = {...await import(url)}`
	`270`	`+ exports = {...await import(url)}`
`272`	`271`	`} catch {`
`273`		- console.error(`failed to fetch '${url}' for '${name}'`)
	`272`	+ console.warn(`failed to fetch '${url}' for '${name}'`)
	`273`	`+ continue`
`274`	`274`	`}`
	`275`	`+`
	`276`	`+ pyodide.registerJsModule(name, exports)`
`275`	`277`	`}`
`276`	`278`	`}`
`277`		`-`
`278`		`- pyodide.registerJsModule("esm", imports)`
`279`	`279`	`}`
`280`	`280`
`281`	`281`	`async evaluate(): Promise<void> {`