hyperbook 0.84.3 → 0.84.4

package/dist/assets/store.js

@@ -29,145 +29,13 @@ store.version(2).stores({
   learningmap: `id,nodes,x,y,zoom`,
   textinput: `id,text`,
   custom: `id,payload`,
+  onlineide: `scriptId,script`,
+  sqlideScripts: `scriptId,script`,
+  sqlideDatabases: `databaseId,database`,
   multievent: `id,state`,
   typst: `id,code`,
 });
 
-/**
- * Read all data from an external IndexedDB database using the raw API.
- * Returns a Dexie-export-compatible object, or null if the DB doesn't exist.
- */
-function exportExternalDB(dbName) {
-  return new Promise((resolve) => {
-    const request = indexedDB.open(dbName);
-    request.onerror = () => resolve(null);
-    request.onsuccess = (event) => {
-      const db = event.target.result;
-      const storeNames = Array.from(db.objectStoreNames);
-      if (storeNames.length === 0) {
-        db.close();
-        resolve(null);
-        return;
-      }
-      const result = {
-        formatName: "dexie",
-        formatVersion: 1,
-        data: {
-          databaseName: dbName,
-          databaseVersion: db.version,
-          tables: [],
-        },
-      };
-      const tx = db.transaction(storeNames, "readonly");
-      let pending = storeNames.length;
-      storeNames.forEach((name) => {
-        const objectStore = tx.objectStore(name);
-        const tableInfo = {
-          name: name,
-          schema: objectStore.keyPath ? `${objectStore.keyPath}` : "++id",
-          rowCount: 0,
-          rows: [],
-        };
-        const cursorReq = objectStore.openCursor();
-        cursorReq.onsuccess = (e) => {
-          const cursor = e.target.result;
-          if (cursor) {
-            tableInfo.rows.push(cursor.value);
-            cursor.continue();
-          } else {
-            tableInfo.rowCount = tableInfo.rows.length;
-            result.data.tables.push(tableInfo);
-            pending--;
-            if (pending === 0) {
-              db.close();
-              resolve(result);
-            }
-          }
-        };
-        cursorReq.onerror = () => {
-          pending--;
-          if (pending === 0) {
-            db.close();
-            resolve(result);
-          }
-        };
-      });
-    };
-  });
-}
-
-/**
- * Import data into an external IndexedDB database using the raw API.
- * Accepts a Dexie-export-compatible object. Clears existing data before importing.
- */
-function importExternalDB(dbName, exportData) {
-  return new Promise((resolve, reject) => {
-    const tables = exportData?.data?.tables;
-    if (!tables || tables.length === 0) { resolve(); return; }
-
-    // Determine the version the external tool uses (keep it in sync)
-    const request = indexedDB.open(dbName);
-    request.onerror = () => reject(request.error);
-
-    request.onupgradeneeded = (event) => {
-      // DB didn't exist yet — create the object stores from the export data
-      const db = event.target.result;
-      tables.forEach((table) => {
-        if (!db.objectStoreNames.contains(table.name)) {
-          const keyPath = table.schema && !table.schema.startsWith('++')
-            ? table.schema.split(',')[0].trim()
-            : null;
-          db.createObjectStore(table.name, keyPath ? { keyPath } : { autoIncrement: true });
-        }
-      });
-    };
-
-    request.onsuccess = (event) => {
-      const db = event.target.result;
-      const storeNames = tables
-        .map((t) => t.name)
-        .filter((n) => db.objectStoreNames.contains(n));
-      if (storeNames.length === 0) { db.close(); resolve(); return; }
-
-      const tx = db.transaction(storeNames, "readwrite");
-      // Clear then re-populate each store
-      storeNames.forEach((name) => {
-        const objectStore = tx.objectStore(name);
-        objectStore.clear();
-        const table = tables.find((t) => t.name === name);
-        if (table && table.rows) {
-          table.rows.forEach((row) => objectStore.put(row));
-        }
-      });
-      tx.oncomplete = () => { db.close(); resolve(); };
-      tx.onerror = () => { db.close(); reject(tx.error); };
-    };
-  });
-}
-
-/**
- * Clear all tables in an external IndexedDB database using the raw API.
- */
-function clearExternalDB(dbName) {
-  return new Promise((resolve) => {
-    const request = indexedDB.open(dbName);
-    request.onerror = () => resolve();
-    request.onsuccess = (event) => {
-      const db = event.target.result;
-      const storeNames = Array.from(db.objectStoreNames);
-      if (storeNames.length === 0) {
-        db.close();
-        resolve();
-        return;
-      }
-      const tx = db.transaction(storeNames, "readwrite");
-      storeNames.forEach((name) => tx.objectStore(name).clear());
-      tx.oncomplete = () => { db.close(); resolve(); };
-      tx.onerror = () => { db.close(); resolve(); };
-    };
-  });
-}
-
 const initStore = async () => {
   store.currentState.put({
     id: 1,
@@ -200,16 +68,12 @@ initStore();
 
 async function hyperbookExport() {
   const hyperbook = await store.export({ prettyJson: true });
-  const sqlIde = await exportExternalDB('SQL-IDE');
-  const learnJ = await exportExternalDB('LearnJ');
 
   const data = {
     version: 1,
     origin: window.location.origin,
     data: {
       hyperbook: JSON.parse(await hyperbook.text()),
-      sqlIde: sqlIde || {},
-      learnJ: learnJ || {},
     },
   };
 
@@ -236,8 +100,15 @@ async function hyperbookReset() {
   }
 
   clearTable(store);
-  await clearExternalDB('LearnJ');
-  await clearExternalDB('SQL-IDE');
+
+  // Send empty snapshot to cloud
+  if (window.hyperbook && window.hyperbook.cloud) {
+    try {
+      await window.hyperbook.cloud.sendSnapshot();
+    } catch (e) {
+      console.error("Failed to sync reset to cloud:", e);
+    }
+  }
 
   alert(i18n.get("store-reset-sucessful"));
   window.location.reload();
@@ -269,18 +140,21 @@ async function hyperbookImport() {
         return;
       }
 
-      const { hyperbook, sqlIde, learnJ } = data.data;
+      const { hyperbook } = data.data;
 
       const hyperbookBlob = new Blob([JSON.stringify(hyperbook)], {
         type: "application/json",
       });
 
       await store.import(hyperbookBlob, { clearTablesBeforeImport: true });
-      if (sqlIde) {
-        await importExternalDB('SQL-IDE', sqlIde);
-      }
-      if (learnJ) {
-        await importExternalDB('LearnJ', learnJ);
+
+      // Send full snapshot to cloud after import
+      if (window.hyperbook && window.hyperbook.cloud) {
+        try {
+          await window.hyperbook.cloud.sendSnapshot();
+        } catch (e) {
+          console.error("Failed to sync import to cloud:", e);
+        }
       }
 
       alert(i18n.get("store-import-sucessful"));

package/dist/index.js

@@ -55558,7 +55558,7 @@ async function runBuild(root, rootProject, basePath, prefix, out, filter) {
     const baseCtx = {
         root,
         config: hyperbookJson,
-        makeUrl: (path, base, page) => {
+        makeUrl: (path, base, page, options = { versioned: true }) => {
             if (typeof path === "string") {
                 // Handle absolute URLs
                 if (path.includes("://") || path.startsWith("data:")) {
@@ -55602,7 +55602,11 @@ async function runBuild(root, rootProject, basePath, prefix, out, filter) {
                         return `${path_1.posix.join("/", basePath || "", exports.ASSETS_FOLDER, ...path)}`;
                     }
                     else {
-                        return `${path_1.posix.join("/", basePath || "", exports.ASSETS_FOLDER, ...path)}?version=${package_json_1.default.version}`;
+                        let p = `${path_1.posix.join("/", basePath || "", exports.ASSETS_FOLDER, ...path)}`;
+                        if (options === null || options === void 0 ? void 0 : options.versioned) {
+                            p += `?v=${package_json_1.default.version}`;
+                        }
+                        return p;
                     }
             }
         },
@@ -176692,7 +176696,18 @@ var remarkDirectiveSqlIde_default = (ctx) => () => {
         const attributes4 = node3.attributes || {};
         const {
           id = hash(node3),
-          db = ctx.config.elements?.sqlide?.db || "https://sqlide.openpatch.org/assets/databases/world1.sqLite",
+          db = ctx.config.elements?.sqlide?.db || ctx.makeUrl(
+            [
+              "directive-sqlide",
+              "include",
+              "assets",
+              "databases",
+              "world1.sqLite"
+            ],
+            "assets",
+            void 0,
+            { versioned: false }
+          ),
           height = ctx.config.elements?.sqlide?.height || "600px"
         } = attributes4;
         expectContainerDirective(node3, file, name);
@@ -178370,6 +178385,15 @@ ${ctx.config.cloud ? `HYPERBOOK_CLOUD = ${JSON.stringify(ctx.config.cloud).repla
             properties: {},
             children: [
               ...originalChildren,
+              {
+                type: "element",
+                tagName: "script",
+                properties: {
+                  src: makeUrl(["client.js"], "assets"),
+                  defer: true
+                },
+                children: []
+              },
               ...ctx.config.cloud ? [
                 {
                   type: "element",
@@ -178381,15 +178405,6 @@ ${ctx.config.cloud ? `HYPERBOOK_CLOUD = ${JSON.stringify(ctx.config.cloud).repla
                   children: []
                 }
               ] : [],
-              {
-                type: "element",
-                tagName: "script",
-                properties: {
-                  src: makeUrl(["client.js"], "assets"),
-                  defer: true
-                },
-                children: []
-              },
               ...Object.entries(directives).flatMap(
                 ([directive2, { scripts }]) => scripts.filter(
                   (script) => typeof script !== "object" || script.position == "body"
@@ -200718,7 +200733,7 @@ module.exports = /*#__PURE__*/JSON.parse('{"application/1d-interleaved-parityfec
 /***/ ((module) => {
 
 "use strict";
-module.exports = /*#__PURE__*/JSON.parse('{"name":"hyperbook","version":"0.84.3","author":"Mike Barkmin","homepage":"https://github.com/openpatch/hyperbook#readme","license":"MIT","bin":{"hyperbook":"./dist/index.js"},"files":["dist"],"publishConfig":{"access":"public"},"repository":{"type":"git","url":"git+https://github.com/openpatch/hyperbook.git","directory":"packages/hyperbook"},"bugs":{"url":"https://github.com/openpatch/hyperbook/issues"},"engines":{"node":">=18"},"scripts":{"version":"pnpm build","lint":"tsc --noEmit","dev":"ncc build ./index.ts -w -o dist/","build":"rimraf dist && ncc build ./index.ts -o ./dist/ --no-cache --no-source-map-register --external favicons --external sharp && node postbuild.mjs"},"dependencies":{"favicons":"^7.2.0"},"devDependencies":{"create-hyperbook":"workspace:*","@hyperbook/fs":"workspace:*","@hyperbook/markdown":"workspace:*","@hyperbook/types":"workspace:*","@pnpm/exportable-manifest":"1000.0.6","@types/archiver":"6.0.3","@types/async-retry":"1.4.9","@types/cross-spawn":"6.0.6","@types/lunr":"^2.3.7","@types/prompts":"2.4.9","@types/tar":"6.1.13","@types/ws":"^8.5.14","@vercel/ncc":"0.38.3","archiver":"7.0.1","async-retry":"1.3.3","chalk":"5.4.1","chokidar":"4.0.3","commander":"12.1.0","cpy":"11.1.0","cross-spawn":"7.0.6","domutils":"^3.2.2","extract-zip":"^2.0.1","got":"12.6.0","htmlparser2":"^10.0.0","lunr":"^2.3.9","lunr-languages":"^1.14.0","mime":"^4.0.6","prompts":"2.4.2","rimraf":"6.0.1","tar":"7.4.3","update-check":"1.5.4","ws":"^8.18.0"}}');
+module.exports = /*#__PURE__*/JSON.parse('{"name":"hyperbook","version":"0.84.4","author":"Mike Barkmin","homepage":"https://github.com/openpatch/hyperbook#readme","license":"MIT","bin":{"hyperbook":"./dist/index.js"},"files":["dist"],"publishConfig":{"access":"public"},"repository":{"type":"git","url":"git+https://github.com/openpatch/hyperbook.git","directory":"packages/hyperbook"},"bugs":{"url":"https://github.com/openpatch/hyperbook/issues"},"engines":{"node":">=18"},"scripts":{"version":"pnpm build","lint":"tsc --noEmit","dev":"ncc build ./index.ts -w -o dist/","build":"rimraf dist && ncc build ./index.ts -o ./dist/ --no-cache --no-source-map-register --external favicons --external sharp && node postbuild.mjs"},"dependencies":{"favicons":"^7.2.0"},"devDependencies":{"create-hyperbook":"workspace:*","@hyperbook/fs":"workspace:*","@hyperbook/markdown":"workspace:*","@hyperbook/types":"workspace:*","@pnpm/exportable-manifest":"1000.0.6","@types/archiver":"6.0.3","@types/async-retry":"1.4.9","@types/cross-spawn":"6.0.6","@types/lunr":"^2.3.7","@types/prompts":"2.4.9","@types/tar":"6.1.13","@types/ws":"^8.5.14","@vercel/ncc":"0.38.3","archiver":"7.0.1","async-retry":"1.3.3","chalk":"5.4.1","chokidar":"4.0.3","commander":"12.1.0","cpy":"11.1.0","cross-spawn":"7.0.6","domutils":"^3.2.2","extract-zip":"^2.0.1","got":"12.6.0","htmlparser2":"^10.0.0","lunr":"^2.3.9","lunr-languages":"^1.14.0","mime":"^4.0.6","prompts":"2.4.2","rimraf":"6.0.1","tar":"7.4.3","update-check":"1.5.4","ws":"^8.18.0"}}');
 
 /***/ })
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hyperbook",
-  "version": "0.84.3",
+  "version": "0.84.4",
   "author": "Mike Barkmin",
   "homepage": "https://github.com/openpatch/hyperbook#readme",
   "license": "MIT",
@@ -56,10 +56,10 @@
     "tar": "7.4.3",
     "update-check": "1.5.4",
     "ws": "^8.18.0",
-    "create-hyperbook": "0.3.4",
-    "@hyperbook/markdown": "0.55.3",
     "@hyperbook/fs": "0.24.2",
-    "@hyperbook/types": "0.22.0"
+    "create-hyperbook": "0.3.5",
+    "@hyperbook/markdown": "0.55.4",
+    "@hyperbook/types": "0.22.1"
   },
   "scripts": {
     "version": "pnpm build",