vis-core 0.23.1 → 0.23.3

package/dist/index.module.js

@@ -90,7 +90,7 @@ const publicKeyPEM = "LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQklqQU5CZ2txaGtpRz
     ).toString(CryptoJS.enc.Utf8), qe = JSON.parse($e), st = Date.now();
     return !qe.s || qe.s > st ? (this.token = void 0, "") : qe.e && qe.e < st ? (this.token = void 0, "") : (qe.isValid = Qe, qe);
   }
-}, version = "0.23.1";
+}, version = "0.23.3";
 /**
  * @license
  * Copyright 2010-2024 Three.js Authors
@@ -48558,7 +48558,7 @@ class Command {
     return e.type = this.type, e.id = this.id, e.name = this.name, e.updatable = this.updatable, e;
   }
   fromJSON(e) {
-    if (this.type = e.type, this.id = e.id, this.name = e.name, this.updatable = e.updatable, !this.editor.jsonVersion && e.objectUuid) {
+    if (this.type = e.type, this.id = e.id, this.name = e.name, this.updatable = e.updatable, !this.editor.config.meta.jsonVersion && e.objectUuid) {
       const s = this.editor.objectByUuid(e.objectUuid);
       s && (e.objectUuid = this.editor.uuidByObject(s));
       const r = this.editor.baseObjectByUuid(e.objectUuid);
@@ -49434,7 +49434,7 @@ class Viewport {
       if (this.vis = this.options.visFactories, this.vis.visName !== e)
         throw new Error(`visName is not match, import {${e}}`);
       const T = this.editor.scripts.events.beforeSetVisOptions.length ? this.editor.scripts.dispatch("beforeSetVisOptions", s) : s;
-      this.vis.setOptions(ai(ai({}, T), this.extendsOptions)), this.delLoadObj && (this.vis.delLoadArr = this.delLoadObj), this.vis.playing = this.editor.playing, this.vis.on("loaderProgress", (Ke, Je) => {
+      this.vis.setOptions(ai(ai({}, T), this.extendsOptions)), this.delLoadObj && (this.vis.delLoadArr = this.delLoadObj), this.vis.playing = this.editor.playing, this.vis._baseObjectByUuid = this.editor.baseObjectByUuid.bind(this.editor), this.vis.on("loaderProgress", (Ke, Je) => {
         this.editor.emit("progress", {
           type: "下载资源",
           value: Ke / Je * 100 | 0
@@ -49627,24 +49627,39 @@ class Scripts {
       beforeExecuteUndo: [],
       afterExecuteUndo: [],
       beforeShow: [],
-      afterShow: []
+      afterShow: [],
+      beforeFromJSON: [],
+      afterFromJSON: [],
+      errorFromJSON: []
     });
     H0(this, "source", "");
-    this.editor = e;
+    this.editor = e, this.addEvents({
+      beforeFromJSON: () => {
+        window.postMessage({ type: "vis-core.fromJSON.start" }), console.time("vis-core:time.fromJSON");
+      },
+      afterFromJSON: () => {
+        window.postMessage({ type: "vis-core.fromJSON.end" }), console.timeEnd("vis-core:time.fromJSON");
+      },
+      errorFromJSON: () => {
+        window.postMessage({ type: "vis-core.fromJSON.error" }), console.timeEnd("vis-core:time.fromJSON");
+      }
+    });
   }
-  add(e) {
+  addEvents(e) {
     for (const s in e) {
       const r = s;
       this.events[r] && this.events[r].push(e[r].bind(e));
     }
   }
+  addStaticEvents(e) {
+    this.addEvents(e());
+    const s = e.toString().replace(/^\s+/gm, "").replace(/(\r\n|\n|\r)/gm, "");
+    this.source !== s && (this.source = s, this.editor.emit("scriptsChanged"));
+  }
   fromJSON(e) {
     try {
-      e = `
-        return ${e}(vis);
-      `;
-      const s = new Function(e)();
-      this.add(s), this.source = e;
+      const s = new Function(`return ${e}()`)();
+      this.addEvents(s), this.source = e;
     } catch (s) {
       console.error(s);
     }
@@ -49665,6 +49680,40 @@ class Scripts {
     return r;
   }
 }
+class Config {
+  constructor(e) {
+    H0(this, "editor");
+    H0(this, "meta", {
+      name: "",
+      key: "",
+      open: !1,
+      jsonVersion: "0.0.0",
+      sdkVersion: "0.0.0"
+    });
+    this.editor = e;
+  }
+  setConfig(e, s) {
+    this.meta[e] = s, this.editor.emit("configChanged", ai({}, this.meta));
+  }
+  fromJSON(e) {
+    Object.keys(e).forEach((s) => {
+      const r = s === "version" ? "jsonVersion" : s;
+      r in this.meta && this.setConfig(r, e[s]);
+    });
+  }
+  compareVersion() {
+    compareVersion(this.meta.jsonVersion, this.meta.sdkVersion) === 1 && console.warn(
+      "vis-core 版本过低，可能会出现问题",
+      "json:" + this.meta.jsonVersion,
+      "sdk:" + this.meta.sdkVersion
+    );
+  }
+  toJSON() {
+    return {
+      version: this.meta.sdkVersion
+    };
+  }
+}
 const jsonFetch = (c, e, s = !1) => {
   const r = makePromiseCreator(!0), T = c.endsWith("gzip") || s;
   return window.fetch(c).then((de) => {
@@ -49690,14 +49739,10 @@ class Editor {
     H0(this, "history");
     H0(this, "viewport");
     H0(this, "scripts");
+    H0(this, "config");
     H0(this, "pencil");
     H0(this, "on", this.events.on.bind(this.events));
     H0(this, "emit", this.events.emit.bind(this.events));
-    H0(this, "sdkVersion", version);
-    H0(this, "jsonVersion");
-    H0(this, "key");
-    H0(this, "name");
-    H0(this, "open", !1);
     H0(this, "options");
     H0(this, "selectOption", []);
     H0(this, "selectOption2", []);
@@ -49717,7 +49762,7 @@ class Editor {
       processUndosMaxFrameTime: Number.MAX_VALUE
     }, e), this.events.setMaxListeners(9999999), this.viewport = new Viewport(this, {
       visFactories: e.visFactories
-    }), this.history = new History(this), this.scripts = new Scripts(this);
+    }), this.history = new History(this), this.scripts = new Scripts(this), this.config = new Config(this), this.config.setConfig("sdkVersion", version);
   }
   getObjectMaterial(e, s) {
     if (!e)
@@ -49812,7 +49857,7 @@ class Editor {
         object: s.camera,
         uuid: "camera"
       }
-    ), !this.jsonVersion) {
+    ), !this.config.meta.jsonVersion) {
       const Xe = new window.Map();
       de.forEach((Ke, Je) => {
         Xe.has(Ke.name) ? Ke.fixUuid = Ke.name + "_" + Je : (Ke.fixUuid = Ke.name, Xe.set(Ke.name, !0));
@@ -49842,7 +49887,7 @@ class Editor {
       try {
         s && !n$1(s) ? console.warn(
           "fromJSON 第二个参数已修改，{beforeSetVisOptions:(r)=>r} 替代"
-        ) : s && this.scripts.add(s), window.postMessage({ type: "vis-core.fromJSON.start" }), console.time("vis-core:time.fromJSON");
+        ) : s && this.scripts.addEvents(s), this.scripts.dispatch("beforeFromJSON");
         let Ke;
         if (typeof e == "string") {
           const Je = this.options.assetsPrefix + e, { res: Qe } = yield jsonFetch(Je);
@@ -49856,20 +49901,16 @@ class Editor {
           if (!Je || !Je.isValid)
             throw new Error("need accessToken");
         }
-        if (compareVersion(Ke.c.version, this.sdkVersion) === 1 && console.warn(
-          "vis-core 版本过低，可能会出现问题",
-          "json:" + Ke.c.version,
-          "sdk:" + this.sdkVersion
-        ), this.setConfig(Ke.c), this.history.fromJSON(Ke.h), this.viewport.fromJSON(Ke.v), Ke.s && this.scripts.fromJSON(Ke.s), yield this.history.processUndos(this.options.processUndosMaxFrameTime), (r = Ke.v.bg) != null && r.texture && this.viewport.vis) {
+        if (this.config.fromJSON(Ke.c), this.config.compareVersion(), this.history.fromJSON(Ke.h), this.viewport.fromJSON(Ke.v), Ke.s && this.scripts.fromJSON(Ke.s), yield this.history.processUndos(this.options.processUndosMaxFrameTime), (r = Ke.v.bg) != null && r.texture && this.viewport.vis) {
           const Je = parseTexture(Ke.v.bg.texture);
           Je.colorSpace = SRGBColorSpace, this.viewport.vis.pencil.scene.background = Je;
         }
-        return this.scripts.dispatch("beforeShow"), (T = this.viewport.vis) == null || T.show(), this.scripts.dispatch("afterShow"), (de = this.pencil.controls) == null || de.saveState(), this.select(null), console.timeEnd("vis-core:time.fromJSON"), window.postMessage({ type: "vis-core.fromJSON.end" }), (Xe = this.viewport.vis) != null && Xe.workerOnce && this.playing && window.requestIdleCallback(() => {
+        return this.scripts.dispatch("beforeShow"), (T = this.viewport.vis) == null || T.show(), this.scripts.dispatch("afterShow"), (de = this.pencil.controls) == null || de.saveState(), this.select(null), (Xe = this.viewport.vis) != null && Xe.workerOnce && this.playing && window.requestIdleCallback(() => {
           var Je;
           (Je = this.viewport.vis) == null || Je.worker.dispose();
-        }), Ke;
+        }), this.scripts.dispatch("afterFromJSON"), Ke;
       } catch (Ke) {
-        throw window.postMessage({ type: "vis-core.fromJSON.error" }), new Error("fromJSON error:" + Ke);
+        throw this.scripts.dispatch("errorFromJSON"), new Error("fromJSON error:" + Ke);
       }
     });
   }
@@ -49882,24 +49923,6 @@ class Editor {
   }
   setViewportVis(...e) {
   }
-  setConfig(e) {
-    const s = {
-      name: this.name,
-      key: this.key,
-      version: this.jsonVersion,
-      open: this.open
-    };
-    e.name && typeof e.name == "string" && (this.name = e.name), e.key !== void 0 && (this.key = e.key), e.version !== void 0 && (this.jsonVersion = e.version), e.open !== void 0 && (this.open = e.open), this.emit(
-      "configChanged",
-      {
-        name: this.name,
-        key: this.key,
-        version: this.jsonVersion,
-        open: this.open
-      },
-      s
-    );
-  }
   getDataURL() {
     return this.pencil ? (this.pencil.render(), this.pencil.renderer.domElement.toDataURL()) : "";
   }
@@ -50378,6 +50401,7 @@ class Base extends Event {
     H0(this, "visName");
     H0(this, "editor");
     H0(this, "tier0", !1);
+    H0(this, "_baseObjectByUuid");
     H0(this, "initSettingsObj");
     H0(this, "mouseButtonsActiveStore", null);
     if (this.container = s.container, this.options = ai({
@@ -50431,7 +50455,8 @@ class Base extends Event {
     return this.editor.fromJSON.bind(this.editor);
   }
   get baseObjectByUuid() {
-    return this.editor.baseObjectByUuid.bind(this.editor);
+    var s;
+    return ((s = this.editor) == null ? void 0 : s.baseObjectByUuid.bind(this.editor)) || this._baseObjectByUuid;
   }
   get objectByUuid() {
     return this.editor.objectByUuid.bind(this.editor);

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "0.23.1";
+declare const _default: "0.23.3";
 export default _default;

package/dist/vis/base/index.d.ts

@@ -74,6 +74,7 @@ export default class Base extends Event {
     tier0: boolean;
     constructor(options: BaseOptions);
     setOptions(options: Record<string, any>): void;
+    _baseObjectByUuid: Editor['baseObjectByUuid'];
     get fromJSON(): (jsonOrUrl: Record<string, any> | string, scripts?: Record<string, any>) => Promise<Record<string, any>>;
     get baseObjectByUuid(): {
         (uuid: `arc${string}`, flag?: boolean): Arc;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vis-core",
-  "version": "0.23.1",
+  "version": "0.23.3",
   "scripts": {
     "start": "npm run version && PORT=5173 bundler-dev",
     "build:site": "npm run version && bundler",