vis-core 0.23.2 → 0.23.4

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.2";
+}, version = "0.23.4";
 /**
  * @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);
@@ -49367,8 +49367,8 @@ class History {
             r("dispose");
             return;
           }
-          const Qe = T.shift(), _e = this.editor.scripts.events.beforeExecuteUndo.length ? this.editor.scripts.dispatch("beforeExecuteUndo", Qe) : Qe;
-          _e && (yield this.executeUndo(_e)), this.editor.scripts.events.afterExecuteUndo.length && this.editor.scripts.dispatch("afterExecuteUndo", Qe), Xe += 1;
+          const Qe = T.shift(), _e = this.editor.hooks.events.beforeExecuteUndo.length ? this.editor.hooks.dispatch("beforeExecuteUndo", Qe) : Qe;
+          _e && (yield this.executeUndo(_e)), this.editor.hooks.events.afterExecuteUndo.length && this.editor.hooks.dispatch("afterExecuteUndo", Qe), Xe += 1;
         }
         this.editor.emit("progress", {
           type: "还原场景",
@@ -49433,7 +49433,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;
+      const T = this.editor.hooks.events.beforeSetVisOptions.length ? this.editor.hooks.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._baseObjectByUuid = this.editor.baseObjectByUuid.bind(this.editor), this.vis.on("loaderProgress", (Ke, Je) => {
         this.editor.emit("progress", {
           type: "下载资源",
@@ -49619,7 +49619,7 @@ const compareVersion = (c, e) => {
     }
   }), compareVersion(c.c.version, "0.21.24") === -1 && c.h.u[0] && c.h.u[0].visType === "map" && (T = (r = c.v) == null ? void 0 : r.eo) != null && T.parentBgCurvatureResolution && (delete c.v.eo.parentBgCurvatureResolution, c.v.eo.parentBgTopSegments = 400), compareVersion(c.c.version, "0.23.1") === -1 && c.h.u[0] && c.h.u[0].visType === "map2" && !c.h.u[0].visOptions.cityOnMap && (c.h.u[0].visOptions.clickHandleDrillDown = !0), c;
 };
-class Scripts {
+class Hooks {
   constructor(e) {
     H0(this, "editor");
     H0(this, "events", {
@@ -49627,10 +49627,23 @@ 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");
+      }
+    });
   }
   addEvents(e) {
     for (const s in e) {
@@ -49644,12 +49657,13 @@ class Scripts {
     this.source !== s && (this.source = s, this.editor.emit("scriptsChanged"));
   }
   fromJSON(e) {
-    try {
-      const s = new Function(`return ${e}()`)();
-      this.addEvents(s), this.source = e;
-    } catch (s) {
-      console.error(s);
-    }
+    if (e)
+      try {
+        const s = new Function(`return ${e}()`)();
+        this.addEvents(s), this.source = e;
+      } catch (s) {
+        console.error(s);
+      }
   }
   toJSON() {
     return this.source;
@@ -49667,6 +49681,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) => {
@@ -49691,15 +49739,11 @@ class Editor {
     H0(this, "events", new EventEmitter());
     H0(this, "history");
     H0(this, "viewport");
-    H0(this, "scripts");
+    H0(this, "hooks");
+    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", []);
@@ -49719,7 +49763,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.hooks = new Hooks(this), this.config = new Config(this), this.config.setConfig("sdkVersion", version);
   }
   getObjectMaterial(e, s) {
     if (!e)
@@ -49814,7 +49858,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));
@@ -49844,34 +49888,34 @@ class Editor {
       try {
         s && !n$1(s) ? console.warn(
           "fromJSON 第二个参数已修改，{beforeSetVisOptions:(r)=>r} 替代"
-        ) : s && this.scripts.addEvents(s), window.postMessage({ type: "vis-core.fromJSON.start" }), console.time("vis-core:time.fromJSON");
+        ) : s && this.hooks.addEvents(s);
         let Ke;
         if (typeof e == "string") {
-          const Je = this.options.assetsPrefix + e, { res: Qe } = yield jsonFetch(Je);
+          const Je = this.options.assetsPrefix + e;
+          console.time("vis-core:time.json-fetch");
+          const { res: Qe, err: _e } = yield jsonFetch(Je);
+          if (console.timeEnd("vis-core:time.json-fetch"), _e)
+            throw new Error("fromJSON error:" + _e);
           Ke = Qe;
         } else
           Ke = e;
-        if (Ke = fixJSON(Ke), Ke.at && (accessToken.token = Ke.at), !this.storage) {
+        if (this.hooks.dispatch("beforeFromJSON"), Ke = fixJSON(Ke), Ke.at && (accessToken.token = Ke.at), !this.storage) {
           if (!accessToken.token)
             throw new Error("设置 token 或平台重新下载 JSON 文件");
           const Je = accessToken.getInfo();
           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.history.fromJSON(Ke.h), this.viewport.fromJSON(Ke.v), this.hooks.fromJSON(Ke.s), this.config.compareVersion(), 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.hooks.dispatch("beforeShow"), (T = this.viewport.vis) == null || T.show(), this.hooks.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.hooks.dispatch("afterFromJSON"), Ke;
       } catch (Ke) {
-        throw window.postMessage({ type: "vis-core.fromJSON.error" }), new Error("fromJSON error:" + Ke);
+        throw this.hooks.dispatch("errorFromJSON"), new Error("fromJSON error:" + Ke);
       }
     });
   }
@@ -49884,29 +49928,11 @@ 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()) : "";
   }
   dispose() {
-    this.events.removeAllListeners(), this.viewport.dispose(), this.history.clear(), this.scripts.clear(), this._dispose = !0;
+    this.events.removeAllListeners(), this.viewport.dispose(), this.history.clear(), this.hooks.clear(), this._dispose = !0;
   }
 }
 const BLOCKLISTED_GPUS = [

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "0.23.2";
+declare const _default: "0.23.4";
 export default _default;

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

@@ -75,7 +75,7 @@ export default class Base extends Event {
     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 fromJSON(): (jsonOrUrl: Record<string, any> | string, hooks?: Record<string, any>) => Promise<Record<string, any>>;
     get baseObjectByUuid(): {
         (uuid: `arc${string}`, flag?: boolean): Arc;
         (uuid: `sprite${string}`, flag?: boolean): import("../all/objects/Sprite").default;

package/package.json

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