@vmscloud/moz-ui-grid-vue 0.2.9 → 0.2.11

package/dist/index.js

@@ -1,8 +1,8 @@
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-import { onBeforeUnmount, inject, ref, watch, nextTick, shallowRef, defineComponent, createElementBlock, openBlock, computed, provide, reactive, createApp, h, getCurrentInstance, mergeModels, useModel, useSlots, onMounted, toRef, Fragment, createElementVNode, renderSlot, createBlock, createCommentVNode, normalizeStyle, mergeProps, toHandlers, unref, createSlots, withCtx, normalizeProps, guardReactiveProps } from "vue";
-import { stampPresetVersion, migrateGridPreset, applyPresetCoreConfig, Popup, radio, select, button, GridChrome, WRAPPER_EXTRA_KEYS } from "@vmscloud/moz-ui-grid-wrapper";
+import { onBeforeUnmount, inject, ref, watch, nextTick, shallowRef, defineComponent, createElementBlock, openBlock, computed, provide, reactive, createApp, h, getCurrentInstance, mergeModels, useModel, useSlots, onMounted, toRef, Fragment, createElementVNode, renderSlot, createBlock, createCommentVNode, normalizeStyle, markRaw, mergeProps, toHandlers, unref, createSlots, withCtx, normalizeProps, guardReactiveProps } from "vue";
+import { stampPresetVersion, migrateGridPreset, applyPresetCoreConfig, Popup, radio, select, button, LatestSettingsCoordinator, GridChrome, WRAPPER_EXTRA_KEYS } from "@vmscloud/moz-ui-grid-wrapper";
 import { u as useGridNotificationStore } from "./chunks/notification.contract-BTOch6ed.js";
 import { G, p } from "./chunks/notification.contract-BTOch6ed.js";
 import { html, nothing } from "lit-html";
