@symbo.ls/sync 2.29.56 → 2.29.58

package/dist/cjs/index.js

@@ -1,4 +1,3 @@
-"use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
@@ -31,23 +30,33 @@ var import_socket = require("socket.io-client");
 var import_utils = require("@domql/utils");
 var import_SyncNotifications = require("./SyncNotifications");
 var import_Inspect = require("./Inspect");
-const isLocalhost = import_utils.window && import_utils.window.location && import_utils.window.location.host.includes("local");
+const isLocal = false;
 const deletePath = (obj, path) => {
-  if (!obj || !Array.isArray(path)) return;
+  if (!obj || !Array.isArray(path)) {
+    return;
+  }
   path.reduce((acc, v, i, arr) => {
     if (acc && v in acc) {
-      if (i !== arr.length - 1) return acc[v];
+      if (i !== arr.length - 1) {
+        return acc[v];
+      }
       delete acc[v];
     }
     return void 0;
   }, obj);
 };
 const setPath = (obj, path, value, createNestedObjects = false) => {
-  if (!obj || !Array.isArray(path)) return;
+  if (!obj || !Array.isArray(path)) {
+    return;
+  }
   path.reduce((acc, v, i, arr) => {
-    if (!acc) return void 0;
+    if (!acc) {
+      return void 0;
+    }
     if (i !== arr.length - 1) {
-      if (!acc[v] && createNestedObjects) acc[v] = {};
+      if (!acc[v] && createNestedObjects) {
+        acc[v] = {};
+      }
       return acc[v];
     }
     acc[v] = value;
@@ -56,9 +65,13 @@ const setPath = (obj, path, value, createNestedObjects = false) => {
 };
 const applyOpsToCtx = (ctx, changes) => {
   const topLevelChanged = /* @__PURE__ */ new Set();
-  if (!Array.isArray(changes)) return topLevelChanged;
+  if (!Array.isArray(changes)) {
+    return topLevelChanged;
+  }
   for (const [action, path, change] of changes) {
-    if (!Array.isArray(path) || !path.length) continue;
+    if (!Array.isArray(path) || !path.length) {
+      continue;
+    }
     topLevelChanged.add(path[0]);
     switch (action) {
       case "delete":
@@ -76,26 +89,33 @@ const applyOpsToCtx = (ctx, changes) => {
 };
 const fetchServiceToken = async () => {
   try {
-    const urlBase = isLocalhost ? "http://localhost:8080" : "https://api.symbols.app";
-    const res = await import_utils.window.fetch(`${urlBase}/service-token`, { method: "GET" });
+    const urlBase = isLocal ? "http://localhost:8080" : "https://api.symbols.app";
+    const res = await import_utils.window.fetch(`${urlBase}/service-token`, {
+      method: "GET"
+    });
     let txt;
     try {
       const json = await res.clone().json();
-      if (json && typeof json.token === "string") return json.token.trim();
+      if (json && typeof json.token === "string") {
+        return json.token.trim();
+      }
       txt = await res.text();
     } catch {
       txt = await res.text();
     }
-    return (txt || "").replace(/\s+/g, "") || void 0;
+    return (txt || "").replace(/\s+/gu, "") || void 0;
   } catch (e) {
     console.error("[sync] Failed to fetch service-token", e);
-    return void 0;
   }
 };
 const onSnapshot = (el, s, ctx) => (payload = {}) => {
   var _a;
-  const { data, schema } = payload;
-  if (!data) return;
+  let { data } = payload;
+  const { schema } = payload;
+  if (!data) {
+    return;
+  }
+  data = el.call("deepDestringify", data, Array.isArray(data) ? [] : {});
   Object.entries(data).forEach(([key, val]) => {
     if (ctx[key] && typeof ctx[key] === "object") {
       (0, import_utils.overwriteShallow)(ctx[key], val);
@@ -103,28 +123,37 @@ const onSnapshot = (el, s, ctx) => (payload = {}) => {
       ctx[key] = val;
     }
   });
-  if (schema) ctx.schema = schema;
+  if (schema) {
+    ctx.schema = schema;
+  }
   const { pathname, search, hash } = ctx.window.location;
   (((_a = ctx.utils) == null ? void 0 : _a.router) || import_router.router)(pathname + search + hash, el, {});
 };
 const onOps = (el, s, ctx) => (payload = {}) => {
-  var _a, _b, _c;
-  console.log("onOps", payload);
-  const { changes } = payload;
-  if (!changes || !Array.isArray(changes) || !changes.length) return;
+  var _a;
+  let { changes } = payload;
+  if (!changes || !Array.isArray(changes) || !changes.length) {
+    return;
+  }
+  changes = el.call(
+    "deepDestringify",
+    changes,
+    Array.isArray(changes) ? [] : {}
+  );
   const changed = applyOpsToCtx(ctx, changes);
   if (changed.has("state")) {
     const route = (_a = ctx.state) == null ? void 0 : _a.route;
     if (route) {
-      ;
-      (((_b = ctx.utils) == null ? void 0 : _b.router) || import_router.router)(route.replace("/state", "") || "/", el, {});
+      el.call("router", route.replace("/state", "") || "/");
     } else {
       s.update(ctx.state);
     }
   }
-  if (["pages", "components", "snippets", "functions"].some((k) => changed.has(k))) {
+  if (["pages", "components", "snippets", "functions"].some(
+    (k) => changed.has(k)
+  )) {
     const { pathname, search, hash } = ctx.window.location;
-    (((_c = ctx.utils) == null ? void 0 : _c.router) || import_router.router)(pathname + search + hash, el, {});
+    el.call("router", pathname + search + hash);
   }
   if (changed.has("designSystem")) {
     (0, import_init.init)(ctx.designSystem);
@@ -138,10 +167,12 @@ const connectToSocket = async (el, s, ctx) => {
   }
   const projectKey = ctx.key;
   if (!projectKey) {
-    console.warn("[sync] ctx.key missing \u2013 cannot establish collaborative connection");
+    console.warn(
+      "[sync] ctx.key missing \u2013 cannot establish collaborative connection"
+    );
     return null;
   }
-  const socketBaseUrl = isLocalhost ? "http://localhost:8080" : "https://api.symbols.app";
+  const socketBaseUrl = isLocal ? "http://localhost:8080" : "https://api.symbols.app";
   const socket = (0, import_socket.io)(socketBaseUrl, {
     path: "/collab-socket",
     transports: ["websocket"],
@@ -157,7 +188,9 @@ const connectToSocket = async (el, s, ctx) => {
   });
   socket.on("connect", () => {
     var _a;
-    if ((_a = ctx.editor) == null ? void 0 : _a.verbose) console.info("[sync] Connected to collab socket");
+    if ((_a = ctx.editor) == null ? void 0 : _a.verbose) {
+      console.info("[sync] Connected to collab socket");
+    }
   });
   socket.on("snapshot", onSnapshot(el, s, ctx));
   socket.on("ops", onOps(el, s, ctx));
@@ -169,7 +202,9 @@ const connectToSocket = async (el, s, ctx) => {
   });
   socket.on("disconnect", (reason) => {
     var _a;
-    if ((_a = ctx.editor) == null ? void 0 : _a.verbose) console.info("[sync] Disconnected from collab socket", reason);
+    if ((_a = ctx.editor) == null ? void 0 : _a.verbose) {
+      console.info("[sync] Disconnected from collab socket", reason);
+    }
   });
   return socket;
 };

package/dist/esm/index.js

@@ -4,23 +4,33 @@ import { io } from "socket.io-client";
 import { window, overwriteShallow } from "@domql/utils";
 import { connectedToSymbols, Notifications } from "./SyncNotifications";
 import { Inspect } from "./Inspect";
-const isLocalhost = window && window.location && window.location.host.includes("local");
+const isLocal = false;
 const deletePath = (obj, path) => {
-  if (!obj || !Array.isArray(path)) return;
+  if (!obj || !Array.isArray(path)) {
+    return;
+  }
   path.reduce((acc, v, i, arr) => {
     if (acc && v in acc) {
-      if (i !== arr.length - 1) return acc[v];
+      if (i !== arr.length - 1) {
+        return acc[v];
+      }
       delete acc[v];
     }
     return void 0;
   }, obj);
 };
 const setPath = (obj, path, value, createNestedObjects = false) => {
-  if (!obj || !Array.isArray(path)) return;
+  if (!obj || !Array.isArray(path)) {
+    return;
+  }
   path.reduce((acc, v, i, arr) => {
-    if (!acc) return void 0;
+    if (!acc) {
+      return void 0;
+    }
     if (i !== arr.length - 1) {
-      if (!acc[v] && createNestedObjects) acc[v] = {};
+      if (!acc[v] && createNestedObjects) {
+        acc[v] = {};
+      }
       return acc[v];
     }
     acc[v] = value;
@@ -29,9 +39,13 @@ const setPath = (obj, path, value, createNestedObjects = false) => {
 };
 const applyOpsToCtx = (ctx, changes) => {
   const topLevelChanged = /* @__PURE__ */ new Set();
-  if (!Array.isArray(changes)) return topLevelChanged;
+  if (!Array.isArray(changes)) {
+    return topLevelChanged;
+  }
   for (const [action, path, change] of changes) {
-    if (!Array.isArray(path) || !path.length) continue;
+    if (!Array.isArray(path) || !path.length) {
+      continue;
+    }
     topLevelChanged.add(path[0]);
     switch (action) {
       case "delete":
@@ -49,26 +63,33 @@ const applyOpsToCtx = (ctx, changes) => {
 };
 const fetchServiceToken = async () => {
   try {
-    const urlBase = isLocalhost ? "http://localhost:8080" : "https://api.symbols.app";
-    const res = await window.fetch(`${urlBase}/service-token`, { method: "GET" });
+    const urlBase = isLocal ? "http://localhost:8080" : "https://api.symbols.app";
+    const res = await window.fetch(`${urlBase}/service-token`, {
+      method: "GET"
+    });
     let txt;
     try {
       const json = await res.clone().json();
-      if (json && typeof json.token === "string") return json.token.trim();
+      if (json && typeof json.token === "string") {
+        return json.token.trim();
+      }
       txt = await res.text();
     } catch (e) {
       txt = await res.text();
     }
-    return (txt || "").replace(/\s+/g, "") || void 0;
+    return (txt || "").replace(/\s+/gu, "") || void 0;
   } catch (e) {
     console.error("[sync] Failed to fetch service-token", e);
-    return void 0;
   }
 };
 const onSnapshot = (el, s, ctx) => (payload = {}) => {
   var _a;
-  const { data, schema } = payload;
-  if (!data) return;
+  let { data } = payload;
+  const { schema } = payload;
+  if (!data) {
+    return;
+  }
+  data = el.call("deepDestringify", data, Array.isArray(data) ? [] : {});
   Object.entries(data).forEach(([key, val]) => {
     if (ctx[key] && typeof ctx[key] === "object") {
       overwriteShallow(ctx[key], val);
@@ -76,28 +97,37 @@ const onSnapshot = (el, s, ctx) => (payload = {}) => {
       ctx[key] = val;
     }
   });
-  if (schema) ctx.schema = schema;
+  if (schema) {
+    ctx.schema = schema;
+  }
   const { pathname, search, hash } = ctx.window.location;
   (((_a = ctx.utils) == null ? void 0 : _a.router) || router)(pathname + search + hash, el, {});
 };
 const onOps = (el, s, ctx) => (payload = {}) => {
-  var _a, _b, _c;
-  console.log("onOps", payload);
-  const { changes } = payload;
-  if (!changes || !Array.isArray(changes) || !changes.length) return;
+  var _a;
+  let { changes } = payload;
+  if (!changes || !Array.isArray(changes) || !changes.length) {
+    return;
+  }
+  changes = el.call(
+    "deepDestringify",
+    changes,
+    Array.isArray(changes) ? [] : {}
+  );
   const changed = applyOpsToCtx(ctx, changes);
   if (changed.has("state")) {
     const route = (_a = ctx.state) == null ? void 0 : _a.route;
     if (route) {
-      ;
-      (((_b = ctx.utils) == null ? void 0 : _b.router) || router)(route.replace("/state", "") || "/", el, {});
+      el.call("router", route.replace("/state", "") || "/");
     } else {
       s.update(ctx.state);
     }
   }
-  if (["pages", "components", "snippets", "functions"].some((k) => changed.has(k))) {
+  if (["pages", "components", "snippets", "functions"].some(
+    (k) => changed.has(k)
+  )) {
     const { pathname, search, hash } = ctx.window.location;
-    (((_c = ctx.utils) == null ? void 0 : _c.router) || router)(pathname + search + hash, el, {});
+    el.call("router", pathname + search + hash);
   }
   if (changed.has("designSystem")) {
     init(ctx.designSystem);
@@ -111,10 +141,12 @@ const connectToSocket = async (el, s, ctx) => {
   }
   const projectKey = ctx.key;
   if (!projectKey) {
-    console.warn("[sync] ctx.key missing \u2013 cannot establish collaborative connection");
+    console.warn(
+      "[sync] ctx.key missing \u2013 cannot establish collaborative connection"
+    );
     return null;
   }
-  const socketBaseUrl = isLocalhost ? "http://localhost:8080" : "https://api.symbols.app";
+  const socketBaseUrl = isLocal ? "http://localhost:8080" : "https://api.symbols.app";
   const socket = io(socketBaseUrl, {
     path: "/collab-socket",
     transports: ["websocket"],
@@ -130,7 +162,9 @@ const connectToSocket = async (el, s, ctx) => {
   });
   socket.on("connect", () => {
     var _a;
-    if ((_a = ctx.editor) == null ? void 0 : _a.verbose) console.info("[sync] Connected to collab socket");
+    if ((_a = ctx.editor) == null ? void 0 : _a.verbose) {
+      console.info("[sync] Connected to collab socket");
+    }
   });
   socket.on("snapshot", onSnapshot(el, s, ctx));
   socket.on("ops", onOps(el, s, ctx));
@@ -142,7 +176,9 @@ const connectToSocket = async (el, s, ctx) => {
   });
   socket.on("disconnect", (reason) => {
     var _a;
-    if ((_a = ctx.editor) == null ? void 0 : _a.verbose) console.info("[sync] Disconnected from collab socket", reason);
+    if ((_a = ctx.editor) == null ? void 0 : _a.verbose) {
+      console.info("[sync] Disconnected from collab socket", reason);
+    }
   });
   return socket;
 };

package/index.js

@@ -1,5 +1,3 @@
-'use strict'
-
 import { router } from '@domql/router'
 import { init } from '@symbo.ls/init'
 import { io } from 'socket.io-client'
@@ -8,41 +6,54 @@ import { connectedToSymbols, Notifications } from './SyncNotifications'
 import { Inspect } from './Inspect'
 export { Inspect, Notifications }
 
-const isLocalhost =
-  window && window.location && window.location.host.includes('local')
+const isLocal = process.env.NODE_ENV === 'local'
 
 // ---------------------------------------------
 // Utility helpers to apply ops
 
 const deletePath = (obj, path) => {
-  if (!obj || !Array.isArray(path)) return
+  if (!obj || !Array.isArray(path)) {
+    return
+  }
   path.reduce((acc, v, i, arr) => {
     if (acc && v in acc) {
-      if (i !== arr.length - 1) return acc[v]
+      if (i !== arr.length - 1) {
+        return acc[v]
+      }
       delete acc[v]
     }
-    return undefined
+    return void 0
   }, obj)
 }
 
 const setPath = (obj, path, value, createNestedObjects = false) => {
-  if (!obj || !Array.isArray(path)) return
+  if (!obj || !Array.isArray(path)) {
+    return
+  }
   path.reduce((acc, v, i, arr) => {
-    if (!acc) return undefined
+    if (!acc) {
+      return void 0
+    }
     if (i !== arr.length - 1) {
-      if (!acc[v] && createNestedObjects) acc[v] = {}
+      if (!acc[v] && createNestedObjects) {
+        acc[v] = {}
+      }
       return acc[v]
     }
     acc[v] = value
-    return undefined
+    return void 0
   }, obj)
 }
 
 const applyOpsToCtx = (ctx, changes) => {
   const topLevelChanged = new Set()
-  if (!Array.isArray(changes)) return topLevelChanged
+  if (!Array.isArray(changes)) {
+    return topLevelChanged
+  }
   for (const [action, path, change] of changes) {
-    if (!Array.isArray(path) || !path.length) continue
+    if (!Array.isArray(path) || !path.length) {
+      continue
+    }
     topLevelChanged.add(path[0])
     switch (action) {
       case 'delete':
@@ -64,15 +75,21 @@ const applyOpsToCtx = (ctx, changes) => {
 
 const fetchServiceToken = async () => {
   try {
-    const urlBase = isLocalhost ? 'http://localhost:8080' : 'https://api.symbols.app'
-    const res = await window.fetch(`${urlBase}/service-token`, { method: 'GET' })
+    const urlBase = isLocal
+      ? 'http://localhost:8080'
+      : 'https://api.symbols.app'
+    const res = await window.fetch(`${urlBase}/service-token`, {
+      method: 'GET'
+    })
 
     // Attempt to parse JSON first – recent versions return `{ token: "..." }`
     // Fall back to treating the response as raw text for backward-compatibility.
     let txt
     try {
       const json = await res.clone().json()
-      if (json && typeof json.token === 'string') return json.token.trim()
+      if (json && typeof json.token === 'string') {
+        return json.token.trim()
+      }
       // If json parsing succeeds but no token field, fall back to text below.
       txt = await res.text()
     } catch {
@@ -80,60 +97,80 @@ const fetchServiceToken = async () => {
       txt = await res.text()
     }
 
-    return (txt || '').replace(/\s+/g, '') || undefined
+    return (txt || '').replace(/\s+/gu, '') || void 0
   } catch (e) {
     console.error('[sync] Failed to fetch service-token', e)
-    return undefined
   }
 }
 
-const onSnapshot = (el, s, ctx) => (payload = {}) => {
-  const { data, schema } = payload
-  if (!data) return
-
-  // Overwrite high-level objects shallowly so references are preserved
-  Object.entries(data).forEach(([key, val]) => {
-    if (ctx[key] && typeof ctx[key] === 'object') {
-      overwriteShallow(ctx[key], val)
-    } else {
-      ctx[key] = val
+const onSnapshot =
+  (el, s, ctx) =>
+  (payload = {}) => {
+    let { data } = payload
+    const { schema } = payload
+    if (!data) {
+      return
     }
-  })
-
-  // Optionally make schema available on ctx
-  if (schema) ctx.schema = schema
-
-  // Trigger routing so UI reflects latest data
-  const { pathname, search, hash } = ctx.window.location
-  ;(ctx.utils?.router || router)(pathname + search + hash, el, {})
-}
-
-const onOps = (el, s, ctx) => (payload = {}) => {
-  console.log('onOps', payload)
-  const { changes } = payload
-  if (!changes || !Array.isArray(changes) || !changes.length) return
-
-  const changed = applyOpsToCtx(ctx, changes)
-
-  // React to specific top-level changes
-  if (changed.has('state')) {
-    const route = ctx.state?.route
-    if (route) {
-      ;(ctx.utils?.router || router)(route.replace('/state', '') || '/', el, {})
-    } else {
-      s.update(ctx.state)
+    data = el.call('deepDestringify', data, Array.isArray(data) ? [] : {})
+
+    // Overwrite high-level objects shallowly so references are preserved
+    Object.entries(data).forEach(([key, val]) => {
+      if (ctx[key] && typeof ctx[key] === 'object') {
+        overwriteShallow(ctx[key], val)
+      } else {
+        ctx[key] = val
+      }
+    })
+
+    // Optionally make schema available on ctx
+    if (schema) {
+      ctx.schema = schema
     }
-  }
 
-  if (['pages', 'components', 'snippets', 'functions'].some(k => changed.has(k))) {
+    // Trigger routing so UI reflects latest data
     const { pathname, search, hash } = ctx.window.location
     ;(ctx.utils?.router || router)(pathname + search + hash, el, {})
   }
 
-  if (changed.has('designSystem')) {
-    init(ctx.designSystem)
+const onOps =
+  (el, s, ctx) =>
+  (payload = {}) => {
+    let { changes } = payload
+    if (!changes || !Array.isArray(changes) || !changes.length) {
+      return
+    }
+
+    changes = el.call(
+      'deepDestringify',
+      changes,
+      Array.isArray(changes) ? [] : {}
+    )
+
+    const changed = applyOpsToCtx(ctx, changes)
+
+    // React to specific top-level changes
+    if (changed.has('state')) {
+      const route = ctx.state?.route
+      if (route) {
+        el.call('router', route.replace('/state', '') || '/')
+      } else {
+        s.update(ctx.state)
+      }
+    }
+
+    if (
+      ['pages', 'components', 'snippets', 'functions'].some((k) =>
+        changed.has(k)
+      )
+    ) {
+      const { pathname, search, hash } = ctx.window.location
+      el.call('router', pathname + search + hash)
+    }
+
+    if (changed.has('designSystem')) {
+      init(ctx.designSystem)
+    }
   }
-}
 
 export const connectToSocket = async (el, s, ctx) => {
   const token = await fetchServiceToken()
@@ -144,11 +181,15 @@ export const connectToSocket = async (el, s, ctx) => {
 
   const projectKey = ctx.key
   if (!projectKey) {
-    console.warn('[sync] ctx.key missing – cannot establish collaborative connection')
+    console.warn(
+      '[sync] ctx.key missing – cannot establish collaborative connection'
+    )
     return null
   }
 
-  const socketBaseUrl = isLocalhost ? 'http://localhost:8080' : 'https://api.symbols.app'
+  const socketBaseUrl = isLocal
+    ? 'http://localhost:8080'
+    : 'https://api.symbols.app'
 
   const socket = io(socketBaseUrl, {
     path: '/collab-socket',
@@ -165,7 +206,9 @@ export const connectToSocket = async (el, s, ctx) => {
   })
 
   socket.on('connect', () => {
-    if (ctx.editor?.verbose) console.info('[sync] Connected to collab socket')
+    if (ctx.editor?.verbose) {
+      console.info('[sync] Connected to collab socket')
+    }
   })
 
   socket.on('snapshot', onSnapshot(el, s, ctx))
@@ -178,7 +221,9 @@ export const connectToSocket = async (el, s, ctx) => {
   })
 
   socket.on('disconnect', (reason) => {
-    if (ctx.editor?.verbose) console.info('[sync] Disconnected from collab socket', reason)
+    if (ctx.editor?.verbose) {
+      console.info('[sync] Disconnected from collab socket', reason)
+    }
   })
 
   return socket

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@symbo.ls/sync",
-  "version": "2.29.56",
+  "version": "2.29.58",
   "main": "index.js",
   "module": "index.js",
-  "gitHead": "21b072a25b1a7133b7da1005786126dd5c56f975",
+  "gitHead": "d32818a7552e84853d4dcc9dec1dcc7e3e5c7dab",
   "files": [
     "*.js",
     "dist"
@@ -29,12 +29,12 @@
     "prepublish": "rimraf -I dist && npm run build && npm run copy:package:cjs"
   },
   "dependencies": {
-    "@domql/router": "^2.29.56",
-    "@domql/utils": "^2.29.56",
-    "@symbo.ls/init": "^2.29.56",
-    "@symbo.ls/scratch": "^2.29.56",
-    "@symbo.ls/socket": "^2.29.56",
-    "@symbo.ls/uikit": "^2.29.56",
+    "@domql/router": "^2.29.58",
+    "@domql/utils": "^2.29.58",
+    "@symbo.ls/init": "^2.29.58",
+    "@symbo.ls/scratch": "^2.29.58",
+    "@symbo.ls/socket": "^2.29.58",
+    "@symbo.ls/uikit": "^2.29.58",
     "socket.io-client": "^4.8.1"
   },
   "devDependencies": {