devjar 0.0.2 → 0.1.0

package/lib/index.mjs

@@ -1,39 +1,46 @@
-import { transform } from 'sucrase'
+async function createModule(files, { getModulePath }) {
+  let currentImportMap
+  let shim
 
-const AsyncFunction = Object.getPrototypeOf(async function(){}).constructor
-
-async function createModuleImporter(code) {
-  const buildModule = new AsyncFunction(undefined, `return await import('data:text/javascript;base64,${btoa(code)}')`)
-  let mod
-  try {
-    mod = buildModule()
-  } catch (e) {
-    return {}
+  async function setupImportMap() {
+    if (shim) return shim
+    window.esmsInitOptions = {
+      shimMode: true,
+      mapOverrides: true,
+    }
+    shim = import(/* webpackIgnore: true */ getModulePath('es-module-shims'))
+    await shim
   }
-  return mod
-}
 
-function transformCode(code) {
-  return transform(code, {
-    transforms: ['jsx', 'typescript'],
-  }).code
-}
+  function updateImportMap(imports) {
+    imports['react'] = getModulePath('react')
+    imports['react-dom'] = getModulePath('react-dom')
 
-async function compileModule(code) {
-  const transformed = transformCode(code)
-  return createModuleImporter(transformed)
-}
+    const script = document.createElement('script')
+    script.type = 'importmap-shim'
+    script.innerHTML = JSON.stringify({ imports })
+    document.body.appendChild(script)
+    if (currentImportMap) {
+      currentImportMap.parentNode.removeChild(currentImportMap)
+    }
+    currentImportMap = script
+  }
 
-async function createModule(code) {
-  let mod = {}, error
-  try {
-    mod = await compileModule(code)
-  } catch (e) {
-    error = e
+
+  function createInlinedModule(code) {
+    return `data:text/javascript;utf-8,${encodeURIComponent(code)}`
   }
-  return { mod, error }
-}
 
-export {
-  createModule,
+  await setupImportMap()
+  const imports = Object.fromEntries(
+    Object.entries(files).map(([key, code]) => [
+      key,
+      createInlinedModule(code),
+    ])
+  )
+
+  updateImportMap(imports)
+  return self.importShim('index.js')
 }
+
+export { createModule }

package/lib/react.mjs

@@ -1,29 +1,164 @@
-import { useCallback, useEffect, useState, useRef } from 'react'
+import { useEffect, useCallback, useState, useRef } from 'react'
 import { createModule } from './index.mjs'
+import { transform } from 'sucrase'
+import { init, parse } from 'es-module-lexer'
 
-export function useDynamicModule(code) {
-  const [{ mod, error }, setMod] = useState({})
-  const [shouldRender, rerender] = useState({})
-  const prevShouldRenderRef = useRef({})
+let esModuleLexerInit
 
-  const load = () => {
-    rerender({})
-  }
+const isRelative = s => s.startsWith('./')
+
+function transformCode(_code, getModulePath, externals) {
+  const code = transform(_code, {
+    transforms: ['jsx', 'typescript'],
+  }).code
+
+  return replaceImports(code, getModulePath, externals)
+}
+
+function replaceImports(_code, getModulePath, externals) {
+  const [imports] = parse(_code)
+  let code = ''
+  let lastIndex = 0
+  imports.forEach(({ ss, s, e, se, n }) => {
+    code += _code.slice(lastIndex, ss)
+    code += _code.substring(ss, s)
+    code += isRelative(n)
+        ? ('@' + n.slice(2))
+        : externals.has(n) ? n : getModulePath(n)
+    code += _code.substring(e, se)
+    lastIndex = se
+  })
+  code += _code.substring(lastIndex)
+  return code
+}
+
+function createRenderer(_React0, _ReactDOM0, _createModule, _getModulePath) {
+  let reactRoot
 
-  const loadMod = useCallback(() => {
-    if (code) {
-      createModule(code).then(_mod => {
-        setMod(_mod)
-      })
+  async function render(files) {
+    const mod = await _createModule(files, { getModulePath: _getModulePath })
+    const _React = await self.importShim('react')
+    const _ReactDOM = await self.importShim('react-dom')
+
+    const _jsx = _React.createElement
+    const root = document.getElementById('root')
+    class ErrorBoundary extends _React.Component {
+      state = {
+        error: null,
+      }
+      componentDidCatch(error) {
+        this.setState({ error })
+      }
+      render() {
+        if (this.state.error) {
+          return _jsx('div', null, this.state.error.message)
+        }
+        return this.props.children
+      }
+    }
+
+    const isReact18 = !!_ReactDOM.createRoot
+    if (isReact18 && !reactRoot) {
+      reactRoot = _ReactDOM.createRoot(root)
+    }
+    const Component = mod.default
+    const element = _jsx(ErrorBoundary, null, _jsx(Component))
+    if (isReact18) {
+      reactRoot.render(element)
+    } else {
+      _ReactDOM.render(element, root)
     }
-  }, [code])
+  }
+
+  return render
+}
+
+function createMainScript({ getModulePath }) {
+  const code = (
+`'use strict';
+const createModule = ${createModule.toString()};
+const createRenderer = ${createRenderer.toString()};
+const getModulePath = ${getModulePath.toString()};
+
+globalThis.__render__ = createRenderer(0, 0, createModule, getModulePath);
+`)
+  return code
+}
+
+
+export function useLiveCode({ getModulePath }) {
+  const iframeRef = useRef()
+  const [error, setError] = useState()
+  const rerender = useState({})[1]
+  const scriptRef = useRef(typeof window !== 'undefined' ? document.createElement('script') : null)
 
   useEffect(() => {
-    if (prevShouldRenderRef.current !== shouldRender) {
-      loadMod()
+    const iframe = iframeRef.current
+    const doc = iframe && iframe.contentDocument
+
+    if (iframe) {
+      const doc = iframe.contentDocument
+      const div = document.createElement('div')
+      const script = scriptRef.current
+      const scriptContent = createMainScript({ getModulePath })
+
+      div.id = 'root'
+      script.type = 'module'
+      script.id = 'main'
+      script.src = `data:text/javascript;utf-8,${encodeURIComponent(scriptContent)}`
+
+      doc.body.appendChild(div)
+      doc.body.appendChild(script)
+    }
+    return () => {
+      if (iframe) {
+        doc.body.removeChild(doc.getElementById('root'))
+        doc.body.removeChild(doc.getElementById('main'))
+      }
     }
-    prevShouldRenderRef.current = shouldRender
-  }, [shouldRender, loadMod])
+  }, [])
+
+  const load = useCallback(async (files) => {
+    if (!esModuleLexerInit) {
+      await init
+      esModuleLexerInit = true
+    }
+
+    if (files) {
+      const overrideExternals =
+        new Set(Object.keys(files).filter(name => !isRelative(name) && name !== 'index.js'))
+
+      // Always share react as externals
+      overrideExternals.add('react')
+      overrideExternals.add('react-dom')
+
+      try {
+        const transformedFiles = Object.keys(files).reduce((res, filename) => {
+          const key = isRelative(filename) ? ('@' + filename.slice(2)) : filename
+          res[key] = transformCode(files[filename], getModulePath, overrideExternals)
+          return res
+        }, {})
+
+        const iframe = iframeRef.current
+        const script = scriptRef.current
+        if (iframe) {
+          const render = iframe.contentWindow.__render__
+          if (render) {
+            render(transformedFiles)
+          } else {
+            // if render is not loaded yet, wait until it's loaded
+            script.onload = () => {
+              iframe.contentWindow.__render__(transformedFiles)
+            }
+          }
+        }
+        setError()
+      } catch (e) {
+        setError(e)
+      }
+    }
+    rerender({})
+  }, [])
 
-  return { mod, error, load }
+  return { ref: iframeRef, error, load }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "devjar",
-  "version": "0.0.2",
+  "version": "0.1.0",
   "type": "module",
   "exports": {
     ".": "./lib/index.mjs",
@@ -11,16 +11,25 @@
     "lib"
   ],
   "scripts": {
+    "build": "next build ./docs",
+    "start": "next start ./docs",
     "dev": "next dev ./docs"
   },
+  "peerDependencies": {
+    "react": "^17.0.0 || ^18.0.0"
+  },
   "dependencies": {
+    "es-module-lexer": "^0.10.5",
+    "es-module-shims": "^1.5.4",
     "sucrase": "3.21.0"
   },
   "devDependencies": {
+    "codice": "^0.0.4",
     "devjar": "link:./",
-    "next": "^12.1.6-canary.4",
+    "lodash-es": "^4.17.21",
+    "next": "^12.1.7-canary.0",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
-    "sugar-high": "^0.3.1"
+    "sugar-high": "^0.4.0"
   }
 }