@timeax/digital-service-engine 0.3.0 → 0.3.1

package/dist/workspace/index.d.cts

@@ -1497,7 +1497,7 @@ interface WorkspaceAPI {
             strict?: boolean;
             includeWorkspaceData?: boolean;
         }>): Promise<void>;
-        templates(params?: Partial<Pick<TemplatesListParams, "branchId" | "since">>): Promise<void>;
+        templates(params?: Partial<Pick<TemplatesListParams, "branchId" | "since">>): Promise<BackendResult<readonly FieldTemplate[]>>;
         participants(params?: Partial<{
             branchId: string;
             since?: number | string;

package/dist/workspace/index.d.ts

@@ -1497,7 +1497,7 @@ interface WorkspaceAPI {
             strict?: boolean;
             includeWorkspaceData?: boolean;
         }>): Promise<void>;
-        templates(params?: Partial<Pick<TemplatesListParams, "branchId" | "since">>): Promise<void>;
+        templates(params?: Partial<Pick<TemplatesListParams, "branchId" | "since">>): Promise<BackendResult<readonly FieldTemplate[]>>;
         participants(params?: Partial<{
             branchId: string;
             since?: number | string;

package/dist/workspace/index.js

@@ -311,6 +311,70 @@ import * as React6 from "react";
 function setLoadableError4(updater, error) {
   updater((s) => ({ ...s, loading: false, error }));
 }
+function parseTimestamp(value) {
+  if (value === void 0 || value === null) return void 0;
+  if (typeof value === "number") {
+    return Number.isFinite(value) ? value : void 0;
+  }
+  const parsed = Date.parse(value);
+  return Number.isFinite(parsed) ? parsed : void 0;
+}
+function templateTime(template) {
+  var _a;
+  return (_a = parseTimestamp(template.updatedAt)) != null ? _a : parseTimestamp(template.createdAt);
+}
+function shouldReplaceTemplates(params) {
+  if (!params.requestedSince) return true;
+  if (!params.lastUpdatedAt) return false;
+  const requested = parseTimestamp(params.requestedSince);
+  const last = parseTimestamp(params.lastUpdatedAt);
+  if (requested === void 0 || last === void 0) {
+    return false;
+  }
+  return requested < last;
+}
+function pickNewestTemplate(current, incoming) {
+  const currentTime = templateTime(current);
+  const incomingTime = templateTime(incoming);
+  if (currentTime !== void 0 && incomingTime !== void 0) {
+    return incomingTime >= currentTime ? incoming : current;
+  }
+  if (currentTime === void 0 && incomingTime !== void 0) return incoming;
+  if (currentTime !== void 0 && incomingTime === void 0) return current;
+  return incoming;
+}
+function mergeTemplates(current, incoming, opts) {
+  var _a;
+  const sinceTime = parseTimestamp(opts == null ? void 0 : opts.since);
+  const incomingIds = new Set(incoming.map((template) => template.id));
+  const deletedIds = new Set((_a = opts == null ? void 0 : opts.deletedIds) != null ? _a : []);
+  const byId = /* @__PURE__ */ new Map();
+  for (const template of current != null ? current : []) {
+    if (deletedIds.has(template.id)) continue;
+    const updatedTime = templateTime(template);
+    const shouldHaveAppearedInDelta = (opts == null ? void 0 : opts.reconcileMissingSince) === true && sinceTime !== void 0 && updatedTime !== void 0 && updatedTime > sinceTime;
+    const missingFromDelta = shouldHaveAppearedInDelta && !incomingIds.has(template.id);
+    if (!missingFromDelta) {
+      byId.set(template.id, template);
+    }
+  }
+  for (const template of incoming) {
+    if (deletedIds.has(template.id)) continue;
+    const existing = byId.get(template.id);
+    byId.set(
+      template.id,
+      existing ? pickNewestTemplate(existing, template) : template
+    );
+  }
+  return Array.from(byId.values()).sort((a, b) => {
+    const aTime = templateTime(a);
+    const bTime = templateTime(b);
+    if (aTime !== void 0 && bTime !== void 0 && aTime !== bTime) {
+      return bTime - aTime;
+    }
+    return a.name.localeCompare(b.name);
+  });
+}
 function useTemplatesSlice(params) {
   const {
     backend,
@@ -338,16 +402,26 @@ function useTemplatesSlice(params) {
         };
       }
       setTemplates((s) => ({ ...s, loading: true }));
+      const requestedSince = (_b = params2 == null ? void 0 : params2.since) != null ? _b : templates.updatedAt;
       const res = await backend.templates.refresh({
         workspaceId,
         branchId,
-        since: (_b = params2 == null ? void 0 : params2.since) != null ? _b : templates.updatedAt
+        since: requestedSince
       });
       if (res.ok) {
-        setTemplates({
-          data: res.value,
-          loading: false,
-          updatedAt: runtime.now()
+        setTemplates((current) => {
+          const replace = shouldReplaceTemplates({
+            requestedSince,
+            lastUpdatedAt: current.updatedAt
+          });
+          return {
+            data: replace ? res.value : mergeTemplates(current.data, res.value, {
+              since: requestedSince,
+              reconcileMissingSince: false
+            }),
+            loading: false,
+            updatedAt: runtime.now()
+          };
         });
         return res;
       } else {
@@ -365,14 +439,14 @@ function useTemplatesSlice(params) {
   );
   const createTemplate = React6.useCallback(
     async (input) => {
-      var _a, _b;
+      var _a;
       const res = await backend.templates.create(workspaceId, {
         ...input,
-        branchId: (_a = input.branchId) != null ? _a : getCurrentBranchId()
+        branchId: input.branchId !== null ? input.branchId : getCurrentBranchId()
       });
       if (res.ok) {
         await refreshTemplates({
-          branchId: (_b = res.value.branchId) != null ? _b : getCurrentBranchId()
+          branchId: (_a = res.value.branchId) != null ? _a : getCurrentBranchId()
         });
       }
       return res;
@@ -432,11 +506,23 @@ function useTemplatesSlice(params) {
     async (id) => {
       const res = await backend.templates.delete(id);
       if (res.ok) {
-        await refreshTemplates({ branchId: getCurrentBranchId() });
+        const deleteRefreshSince = runtime.now();
+        setTemplates((current) => {
+          var _a, _b;
+          return {
+            ...current,
+            data: (_b = (_a = current.data) == null ? void 0 : _a.filter((template) => template.id !== id)) != null ? _b : current.data,
+            updatedAt: deleteRefreshSince
+          };
+        });
+        await refreshTemplates({
+          branchId: getCurrentBranchId(),
+          since: deleteRefreshSince
+        });
       }
       return res;
     },
-    [backend.templates, getCurrentBranchId, refreshTemplates]
+    [backend.templates, getCurrentBranchId, refreshTemplates, runtime]
   );
   const invalidateTemplates = React6.useCallback(() => {
     setTemplates((s) => ({ ...s, updatedAt: void 0 }));
@@ -2699,7 +2785,7 @@ function WorkspaceProvider(props) {
         },
         branchContext: bootCtl.refreshBranchContext,
         templates: async (params) => {
-          await templatesSlice.refreshTemplates(params);
+          return await templatesSlice.refreshTemplates(params);
         },
         participants: async (params) => {
           await branchesSlice.refreshParticipants(params);