@zikojs/notebook 0.6.0 → 0.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zikojs/notebook",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "",
   "type": "module",
   "publishConfig": {
@@ -45,10 +45,8 @@
     "@codemirror/view": "^6.43.11",
     "@zikojs/lucide": "^0.2.2",
     "acorn": "^8.18.0",
-    "canvas-confetti": "^1.9.4",
     "codemirror": "^6.0.2",
     "lucide": "^1.44.0",
-    "marked": "^18.0.12",
     "rehype-stringify": "^10.0.1",
     "remark": "^15.0.1",
     "remark-rehype": "^11.1.2",

package/src/transform.js

@@ -1,4 +1,3 @@
-import van from "vanjs-core";
 import * as acorn from "acorn";
 
 export const rewriteImportNode = (node, code, importMapConfig) => {
@@ -21,19 +20,19 @@ export const rewriteImportNode = (node, code, importMapConfig) => {
     else if (spec.type === "ImportSpecifier") namedImports.push({ imported: spec.imported.name, local: spec.local.name });
   });
 
-  if (namespaceId) return `__scope.${namespaceId} = await import("${source}");`;
+  if (namespaceId) return `__scope__.${namespaceId} = await import("${source}");`;
 
   const tmp = `__mod_${node.start}`;
   let lines = [`const ${tmp} = await import("${source}");`];
 
   if (defaultImportName && namedImports.length === 0) {
-    lines.push(`__scope.${defaultImportName} = ${tmp}.default ?? ${tmp};`);
+    lines.push(`__scope__.${defaultImportName} = ${tmp}.default ?? ${tmp};`);
     return lines.join("\n");
   }
 
-  if (defaultImportName) lines.push(`__scope.${defaultImportName} = ${tmp}.default ?? ${tmp};`);
+  if (defaultImportName) lines.push(`__scope__.${defaultImportName} = ${tmp}.default ?? ${tmp};`);
   namedImports.forEach(({ imported, local }) => {
-    lines.push(`__scope.${local} = ${tmp}.${imported} !== undefined ? ${tmp}.${imported} : (${tmp}.default ?? ${tmp});`);
+    lines.push(`__scope__.${local} = ${tmp}.${imported} !== undefined ? ${tmp}.${imported} : (${tmp}.default ?? ${tmp});`);
   });
 
   return lines.join("\n");
@@ -53,7 +52,7 @@ export const transformImportsAndScope = (code, importMapConfig) => {
           if (decl.id.type === "Identifier") {
             const varName = decl.id.name;
             const initCode = decl.init ? code.slice(decl.init.start, decl.init.end) : "undefined";
-            replacementCode += `__scope.${varName} = ${initCode};\n`;
+            replacementCode += `__scope__.${varName} = ${initCode};\n`;
           } else if (decl.id.type === "ObjectPattern") {
             const initCode = decl.init ? code.slice(decl.init.start, decl.init.end) : "undefined";
             const tempVar = `__destruct_obj_${decl.start}`;
@@ -62,7 +61,7 @@ export const transformImportsAndScope = (code, importMapConfig) => {
               if (prop.value && prop.value.type === "Identifier") {
                 const localName = prop.value.name;
                 const keyName = prop.key.type === "Identifier" ? prop.key.name : prop.key.value;
-                replacementCode += `__scope.${localName} = ${tempVar}.${keyName}; `;
+                replacementCode += `__scope__.${localName} = ${tempVar}.${keyName}; `;
               }
             });
             replacementCode += `})();\n`;
@@ -73,7 +72,7 @@ export const transformImportsAndScope = (code, importMapConfig) => {
             decl.id.elements.forEach((elem, index) => {
               if (elem && elem.type === "Identifier") {
                 const localName = elem.name;
-                replacementCode += `__scope.${localName} = ${tempVar}[${index}]; `;
+                replacementCode += `__scope__.${localName} = ${tempVar}[${index}]; `;
               }
             });
             replacementCode += `})();\n`;
@@ -83,11 +82,11 @@ export const transformImportsAndScope = (code, importMapConfig) => {
       } else if (node.type === "FunctionDeclaration" && node.id) {
         const funcName = node.id.name;
         const funcBody = code.slice(node.start, node.end);
-        modifications.push({ start: node.start, end: node.end, replacement: `__scope.${funcName} = ${funcBody.replace(/^function\s+\w+/, "function")}` });
+        modifications.push({ start: node.start, end: node.end, replacement: `__scope__.${funcName} = ${funcBody.replace(/^function\s+\w+/, "function")}` });
       } else if (node.type === "ClassDeclaration" && node.id) {
         const className = node.id.name;
         const classBody = code.slice(node.start, node.end);
-        modifications.push({ start: node.start, end: node.end, replacement: `__scope.${className} = ${classBody.replace(/^class\s+\w+/, "class")}` });
+        modifications.push({ start: node.start, end: node.end, replacement: `__scope__.${className} = ${classBody.replace(/^class\s+\w+/, "class")}` });
       }
     });
 
@@ -105,16 +104,13 @@ export const evaluateCodeAsync = async (code, TARGET, importMapConfig, scope) =>
   const validScope = scope || Object.create(null);
   const compiledCode = transformImportsAndScope(code, importMapConfig);
 
-  const runCell = new Function("TARGET", "van", "__scope", `
+  const runCell = new Function("TARGET", "__scope__", `
     return (async () => {
-      with (__scope) {
+      with (__scope__) {
         ${compiledCode}
       }
     })();
   `);
 
-  const result = await runCell(TARGET, van, validScope);
-  // if (result !== undefined && result !== null) {
-  //   van.add(TARGET, result);
-  // }
+  const result = await runCell(TARGET, validScope);
 };