@zikojs/notebook 0.15.0 → 0.15.1

package/src/compiler/evaluate.js

@@ -1,130 +1,130 @@
-import { transformImportsAndScope } from "./transform.js";
-import { Console as _Console } from '@zikojs/console/no-css'
-import { tags } from 'ziko/dom'
-const { div } = tags
-
-const Console = {
-  log : (...args) => div(_Console.log(...args)),
-  table : (...args) => div(_Console.table(...args)),
-  warn : (...args) => div(_Console.warn(...args)),
-  error : (...args) => div(_Console.error(...args))
-}
-
-export const evaluateCodeAsync = async (
-  code,
-  TARGET,
-  {
-    importMap = {},
-    plugins = [],
-    runtime = null,
-    cdnFallback = true,
-  } = {},
-  scope,
-) => {
-  const validScope = scope || Object.create(null);
-  const importScope = Object.create(null);
-
-  validScope.console = Console;
-
-  const context = {
-    TARGET,
-    scope: validScope,
-    importMap,
-    plugins,
-    runtime,
-    cdnFallback
-  };
-
-  const selectedPlugin = plugins.find(
-    p => p.name === runtime,
-  );
-
-  // Runtime-specific evaluator
-  if (
-    selectedPlugin &&
-    selectedPlugin.evaluate
-  ) {
-    return await selectedPlugin.evaluate(
-      code,
-      context,
-    );
-  }
-
-  let compiledCode = code;
-
-  for (const plugin of plugins) {
-    if (
-      selectedPlugin &&
-      plugin.name !== runtime
-    ) {
-      continue;
-    }
-
-    if (plugin.transform) {
-      compiledCode = await plugin.transform(
-        compiledCode,
-        context,
-      );
-    }
-  }
-
-  compiledCode = await transformImportsAndScope(
-  compiledCode,
-  {
-    importMap,
-    plugins,
-    cdnFallback,
-    importScopeIdentifier: "__imports__",
-  },
-);
-// console.log(compiledCode)
-
-  const runCell = new Function(
-    "TARGET",
-    "__scope__",
-    "__imports__",
-    `
-    // Bind the active TARGET for this cell evaluation
-    if (typeof __Ziko__ !== "undefined" && __Ziko__.__Config__) {
-      __Ziko__.__Config__.default.target = TARGET;
-      __Ziko__.__Config__.default.autoMount = true;
-    }
-
-
-
-    return (async () => {
-      with (__scope__) {
-        return await (async () => {
-          with (__imports__) {
-            ${compiledCode}
-          }
-        })();
-        }
-    })();
-    `,
-  );
-
-  let result = await runCell(
-    TARGET,
-    validScope,
-    importScope,
-  );
-
-  for (const plugin of plugins) {
-    if (
-      selectedPlugin &&
-      plugin.name !== runtime
-    ) {
-      continue;
-    }
-
-    if (plugin.afterEvaluate) {
-      result = await plugin.afterEvaluate(
-        result,
-        context,
-      );
-    }
-  }
-
-  return result;
+import { transformImportsAndScope } from "./transform.js";
+import { Console as _Console } from '@zikojs/console/no-css'
+import { tags } from 'ziko/dom'
+const { div } = tags
+
+const Console = {
+  log : (...args) => div(_Console.log(...args)),
+  table : (...args) => div(_Console.table(...args)),
+  warn : (...args) => div(_Console.warn(...args)),
+  error : (...args) => div(_Console.error(...args))
+}
+
+export const evaluateCodeAsync = async (
+  code,
+  TARGET,
+  {
+    importMap = {},
+    plugins = [],
+    runtime = null,
+    cdnFallback = true,
+  } = {},
+  scope,
+) => {
+  const validScope = scope || Object.create(null);
+  const importScope = Object.create(null);
+
+  validScope.console = Console;
+
+  const context = {
+    TARGET,
+    scope: validScope,
+    importMap,
+    plugins,
+    runtime,
+    cdnFallback
+  };
+
+  const selectedPlugin = plugins.find(
+    p => p.name === runtime,
+  );
+
+  // Runtime-specific evaluator
+  if (
+    selectedPlugin &&
+    selectedPlugin.evaluate
+  ) {
+    return await selectedPlugin.evaluate(
+      code,
+      context,
+    );
+  }
+
+  let compiledCode = code;
+
+  for (const plugin of plugins) {
+    if (
+      selectedPlugin &&
+      plugin.name !== runtime
+    ) {
+      continue;
+    }
+
+    if (plugin.transform) {
+      compiledCode = await plugin.transform(
+        compiledCode,
+        context,
+      );
+    }
+  }
+
+  compiledCode = await transformImportsAndScope(
+  compiledCode,
+  {
+    importMap,
+    plugins,
+    cdnFallback,
+    importScopeIdentifier: "__imports__",
+  },
+);
+// console.log(compiledCode)
+
+  const runCell = new Function(
+    "TARGET",
+    "__scope__",
+    "__imports__",
+    `
+    // Bind the active TARGET for this cell evaluation
+    if (typeof __Ziko__ !== "undefined" && __Ziko__.__Config__) {
+      __Ziko__.__Config__.default.target = TARGET;
+      __Ziko__.__Config__.default.autoMount = true;
+    }
+
+
+
+    return (async () => {
+      with (__scope__) {
+        return await (async () => {
+          with (__imports__) {
+            ${compiledCode}
+          }
+        })();
+        }
+    })();
+    `,
+  );
+
+  let result = await runCell(
+    TARGET,
+    validScope,
+    importScope,
+  );
+
+  for (const plugin of plugins) {
+    if (
+      selectedPlugin &&
+      plugin.name !== runtime
+    ) {
+      continue;
+    }
+
+    if (plugin.afterEvaluate) {
+      result = await plugin.afterEvaluate(
+        result,
+        context,
+      );
+    }
+  }
+
+  return result;
 };

package/src/compiler/imports.js

@@ -1,190 +1,190 @@
-
-const CDN = "https://esm.sh/";
-const MANIFEST_FILE = "ziko-notebook-imports.json";
-const isProductionBuild =
-  typeof import.meta.env !== "undefined" && import.meta.env.PROD;
-
-let buildImportMapPromise;
-
-const loadBuildImportMap = () => {
-  if (!isProductionBuild || typeof document === "undefined") {
-    return Promise.resolve({});
-  }
-
-  if (!buildImportMapPromise) {
-    const manifestUrl = new URL(MANIFEST_FILE, document.baseURI);
-
-    buildImportMapPromise = fetch(manifestUrl).then(async (response) => {
-      if (response.status === 404) {
-        return {};
-      }
-
-      if (!response.ok) {
-        throw new Error(
-          `Failed to load the notebook import map: ${response.status} ${response.statusText}`,
-        );
-      }
-
-      const imports = await response.json();
-
-      if (!imports || typeof imports !== "object" || Array.isArray(imports)) {
-        throw new TypeError("The notebook import map must be a JSON object.");
-      }
-
-      return imports;
-    });
-  }
-
-  return buildImportMapPromise;
-};
-
-const isURL = (source) =>
-  /^(?:https?:\/\/|data:|blob:)/i.test(source);
-
-const isBareSpecifier = (source) =>
-  !source.startsWith(".") &&
-  !source.startsWith("/") &&
-  !source.startsWith("#") &&
-  !isURL(source);
-
-export const resolveImport = async (
-  source,
-  {
-    importMap = {},
-    plugins = [],
-    resolverEndpoint = "/__notebook_resolve",
-    cdnFallback = true,
-  } = {},
-) => {
-  // Preserve explicit mappings, including package subpaths.
-  if (importMap[source]) {
-    return importMap[source];
-  }
-
-  if (!isBareSpecifier(source)) {
-    return source;
-  }
-
-  // Preserve runtime-specific and custom resolution hooks.
-  for (const plugin of plugins) {
-    if (typeof plugin.resolveImport !== "function") {
-      continue;
-    }
-
-    const resolved = await plugin.resolveImport(source);
-
-    if (typeof resolved === "string" && resolved) {
-      return resolved;
-    }
-  }
-
-  const buildImportMap = await loadBuildImportMap();
-
-  if (typeof buildImportMap[source] === "string") {
-    return buildImportMap[source];
-  }
-
-  // Ask the host dev server to resolve installed packages.
-  try {
-    const params = new URLSearchParams({
-      specifier: source,
-    });
-
-    const response = await fetch(
-      `${resolverEndpoint}?${params.toString()}`,
-    );
-
-    if (response.ok) {
-      const result = await response.json();
-
-      if (typeof result.url === "string" && result.url) {
-        return result.url;
-      }
-    }
-  } catch {
-    // The Vite endpoint may not be available outside development.
-  }
-
-  if (cdnFallback) {
-    return `${CDN}${source}`;
-  }
-
-  throw new Error(
-    `Cannot resolve "${source}" locally. ` +
-    `Install the package or provide an importMap entry. ` +
-    `CDN fallback is disabled.`,
-  );
-};
-
-// Keep your existing rewriteImportNode implementation below.
-
-export const rewriteImportNode = async (
-  node,
-  code,
-  context,
-) => {
-  const source = await resolveImport(
-    node.source.value,
-    context,
-  );
-  const importScope =
-    context.importScopeIdentifier || "__scope__";
-
-  // Safely quote the URL in generated JavaScript.
-  const url = JSON.stringify(source);
-
-  if (node.specifiers.length === 0) {
-    return `await import(${url});`;
-  }
-
-  let defaultImportName = null;
-  let namespaceId = null;
-  const namedImports = [];
-
-  for (const spec of node.specifiers) {
-    if (spec.type === "ImportNamespaceSpecifier") {
-      namespaceId = spec.local.name;
-    } else if (spec.type === "ImportDefaultSpecifier") {
-      defaultImportName = spec.local.name;
-    } else if (spec.type === "ImportSpecifier") {
-      namedImports.push({
-        imported:
-          spec.imported.name ?? spec.imported.value,
-        local: spec.local.name,
-      });
-    }
-  }
-
-  if (namespaceId) {
-    return (
-      `${importScope}.${namespaceId} = ` +
-      `await import(${url});`
-    );
-  }
-
-  const tmp = `__mod_${node.start}`;
-
-  const lines = [
-    `const ${tmp} = await import(${url});`,
-  ];
-
-  if (defaultImportName) {
-    lines.push(
-      `${importScope}.${defaultImportName} = ` +
-      `${tmp}.default ?? ${tmp};`,
-    );
-  }
-
-  for (const { imported, local } of namedImports) {
-    lines.push(
-      `${importScope}.${local} = ` +
-      `${tmp}[${JSON.stringify(imported)}] !== undefined ` +
-      `? ${tmp}[${JSON.stringify(imported)}] ` +
-      `: (${tmp}.default?.[${JSON.stringify(imported)}] !== undefined ` +
-      `? ${tmp}.default[${JSON.stringify(imported)}] ` +
-      `: (${tmp}.default ?? ${tmp}));`,
-    );
-  }
-
-  return lines.join("\n");
+
+const CDN = "https://esm.sh/";
+const MANIFEST_FILE = "ziko-notebook-imports.json";
+const isProductionBuild =
+  typeof import.meta.env !== "undefined" && import.meta.env.PROD;
+
+let buildImportMapPromise;
+
+const loadBuildImportMap = () => {
+  if (!isProductionBuild || typeof document === "undefined") {
+    return Promise.resolve({});
+  }
+
+  if (!buildImportMapPromise) {
+    const manifestUrl = new URL(MANIFEST_FILE, document.baseURI);
+
+    buildImportMapPromise = fetch(manifestUrl).then(async (response) => {
+      if (response.status === 404) {
+        return {};
+      }
+
+      if (!response.ok) {
+        throw new Error(
+          `Failed to load the notebook import map: ${response.status} ${response.statusText}`,
+        );
+      }
+
+      const imports = await response.json();
+
+      if (!imports || typeof imports !== "object" || Array.isArray(imports)) {
+        throw new TypeError("The notebook import map must be a JSON object.");
+      }
+
+      return imports;
+    });
+  }
+
+  return buildImportMapPromise;
+};
+
+const isURL = (source) =>
+  /^(?:https?:\/\/|data:|blob:)/i.test(source);
+
+const isBareSpecifier = (source) =>
+  !source.startsWith(".") &&
+  !source.startsWith("/") &&
+  !source.startsWith("#") &&
+  !isURL(source);
+
+export const resolveImport = async (
+  source,
+  {
+    importMap = {},
+    plugins = [],
+    resolverEndpoint = "/__notebook_resolve",
+    cdnFallback = true,
+  } = {},
+) => {
+  // Preserve explicit mappings, including package subpaths.
+  if (importMap[source]) {
+    return importMap[source];
+  }
+
+  if (!isBareSpecifier(source)) {
+    return source;
+  }
+
+  // Preserve runtime-specific and custom resolution hooks.
+  for (const plugin of plugins) {
+    if (typeof plugin.resolveImport !== "function") {
+      continue;
+    }
+
+    const resolved = await plugin.resolveImport(source);
+
+    if (typeof resolved === "string" && resolved) {
+      return resolved;
+    }
+  }
+
+  const buildImportMap = await loadBuildImportMap();
+
+  if (typeof buildImportMap[source] === "string") {
+    return buildImportMap[source];
+  }
+
+  // Ask the host dev server to resolve installed packages.
+  try {
+    const params = new URLSearchParams({
+      specifier: source,
+    });
+
+    const response = await fetch(
+      `${resolverEndpoint}?${params.toString()}`,
+    );
+
+    if (response.ok) {
+      const result = await response.json();
+
+      if (typeof result.url === "string" && result.url) {
+        return result.url;
+      }
+    }
+  } catch {
+    // The Vite endpoint may not be available outside development.
+  }
+
+  if (cdnFallback) {
+    return `${CDN}${source}`;
+  }
+
+  throw new Error(
+    `Cannot resolve "${source}" locally. ` +
+    `Install the package or provide an importMap entry. ` +
+    `CDN fallback is disabled.`,
+  );
+};
+
+// Keep your existing rewriteImportNode implementation below.
+
+export const rewriteImportNode = async (
+  node,
+  code,
+  context,
+) => {
+  const source = await resolveImport(
+    node.source.value,
+    context,
+  );
+  const importScope =
+    context.importScopeIdentifier || "__scope__";
+
+  // Safely quote the URL in generated JavaScript.
+  const url = JSON.stringify(source);
+
+  if (node.specifiers.length === 0) {
+    return `await import(${url});`;
+  }
+
+  let defaultImportName = null;
+  let namespaceId = null;
+  const namedImports = [];
+
+  for (const spec of node.specifiers) {
+    if (spec.type === "ImportNamespaceSpecifier") {
+      namespaceId = spec.local.name;
+    } else if (spec.type === "ImportDefaultSpecifier") {
+      defaultImportName = spec.local.name;
+    } else if (spec.type === "ImportSpecifier") {
+      namedImports.push({
+        imported:
+          spec.imported.name ?? spec.imported.value,
+        local: spec.local.name,
+      });
+    }
+  }
+
+  if (namespaceId) {
+    return (
+      `${importScope}.${namespaceId} = ` +
+      `await import(${url});`
+    );
+  }
+
+  const tmp = `__mod_${node.start}`;
+
+  const lines = [
+    `const ${tmp} = await import(${url});`,
+  ];
+
+  if (defaultImportName) {
+    lines.push(
+      `${importScope}.${defaultImportName} = ` +
+      `${tmp}.default ?? ${tmp};`,
+    );
+  }
+
+  for (const { imported, local } of namedImports) {
+    lines.push(
+      `${importScope}.${local} = ` +
+      `${tmp}[${JSON.stringify(imported)}] !== undefined ` +
+      `? ${tmp}[${JSON.stringify(imported)}] ` +
+      `: (${tmp}.default?.[${JSON.stringify(imported)}] !== undefined ` +
+      `? ${tmp}.default[${JSON.stringify(imported)}] ` +
+      `: (${tmp}.default ?? ${tmp}));`,
+    );
+  }
+
+  return lines.join("\n");
 };

package/src/compiler/index.js

@@ -1,12 +1,12 @@
-export {
-  evaluateCodeAsync,
-} from "./evaluate.js";
-
-export {
-  transformImportsAndScope,
-} from "./transform.js";
-
-export {
-  resolveImport,
-  rewriteImportNode,
+export {
+  evaluateCodeAsync,
+} from "./evaluate.js";
+
+export {
+  transformImportsAndScope,
+} from "./transform.js";
+
+export {
+  resolveImport,
+  rewriteImportNode,
 } from "./imports.js";