@zikojs/notebook 0.7.2 → 0.8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zikojs/notebook",
-  "version": "0.7.2",
+  "version": "0.8.0",
   "description": "",
   "type": "module",
   "publishConfig": {

package/src/{codeEditor.js → code-editor/index.js}

@@ -13,7 +13,7 @@ const languageFor = (type) =>
   type === "markdown" ? markdown() : javascript();
 
 export function createCodeEditor(app, cellData, actions) {
-  const editorDom = div({ class: "input-wrapper" }).element;
+  const editorDom = div({ class: "input-wrapper" });
 
   const languageCompartment = new Compartment();
   const readOnlyCompartment = new Compartment();
@@ -143,7 +143,7 @@ export function createCodeEditor(app, cellData, actions) {
 
     view = new EditorView({
       state,
-      parent: editorDom
+      parent: editorDom.element
     });
 
     const lineHeight = view.defaultLineHeight || 19;
@@ -159,7 +159,7 @@ export function createCodeEditor(app, cellData, actions) {
   };
 
   return {
-    dom: editorDom,
+    dom: editorDom.element,
 
     getValue: () =>
       view

package/src/compiler/evaluate.js

@@ -0,0 +1,67 @@
+import {
+  transformImportsAndScope,
+} from "./transform.js";
+
+export const evaluateCodeAsync = async (
+  code,
+  TARGET,
+  {
+    importMap = {},
+    plugins = [],
+  } = {},
+  scope,
+) => {
+  const validScope =
+    scope || Object.create(null);
+
+  const context = {
+    TARGET,
+    scope: validScope,
+    importMap,
+    plugins,
+  };
+
+  let compiledCode = code;
+
+  for (const plugin of plugins) {
+    if (plugin.transform) {
+      compiledCode = await plugin.transform(
+        compiledCode,
+        context,
+      );
+    }
+  }
+
+  compiledCode = transformImportsAndScope(
+    compiledCode,
+    importMap,
+  );
+
+  const runCell = new Function(
+    "TARGET",
+    "__scope__",
+    `
+      return (async () => {
+        with (__scope__) {
+          ${compiledCode}
+        }
+      })();
+    `,
+  );
+
+  let result = await runCell(
+    TARGET,
+    validScope,
+  );
+
+  for (const plugin of plugins) {
+    if (plugin.afterEvaluate) {
+      result = await plugin.afterEvaluate(
+        result,
+        context,
+      );
+    }
+  }
+
+  return result;
+};

package/src/compiler/imports.js

@@ -0,0 +1,94 @@
+export const resolveImport = (
+  source,
+  {
+    importMap = {},
+    plugins = [],
+  } = {},
+) => {
+  if (importMap[source]) {
+    return importMap[source];
+  }
+
+  for (const plugin of plugins) {
+    if (plugin.resolveImport) {
+      const resolved = plugin.resolveImport(
+        source,
+      );
+
+      if (resolved) {
+        return resolved;
+      }
+    }
+  }
+
+  if (
+    source.startsWith("http://") ||
+    source.startsWith("https://") ||
+    source.startsWith("./") ||
+    source.startsWith("../")
+  ) {
+    return source;
+  }
+
+  return `https://esm.sh/${source}`;
+};
+
+export const rewriteImportNode = (
+  node,
+  code,
+  context,
+) => {
+  const source = resolveImport(
+    node.source.value,
+    context,
+  );
+
+  if (node.specifiers.length === 0) {
+    return `await import("${source}");`;
+  }
+
+  let defaultImportName = null;
+  let namespaceId = null;
+  const namedImports = [];
+
+  node.specifiers.forEach((spec) => {
+    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,
+        local: spec.local.name,
+      });
+    }
+  });
+
+  if (namespaceId) {
+    return `__scope__.${namespaceId} = await import("${source}");`;
+  }
+
+  const tmp = `__mod_${node.start}`;
+
+  const lines = [
+    `const ${tmp} = await import("${source}");`,
+  ];
+
+  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});`,
+    );
+  });
+
+  return lines.join("\n");
+};

package/src/compiler/index.js

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

package/src/compiler/scope.js

@@ -0,0 +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")
+  );
+};

package/src/compiler/transform.js

@@ -0,0 +1,127 @@
+import * as acorn from "acorn";
+
+import {
+  rewriteImportNode,
+} from "./imports.js";
+
+import {
+  rewriteVariableDeclaration,
+  rewriteFunctionDeclaration,
+  rewriteClassDeclaration,
+} from "./scope.js";
+
+export const transformImportsAndScope = (
+  code,
+  {
+    importMap = {},
+    plugins = [],
+  } = {},
+) => {
+  try {
+    const ast = acorn.parse(code, {
+      ecmaVersion: "latest",
+      sourceType: "module",
+      allowReturnOutsideFunction: true,
+    });
+
+    const context = {
+      importMap,
+      plugins,
+    };
+
+    const modifications = [];
+
+    ast.body.forEach((node) => {
+      if (node.type === "ImportDeclaration") {
+        modifications.push({
+          start: node.start,
+          end: node.end,
+          replacement: rewriteImportNode(
+            node,
+            code,
+            context,
+          ),
+        });
+
+        return;
+      }
+
+      if (node.type === "VariableDeclaration") {
+        modifications.push({
+          start: node.start,
+          end: node.end,
+          replacement: rewriteVariableDeclaration(
+            node,
+            code,
+          ),
+        });
+
+        return;
+      }
+
+      if (
+        node.type === "FunctionDeclaration" &&
+        node.id
+      ) {
+        modifications.push({
+          start: node.start,
+          end: node.end,
+          replacement: rewriteFunctionDeclaration(
+            node,
+            code,
+          ),
+        });
+
+        return;
+      }
+
+      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;
+
+    modifications.forEach((modification) => {
+      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;
+  }
+};

package/src/components/Button/index.css

@@ -0,0 +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;
+}

package/src/components/Button/index.js

@@ -0,0 +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);

package/src/components/CellItem/index.js

@@ -0,0 +1,127 @@
+import { createCodeEditor } from "../../code-editor/index.js";
+import { tags } from 'ziko/dom'
+import { useState } from 'ziko/hooks'
+import {
+  Check,
+  Copy,
+  Lock,
+  Unlock,
+  Code2,
+  FileText,
+  Pencil,
+  Play,
+  Plus,
+  Trash2,
+} from '../icons/index.js';
+const { div, span } = tags;
+
+import { Button } from "../Button/index.js";
+
+export const Prompt = () => {
+  return span({ class: "prompt" })
+}
+
+export function CellItem({ cellData, app, store }) {
+  const outputRef = div({ class: "output-area" });
+  if (cellData.outputNode) outputRef.append(cellData.outputNode);
+  cellData._outputRef = outputRef.element;
+
+  const actions = app._cellActions(cellData);
+  cellData._actions = actions;
+  cellData._editor = createCodeEditor(app, cellData, actions);
+  /* Check ziko */
+  const [In, setIn] = useState(0)
+  globalThis.setIn = setIn
+  const inPrompt = span({ class: "prompt" }, In);
+  const outPrompt = span({ class: "prompt out" });
+  const bodySlot = div().style({ display : 'contents'});
+  const controlsEl = CellControls({ cellData, store, actions });
+
+  const outputGrid = div({ class: "cell-output-grid" }, outPrompt, div({ class: "output-wrapper" }, outputRef));
+  const inputGrid = div({ class: "cell-input-grid" }, inPrompt, bodySlot, controlsEl);
+  const root = div({ class: "cell" }, inputGrid, outputGrid);
+  root.onClick(() => app.setActiveCell(cellData.id));
+
+  cellData._dom = root.element;
+  cellData._inPrompt = inPrompt.element;
+  cellData._outPrompt = outPrompt.element;
+  cellData._bodySlot = bodySlot.element;
+  cellData._outputGrid = outputGrid.element;
+  cellData._setIn = setIn
+
+  app._refreshCell(cellData);
+  return root.element;
+}
+
+export function CellControls({ cellData, store, actions }) {
+  const controlsContainer = div({ class: "cell-controls" }).element;
+
+  const renderButtons = () => {
+    const isQueueRunning = store.get('executionQueueState').isRunning;
+    const isMaxCellsReached = store.get('cells').length >= store.get('maxCells');
+    const isCopied = cellData._copiedFlag === true;
+
+    controlsContainer.replaceChildren(
+      Button({ 
+        class: `btn-icon ${isCopied ? "btn-active" : ""}`, 
+        title: isCopied ? "Copied!" : "Copy Cell Content", 
+        onclick: async () => {
+          await actions.copyCode();
+          cellData._copiedFlag = true;
+          renderButtons();
+          setTimeout(() => { 
+            cellData._copiedFlag = false; 
+            renderButtons(); 
+          }, 1500);
+        }
+      }, isCopied ? Check() : Copy()),
+
+      Button({ 
+        class: `btn-icon ${cellData.readonly ? "btn-active" : ""}`, 
+        title: cellData.readonly ? "Make Editable" : "Make Read-Only", 
+        disabled: isQueueRunning, 
+        onclick: actions.toggleReadonly, 
+      }, cellData.readonly ? Lock() : Unlock()),
+
+      Button({ 
+        class: `btn-icon ${cellData.type === "markdown" ? "btn-active" : ""}`, 
+        title: `Switch to ${cellData.type === "code" ? "Markdown" : "JS Code"}`, 
+        disabled: isQueueRunning || cellData.readonly, 
+        onclick: actions.toggleType, 
+      }, cellData.type === "code" ? FileText() : Code2()),
+
+      (cellData.type === "markdown" && !cellData.isEditingMarkdown)
+        ? Button({ 
+            class: "btn-icon", 
+            title: "Edit Markdown", 
+            disabled: isQueueRunning || cellData.readonly, 
+            onclick: actions.editMarkdown 
+          }, Pencil())
+        : Button({ 
+            class: "btn-icon btn-primary", 
+            title: "Run & Advance (Shift+Enter)", 
+            disabled: isQueueRunning, 
+            onclick: () => actions.runCode(true) 
+          }, Play()),
+
+      Button({ 
+        class: "btn-icon", 
+        title: "Add Cell Below", 
+        disabled: isQueueRunning || isMaxCellsReached, 
+        onclick: actions.addBelow 
+      }, Plus()),
+
+      Button({ 
+        class: "btn-icon", 
+        title: "Delete Cell", 
+        disabled: isQueueRunning, 
+        onclick: actions.deleteCell 
+      }, Trash2())
+    );
+  };
+
+  renderButtons();
+  store.on('change', renderButtons);
+
+  return controlsContainer;
+}

package/src/components/ErrorOutput/index.css

@@ -0,0 +1,10 @@
+.ziko-notebook .error-output {
+  color: #e11d48;
+  font-family: ui-monospace, SFMono-Regular, monospace;
+  white-space: pre-wrap;
+  font-size: 12px;
+  background: #fff1f2;
+  padding: 8px;
+  border-radius: 4px;
+  border: 1px solid #fecdd3;
+}

package/src/components/ErrorOutput/index.js

@@ -0,0 +1,2 @@
+import { tags } from "ziko/dom"
+export const ErrorOutput = (err) => tags.div({ class: "error-output" }, err.toString())

package/src/components/Header/index.css

@@ -0,0 +1,47 @@
+/* --- HEADER & TOOLBAR --- */
+
+.ziko-notebook .header {
+  border-bottom: 1px solid var(--border-color);
+  background: #ffffff;
+  padding: 10px 16px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 12px;
+  flex-wrap: wrap;
+  position: sticky;
+  top: 0;
+  z-index: 100;
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.03);
+  width: 100%;
+}
+
+.ziko-notebook .brand {
+  font-weight: 600;
+  font-size: 16px;
+  color: #0f172a;
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  flex-shrink: 0;
+}
+
+.ziko-notebook .toolbar {
+  display: flex;
+  gap: 6px;
+  align-items: center;
+  flex-wrap: wrap;
+  max-width: 100%;
+}
+
+.ziko-notebook .status-badge {
+  font-size: 12px;
+  font-weight: 500;
+  color: var(--primary);
+  background: #e0f2fe;
+  padding: 4px 8px;
+  border-radius: 4px;
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+}