@@ -24,9 +24,23 @@ class UserLayoutInstance {
     __publicField(this, "_default");
     __publicField(this, "_importDef");
     __publicField(this, "_exportDef");
-    __publicField(this, "_pendingDef");
     __publicField(this, "_pending");
-    __publicField(this, "dispose", () => {
+    __publicField(this, "_disposed", false);
+    __publicField(this, "_sequence", 0);
+    __publicField(this, "_active");
+    __publicField(this, "_queued");
+    __publicField(this, "_lastApplyResult");
+    __publicField(this, "_disposeCallback", () => {
+    });
+    /** 요청 접수 당시 preset에 완료를 귀속하는 registry 내부 hook. */
+    __publicField(this, "captureApplied");
+    __publicField(this, "disposeInstance", () => {
+      if (this._disposed) return;
+      this._disposed = true;
+      if (this._active) this.finish(this._active, "disposed");
+      if (this._queued) this.finish(this._queued, "disposed");
+      this._queued = void 0;
+      this._disposeCallback();
     });
     __publicField(this, "setApplied", () => {
     });
@@ -39,7 +53,6 @@ class UserLayoutInstance {
     this._exportDef = exportDef;
     this._default = exportDef();
     this._pending = false;
-    this._pendingDef = null;
     this.strict = strict ?? false;
     this.dependencies = dependencies ?? null;
     if (!manualLifeCycle) {
@@ -48,21 +61,30 @@ class UserLayoutInstance {
       });
     }
   }
+  get disposed() {
+    return this._disposed;
+  }
+  get applying() {
+    return !!this._active || !!this._queued;
+  }
+  get lastApplyResult() {
+    return this._lastApplyResult;
+  }
+  get requestId() {
+    return this._sequence;
+  }
+  get dispose() {
+    return this.disposeInstance;
+  }
+  set dispose(callback) {
+    this._disposeCallback = callback;
+  }
   get pending() {
     return this._pending;
   }
   set pending(value) {
     this._pending = value;
-    if (!value && this._pendingDef) {
-      try {
-        this._importDef(this._pendingDef);
-        this.setApplied(true);
-      } catch (e2) {
-        console.warn(`[UserLayoutInstance] id="${this._id}" importDef 실패:`, e2);
-      } finally {
-        this._pendingDef = null;
-      }
-    }
+    this.drain();
   }
   get id() {
     return this._id;
@@ -80,12 +102,84 @@ class UserLayoutInstance {
     return this._exportDef();
   }
   set current(value) {
-    if (this.pending) {
-      this._pendingDef = value;
-      return;
+    void this.apply(value);
+  }
+  /** 취소는 import 자체를 중단하지 않으며, 겹친 import는 직렬 실행합니다. */
+  apply(value) {
+    const requestId = ++this._sequence;
+    if (this._active) this.finish(this._active, "superseded");
+    if (this._queued) this.finish(this._queued, "superseded");
+    this._queued = void 0;
+    return new Promise((resolve) => {
+      var _a;
+      const request = {
+        requestId,
+        value,
+        resolve,
+        settled: false,
+        applied: this.setApplied
+      };
+      if (this._disposed) {
+        this.finish(request, "disposed");
+        return;
+      }
+      try {
+        request.applied = ((_a = this.captureApplied) == null ? void 0 : _a.call(this)) ?? this.setApplied;
+      } catch (error) {
+        this.finish(request, "failed", error);
+        return;
+      }
+      this._lastApplyResult = void 0;
+      this._queued = request;
+      this.drain();
+    });
+  }
+  finish(request, status, error) {
+    if (request.settled) return;
+    request.settled = true;
+    const result = { status, requestId: request.requestId };
+    if (error !== void 0) result.error = error;
+    if (request.requestId === this._sequence) this._lastApplyResult = result;
+    request.resolve(result);
+  }
+  drain() {
+    if (this._disposed || this._pending || this._active || !this._queued) return;
+    const request = this._queued;
+    this._queued = void 0;
+    this._active = request;
+    const complete = (result, error, failed = false) => {
+      try {
+        if (!request.settled) {
+          if (failed) {
+            console.warn(`[UserLayoutInstance] id="${this._id}" importDef 실패:`, error);
+            this.finish(request, "failed", error);
+          } else if (result && typeof result === "object" && "status" in result && result.status !== "applied") {
+            this.finish(request, result.status, result.error);
+          } else {
+            request.applied(true);
+            this.finish(request, "applied");
+          }
+        }
+      } catch (error2) {
+        this.finish(request, "failed", error2);
+      } finally {
+        this._active = void 0;
+        this.drain();
+      }
+    };
+    try {
+      const result = this._importDef(request.value);
+      if (result && typeof result.then === "function") {
+        Promise.resolve(result).then(
+          (value) => complete(value),
+          (error) => complete(void 0, error, true)
+        );
+      } else {
+        complete(result);
+      }
+    } catch (error) {
+      complete(void 0, error, true);
     }
-    this._importDef(value);
-    this.setApplied(true);
   }
   setDefaultToCurrent() {
     this._default = this._exportDef();
@@ -113,11 +207,13 @@ function useGridPreset(options) {
     return def;
   };
   const applyExtra = (set, value) => {
-    if (value !== void 0) set == null ? void 0 : set(value);
+    if (value !== void 0) return set == null ? void 0 : set(value);
   };
-  const applyPreset = async (preset) => {
-    const grid = options.gridInstance.value;
-    if (!grid) return;
+  const applyPreset = async (preset, grid, requestId) => {
+    const invalidOwner = () => {
+      if (layoutInstance.disposed) return { status: "disposed", requestId };
+      if (options.gridInstance.value !== grid) return { status: "superseded", requestId };
+    };
     const baseline = layoutInstance.default ?? null;
     const migrated = migrateGridPreset(preset ?? baseline, {
       grid,
@@ -128,25 +224,39 @@ function useGridPreset(options) {
       if (options.onImportDiagnostics) options.onImportDiagnostics(migrated.diagnostics);
       else console.warn("[Grid preset compatibility]", migrated.diagnostics);
     }
+    const beforeCore = invalidOwner();
+    if (beforeCore) return beforeCore;
     if (migrated.config) await applyPresetCoreConfig(grid, migrated.config, migrated.missing);
-    applyExtra(options.setColumnFormatState, migrated.columnFormatConfig);
-    applyExtra(options.setCustomCellState, migrated.customCellConfig);
-    applyExtra(options.setViewOptionsState, migrated.viewOptionsConfig);
+    const extras = [
+      [options.setColumnFormatState, migrated.columnFormatConfig],
+      [options.setCustomCellState, migrated.customCellConfig],
+      [options.setViewOptionsState, migrated.viewOptionsConfig]
+    ];
+    for (const [set, value] of extras) {
+      const invalid = invalidOwner();
+      if (invalid) return invalid;
+      await applyExtra(set, value);
+    }
+    const beforeSettlement = invalidOwner();
+    if (beforeSettlement) return beforeSettlement;
+    await grid.waitForSettled();
+    return invalidOwner() ?? { status: "applied", requestId };
   };
-  let latestRequest = 0;
-  let queue = Promise.resolve();
-  const importDef = (preset) => {
-    const token = ++latestRequest;
-    const run = queue.then(async () => {
-      if (token !== latestRequest) return;
-      try {
-        await applyPreset(preset);
-      } catch (error) {
-        console.error("[Grid preset] import failed", error);
-      }
-    });
-    queue = run;
-    return run;
+  const importDef = async (preset) => {
+    const requestId = layoutInstance.requestId;
+    const grid = options.gridInstance.value;
+    await Promise.resolve();
+    if (layoutInstance.disposed) return { status: "disposed", requestId };
+    if (requestId !== layoutInstance.requestId || options.gridInstance.value !== grid) {
+      return { status: "superseded", requestId };
+    }
+    if (!grid) return { status: "failed", requestId, error: new Error("Grid preset: grid-not-ready") };
+    try {
+      return await applyPreset(preset, grid, requestId);
+    } catch (error) {
+      console.error("[Grid preset] import failed", error);
+      return { status: "failed", requestId, error };
+    }
   };
   const layoutInstance = new UserLayoutInstance({
     id: options.name.value,
@@ -155,18 +265,31 @@ function useGridPreset(options) {
     exportDef
   });
   let registered = false;
-  watch(options.gridInstance, (grid) => {
-    if (!grid || registered) return;
+  watch(options.gridInstance, (grid, _previous, onCleanup) => {
+    if (!grid || registered || layoutInstance.disposed) return;
     if (!options.name.value) return;
+    let active = true;
+    let scheduled = false;
+    const isCurrent = () => active && !layoutInstance.disposed && options.gridInstance.value === grid;
     const unsub = grid.on("data:loaded", () => {
-      if (registered) return;
+      if (registered || scheduled || !isCurrent()) return;
+      scheduled = true;
       layoutInstance.setDefaultToCurrent();
-      nextTick(() => {
-        register(layoutInstance);
+      void nextTick(async () => {
+        if (!isCurrent() || registered) return;
         registered = true;
         unsub();
+        try {
+          await register(layoutInstance);
+        } catch (error) {
+          console.error("[Grid preset] registration failed", error);
+        }
       });
     });
+    onCleanup(() => {
+      active = false;
+      unsub();
+    });
   });
 }
 let instance = null;
@@ -1000,6 +1123,7 @@ const GRID_BULK_EDITOR_MODULE_KEY = Symbol("moz-grid-bulk-editor-module");
 const _sfc_main$2 = /* @__PURE__ */ defineComponent({
   __name: "MozGrid",
   props: /* @__PURE__ */ mergeModels({
+    sourceRevision: {},
     height: { default: "100%" },
     contextMenuConfig: {},
     emptyState: {},
@@ -1278,10 +1402,19 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
       }
       chromeUnsubs = [];
     }
-    function createChrome() {
+    const reportedErrors = /* @__PURE__ */ new WeakSet();
+    function reportInitializationError(error) {
+      if (error && typeof error === "object") {
+        if (reportedErrors.has(error)) return;
+        reportedErrors.add(error);
+      }
+      console.error("[MozGrid] initialization failed", error);
+    }
+    function createChrome(snapshot) {
       if (!hostRef.value) return null;
       vueRenderer.setAppContext(appContext);
-      const c2 = new GridChrome(hostRef.value, buildCoreConfig(), buildChromeOptions());
+      const c2 = markRaw(new GridChrome(hostRef.value, buildCoreConfig(), { ...buildChromeOptions(), sourceRevision: props.sourceRevision }, snapshot));
+      markRaw(c2.grid);
       chrome = c2;
       gridInstance.value = c2.grid;
       containerRef.value = hostRef.value;
@@ -1294,56 +1427,56 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
           c2.syncAppliedConfig(buildCoreConfig());
         })
       );
+      void c2.ready().catch(reportInitializationError);
       return c2;
     }
-    async function mountChrome() {
-      const c2 = createChrome();
-      if (!c2) return;
-      try {
-        await c2.ready();
-        if (!isCurrentChrome(c2)) return;
+    let readyChrome = null;
+    const settingsCoordinator = new LatestSettingsCoordinator({
+      waitUntilSettled: async (request, signal) => {
+        if (chrome == null ? void 0 : chrome.waitForReinitSettled) await chrome.waitForReinitSettled(signal, chrome.isSourceReplacement(request.config, request.sourceRevision));
+        else await (chrome == null ? void 0 : chrome.ready());
+      },
+      apply: async (request, context) => {
+        if (!chrome) return;
+        let c2 = chrome;
+        const { reinitRequired, completion } = c2.reconcileCoreConfig(request.config, request.sourceRevision);
+        if (completion) await completion;
+        if (reinitRequired) {
+          const captureHost = c2;
+          const snapshot = captureHost.captureReinitStateAsync ? await captureHost.captureReinitStateAsync(request.config, request.sourceRevision) : c2.captureReinitState(request.config, request.sourceRevision);
+          if (!context.isCurrent() || chrome !== c2) return;
+          clearChromeUnsubs();
+          c2.destroy();
+          chrome = null;
+          vueRenderer.unmountAll();
+          const next = createChrome(snapshot);
+          if (!next) return;
+          c2 = next;
+          await c2.ready();
+          if (chrome !== c2) return;
+          await c2.restoreReinitState(snapshot);
+        } else {
+          await c2.ready();
+        }
+        if (!context.isCurrent() || chrome !== c2 || readyChrome === c2) return;
+        readyChrome = c2;
         toolItemsProps.value = c2.getToolItemsProps();
         emit("ready", c2.grid, c2);
-      } catch (error) {
-        if (chrome === c2) console.error("[MozGrid] initialization failed", error);
-      }
-    }
+      },
+      onError: reportInitializationError
+    });
     function reconcile() {
-      if (!chrome) return;
-      const { reinitRequired } = chrome.reconcileCoreConfig(buildCoreConfig());
-      if (reinitRequired) void reinitChrome();
-    }
-    function isCurrentChrome(candidate) {
-      return chrome === candidate;
-    }
-    async function reinitChrome() {
-      if (!chrome) return;
-      const snapshot = chrome.captureReinitState();
-      clearChromeUnsubs();
-      chrome.destroy();
-      chrome = null;
-      vueRenderer.unmountAll();
-      const c2 = createChrome();
-      if (!c2) return;
-      try {
-        await c2.ready();
-        if (!isCurrentChrome(c2)) return;
-        await c2.restoreReinitState(snapshot);
-        if (!isCurrentChrome(c2)) return;
-        toolItemsProps.value = c2.getToolItemsProps();
-        emit("ready", c2.grid, c2);
-      } catch (error) {
-        if (chrome === c2) console.error("[MozGrid] initialization failed", error);
-      }
+      settingsCoordinator.request({ config: buildCoreConfig(), sourceRevision: props.sourceRevision });
     }
     onMounted(() => {
-      void mountChrome();
+      createChrome();
+      reconcile();
       watch(
         () => {
           const all = coreConfig.value;
           void all.data;
           void all.fields;
-          const rest = { _locale: resolvedLocale.value, _timeZone: resolvedTimeZone.value };
+          const rest = { _locale: resolvedLocale.value, _timeZone: resolvedTimeZone.value, _sourceRevision: props.sourceRevision };
           for (const k2 in all) {
             if (k2 === "data" || k2 === "fields") continue;
             rest[k2] = all[k2];
@@ -1408,6 +1541,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
       );
     });
     onBeforeUnmount(() => {
+      settingsCoordinator.destroy();
       clearChromeUnsubs();
       chrome == null ? void 0 : chrome.destroy();
       chrome = null;
@@ -1480,7 +1614,7 @@ const _export_sfc = (sfc, props) => {
   }
   return target;
 };
-const MozGrid = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-ecaeb65f"]]);
+const MozGrid = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-3e1ac7f7"]]);
 const CellTemplate = defineComponent({
   name: "CellTemplate",
   props: {