@zikojs/notebook 0.14.2 → 0.15.1

package/src/compiler/scope.js

@@ -1,95 +1,95 @@
-export const rewriteVariableDeclaration = (
-  node,
-  code,
-) => {
-  let replacementCode = "";
-
-  node.declarations.forEach((decl) => {
-    const initCode = decl.init
-      ? code.slice(decl.init.start, decl.init.end)
-      : "undefined";
-
-    if (decl.id.type === "Identifier") {
-      const varName = decl.id.name;
-
-      replacementCode +=
-        `__scope__.${varName} = ${initCode};\n`;
-
-      return;
-    }
-
-    if (decl.id.type === "ObjectPattern") {
-      const tempVar = `__destruct_obj_${decl.start}`;
-
-      replacementCode +=
-        `(() => { const ${tempVar} = ${initCode}; `;
-
-      decl.id.properties.forEach((prop) => {
-        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 += `})();\n`;
-
-      return;
-    }
-
-    if (decl.id.type === "ArrayPattern") {
-      const tempVar = `__destruct_arr_${decl.start}`;
-
-      replacementCode +=
-        `(() => { const ${tempVar} = ${initCode}; `;
-
-      decl.id.elements.forEach((elem, index) => {
-        if (elem && elem.type === "Identifier") {
-          replacementCode +=
-            `__scope__.${elem.name} = ` +
-            `${tempVar}[${index}]; `;
-        }
-      });
-
-      replacementCode += `})();\n`;
-    }
-  });
-
-  return replacementCode;
-};
-
-export const rewriteFunctionDeclaration = (
-  node,
-  code,
-) => {
-  const name = node.id.name;
-  const body = code.slice(node.start, node.end);
-
-  return (
-    `__scope__.${name} = ` +
-    body.replace(/^function\s+\w+/, "function")
-  );
-};
-
-export const rewriteClassDeclaration = (
-  node,
-  code,
-) => {
-  const name = node.id.name;
-  const body = code.slice(node.start, node.end);
-
-  return (
-    `__scope__.${name} = ` +
-    body.replace(/^class\s+\w+/, "class")
-  );
+export const rewriteVariableDeclaration = (
+  node,
+  code,
+) => {
+  let replacementCode = "";
+
+  node.declarations.forEach((decl) => {
+    const initCode = decl.init
+      ? code.slice(decl.init.start, decl.init.end)
+      : "undefined";
+
+    if (decl.id.type === "Identifier") {
+      const varName = decl.id.name;
+
+      replacementCode +=
+        `__scope__.${varName} = ${initCode};\n`;
+
+      return;
+    }
+
+    if (decl.id.type === "ObjectPattern") {
+      const tempVar = `__destruct_obj_${decl.start}`;
+
+      replacementCode +=
+        `(() => { const ${tempVar} = ${initCode}; `;
+
+      decl.id.properties.forEach((prop) => {
+        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 += `})();\n`;
+
+      return;
+    }
+
+    if (decl.id.type === "ArrayPattern") {
+      const tempVar = `__destruct_arr_${decl.start}`;
+
+      replacementCode +=
+        `(() => { const ${tempVar} = ${initCode}; `;
+
+      decl.id.elements.forEach((elem, index) => {
+        if (elem && elem.type === "Identifier") {
+          replacementCode +=
+            `__scope__.${elem.name} = ` +
+            `${tempVar}[${index}]; `;
+        }
+      });
+
+      replacementCode += `})();\n`;
+    }
+  });
+
+  return replacementCode;
+};
+
+export const rewriteFunctionDeclaration = (
+  node,
+  code,
+) => {
+  const name = node.id.name;
+  const body = code.slice(node.start, node.end);
+
+  return (
+    `__scope__.${name} = ` +
+    body.replace(/^function\s+\w+/, "function")
+  );
+};
+
+export const rewriteClassDeclaration = (
+  node,
+  code,
+) => {
+  const name = node.id.name;
+  const body = code.slice(node.start, node.end);
+
+  return (
+    `__scope__.${name} = ` +
+    body.replace(/^class\s+\w+/, "class")
+  );
 };

package/src/compiler/transform.js

@@ -1,112 +1,116 @@
-import * as acorn from "acorn";
-
-import {
-  rewriteImportNode,
-} from "./imports.js";
-
-import {
-  rewriteVariableDeclaration,
-  rewriteFunctionDeclaration,
-  rewriteClassDeclaration,
-} from "./scope.js";
-
-
-export const transformImportsAndScope = async (
-  code,
-  {
-    importMap = {},
-    plugins = [],
-    resolverEndpoint,
-  } = {},
-) => {
-  try {
-    const ast = acorn.parse(code, {
-      ecmaVersion: "latest",
-      sourceType: "module",
-      allowReturnOutsideFunction: true,
-    });
-
-    const context = {
-      importMap,
-      plugins,
-      resolverEndpoint,
-    };
-
-    const modifications = [];
-
-    for (const node of ast.body) {
-      if (node.type === "ImportDeclaration") {
-        modifications.push({
-          start: node.start,
-          end: node.end,
-          replacement: await rewriteImportNode(
-            node,
-            code,
-            context,
-          ),
-        });
-
-        continue;
-      }
-
-      if (node.type === "VariableDeclaration") {
-        modifications.push({
-          start: node.start,
-          end: node.end,
-          replacement: rewriteVariableDeclaration(node, code),
-        });
-
-        continue;
-      }
-
-      if (
-        node.type === "FunctionDeclaration" &&
-        node.id
-      ) {
-        modifications.push({
-          start: node.start,
-          end: node.end,
-          replacement: rewriteFunctionDeclaration(node, code),
-        });
-
-        continue;
-      }
-
-      if (
-        node.type === "ClassDeclaration" &&
-        node.id
-      ) {
-        modifications.push({
-          start: node.start,
-          end: node.end,
-          replacement: rewriteClassDeclaration(node, code),
-        });
-      }
-    }
-
-    modifications.sort((a, b) => b.start - a.start);
-
-    let transformedCode = code;
-
-    for (const modification of modifications) {
-      transformedCode =
-        transformedCode.slice(0, modification.start) +
-        modification.replacement +
-        transformedCode.slice(modification.end);
-    }
-
-    return transformedCode;
-  } catch (error) {
-    if (
-      code.trim().startsWith("import ") ||
-      code.includes("\nimport ")
-    ) {
-      throw new SyntaxError(
-        "Invalid code module layout syntax.",
-        { cause: error },
-      );
-    }
-
-    return code;
-  }
+import * as acorn from "acorn";
+
+import {
+  rewriteImportNode,
+} from "./imports.js";
+
+import {
+  rewriteVariableDeclaration,
+  rewriteFunctionDeclaration,
+  rewriteClassDeclaration,
+} from "./scope.js";
+
+
+export const transformImportsAndScope = async (
+  code,
+  {
+    importMap = {},
+    plugins = [],
+    resolverEndpoint,
+    importScopeIdentifier = "__scope__",
+  } = {},
+) => {
+  try {
+    const ast = acorn.parse(code, {
+      ecmaVersion: "latest",
+      sourceType: "module",
+      allowReturnOutsideFunction: true,
+    });
+
+    const context = {
+      importMap,
+      plugins,
+      resolverEndpoint,
+      importScopeIdentifier,
+    };
+
+    const modifications = [];
+
+    for (const node of ast.body) {
+      if (node.type === "ImportDeclaration") {
+        modifications.push({
+          start: node.start,
+          end: node.end,
+          replacement: await rewriteImportNode(
+            node,
+            code,
+            context,
+          ),
+        });
+
+        continue;
+      }
+
+      if (node.type === "VariableDeclaration") {
+        modifications.push({
+          start: node.start,
+          end: node.end,
+          replacement: rewriteVariableDeclaration(node, code),
+        });
+
+        continue;
+      }
+
+      if (
+        node.type === "FunctionDeclaration" &&
+        node.id
+      ) {
+        modifications.push({
+          start: node.start,
+          end: node.end,
+          replacement: rewriteFunctionDeclaration(node, code),
+        });
+
+        continue;
+      }
+
+      if (
+        node.type === "ClassDeclaration" &&
+        node.id
+      ) {
+        modifications.push({
+          start: node.start,
+          end: node.end,
+          replacement: rewriteClassDeclaration(node, code),
+        });
+      }
+    }
+
+    modifications.sort((a, b) => b.start - a.start);
+
+    let transformedCode = code;
+
+    for (const modification of modifications) {
+      transformedCode =
+        transformedCode.slice(0, modification.start) +
+        modification.replacement +
+        transformedCode.slice(modification.end);
+    }
+
+    console.log(transformedCode)
+
+    return transformedCode;
+  } catch (error) {
+    if (
+      code.trim().startsWith("import ") ||
+      code.includes("\nimport ")
+    ) {
+      throw new SyntaxError(
+        "Invalid code module layout syntax.",
+        { cause: error },
+      );
+    }
+
+    return code;
+  }
 };

package/src/components/Button/index.css

@@ -1,55 +1,55 @@
-/* --- BUTTONS --- */
-
-.ziko-notebook .btn {
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  gap: 6px;
-  background: #ffffff;
-  border: 1px solid var(--border-color);
-  padding: 6px 10px;
-  border-radius: 4px;
-  font-size: 12px;
-  font-weight: 500;
-  color: #334155;
-  cursor: pointer;
-  line-height: 1;
-  white-space: nowrap;
-  transition: background 0.12s ease, border-color 0.12s ease;
-}
-
-.ziko-notebook .btn:hover {
-  background: #f1f5f9;
-}
-
-.ziko-notebook .btn:disabled {
-  opacity: 0.5;
-  cursor: not-allowed;
-}
-
-.ziko-notebook .btn-icon {
-  padding: 6px;
-  border-radius: 4px;
-}
-
-.ziko-notebook .btn-primary {
-  background: var(--primary);
-  color: #ffffff;
-  border-color: var(--primary);
-}
-
-.ziko-notebook .btn-primary:hover {
-  background: var(--primary-hover);
-  border-color: var(--primary-hover);
-}
-
-.ziko-notebook .btn-active {
-  background: #e2e8f0;
-  border-color: #cbd5e1;
-}
-
-.ziko-notebook .icon {
-  width: 14px;
-  height: 14px;
-  stroke-width: 2;
+/* --- BUTTONS --- */
+
+.ziko-notebook .btn {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  gap: 6px;
+  background: #ffffff;
+  border: 1px solid var(--border-color);
+  padding: 6px 10px;
+  border-radius: 4px;
+  font-size: 12px;
+  font-weight: 500;
+  color: #334155;
+  cursor: pointer;
+  line-height: 1;
+  white-space: nowrap;
+  transition: background 0.12s ease, border-color 0.12s ease;
+}
+
+.ziko-notebook .btn:hover {
+  background: #f1f5f9;
+}
+
+.ziko-notebook .btn:disabled {
+  opacity: 0.5;
+  cursor: not-allowed;
+}
+
+.ziko-notebook .btn-icon {
+  padding: 6px;
+  border-radius: 4px;
+}
+
+.ziko-notebook .btn-primary {
+  background: var(--primary);
+  color: #ffffff;
+  border-color: var(--primary);
+}
+
+.ziko-notebook .btn-primary:hover {
+  background: var(--primary-hover);
+  border-color: var(--primary-hover);
+}
+
+.ziko-notebook .btn-active {
+  background: #e2e8f0;
+  border-color: #cbd5e1;
+}
+
+.ziko-notebook .icon {
+  width: 14px;
+  height: 14px;
+  stroke-width: 2;
 }

package/src/components/Button/index.js

@@ -1,4 +1,4 @@
-import van from "vanjs-core";
-
-export const Button = ({ class: className = "", title = "", disabled = false, onclick }, ...children) =>
-  van.tags.button({ class: `btn ${className}`, title, disabled, onclick }, ...children);
+import van from "vanjs-core";
+
+export const Button = ({ class: className = "", title = "", disabled = false, onclick }, ...children) =>
+  van.tags.button({ class: `btn ${className}`, title, disabled, onclick }, ...children);