@timeax/digital-service-engine 0.1.0 → 0.2.1

package/dist/schema/index.d.cts

@@ -224,6 +224,11 @@ type ValidatorOptions = {
     selectedOptionKeys?: string[];
     globalUtilityGuard?: boolean;
     policies?: DynamicRule[];
+    /**
+     * Global/base rate policy used by validation and service filtering.
+     * This is intentionally separate from fallbackSettings.ratePolicy.
+     */
+    ratePolicy?: RatePolicy;
     fallbackSettings?: FallbackSettings;
 };
 type RatePolicy = {

package/dist/schema/index.d.ts

@@ -224,6 +224,11 @@ type ValidatorOptions = {
     selectedOptionKeys?: string[];
     globalUtilityGuard?: boolean;
     policies?: DynamicRule[];
+    /**
+     * Global/base rate policy used by validation and service filtering.
+     * This is intentionally separate from fallbackSettings.ratePolicy.
+     */
+    ratePolicy?: RatePolicy;
     fallbackSettings?: FallbackSettings;
 };
 type RatePolicy = {

package/dist/workspace/index.cjs

@@ -4764,15 +4764,13 @@ function rateOk(svcMap, candidate, primary, policy) {
 
 // src/core/validate/steps/rates.ts
 function validateRates(v) {
-  var _a, _b, _c, _d;
-  const ratePolicy = normalizeRatePolicy(
-    (_a = v.options.fallbackSettings) == null ? void 0 : _a.ratePolicy
-  );
+  var _a, _b, _c;
+  const ratePolicy = normalizeRatePolicy(v.options.ratePolicy);
   for (const f of v.fields) {
     if (!isMultiField(f)) continue;
     const baseRates = [];
-    for (const o of (_b = f.options) != null ? _b : []) {
-      const role = (_d = (_c = o.pricing_role) != null ? _c : f.pricing_role) != null ? _d : "base";
+    for (const o of (_a = f.options) != null ? _a : []) {
+      const role = (_c = (_b = o.pricing_role) != null ? _b : f.pricing_role) != null ? _c : "base";
       if (role !== "base") continue;
       const sid = o.service_id;
       if (!isServiceIdRef(sid)) continue;
@@ -5546,6 +5544,38 @@ function applyPolicies(errors, props, serviceMap, policies, fieldsVisibleUnder,
   }
 }
 
+// src/core/governance.ts
+var DEFAULT_FALLBACK_SETTINGS = {
+  requireConstraintFit: true,
+  ratePolicy: { kind: "lte_primary", pct: 5 },
+  selectionStrategy: "priority",
+  mode: "strict"
+};
+function resolveGlobalRatePolicy(options) {
+  return normalizeRatePolicy(options.ratePolicy);
+}
+function resolveFallbackSettings(options) {
+  var _a;
+  return {
+    ...DEFAULT_FALLBACK_SETTINGS,
+    ...(_a = options.fallbackSettings) != null ? _a : {}
+  };
+}
+function mergeValidatorOptions(defaults = {}, overrides = {}) {
+  var _a, _b, _c, _d;
+  const mergedFallbackSettings = {
+    ...(_a = defaults.fallbackSettings) != null ? _a : {},
+    ...(_b = overrides.fallbackSettings) != null ? _b : {}
+  };
+  return {
+    ...defaults,
+    ...overrides,
+    policies: (_c = overrides.policies) != null ? _c : defaults.policies,
+    ratePolicy: (_d = overrides.ratePolicy) != null ? _d : defaults.ratePolicy,
+    fallbackSettings: Object.keys(mergedFallbackSettings).length > 0 ? mergedFallbackSettings : void 0
+  };
+}
+
 // src/core/builder.ts
 var import_lodash_es2 = require("lodash-es");
 function createBuilder(opts = {}) {
@@ -5788,7 +5818,7 @@ var BuilderImpl = class {
     return out;
   }
   errors() {
-    return validate(this.props, this.options);
+    return validate(this.props, mergeValidatorOptions({}, this.options));
   }
   getOptions() {
     return (0, import_lodash_es2.cloneDeep)(this.options);
@@ -6075,11 +6105,14 @@ function readVisibilitySimOpts(ctx) {
   };
 }
 function validate(props, ctx = {}) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c;
+  const options = mergeValidatorOptions({}, ctx);
+  const fallbackSettings = resolveFallbackSettings(options);
+  const ratePolicy = resolveGlobalRatePolicy(options);
   const errors = [];
-  const serviceMap = (_a = ctx.serviceMap) != null ? _a : {};
+  const serviceMap = (_a = options.serviceMap) != null ? _a : {};
   const selectedKeys = new Set(
-    (_b = ctx.selectedOptionKeys) != null ? _b : []
+    (_b = options.selectedOptionKeys) != null ? _b : []
   );
   const tags = Array.isArray(props.filters) ? props.filters : [];
   const fields = Array.isArray(props.fields) ? props.fields : [];
@@ -6089,8 +6122,12 @@ function validate(props, ctx = {}) {
   for (const f of fields) fieldById.set(f.id, f);
   const v = {
     props,
-    nodeMap: (_c = ctx.nodeMap) != null ? _c : buildNodeMap(props),
-    options: ctx,
+    nodeMap: (_c = options.nodeMap) != null ? _c : buildNodeMap(props),
+    options: {
+      ...options,
+      ratePolicy,
+      fallbackSettings
+    },
     errors,
     serviceMap,
     selectedKeys,
@@ -6105,7 +6142,7 @@ function validate(props, ctx = {}) {
   validateIdentity(v);
   validateOptionMaps(v);
   v.fieldsVisibleUnder = createFieldsVisibleUnder(v);
-  const visSim = readVisibilitySimOpts(ctx);
+  const visSim = readVisibilitySimOpts(options);
   validateVisibility(v, visSim);
   applyPolicies(
     v.errors,
@@ -6126,7 +6163,7 @@ function validate(props, ctx = {}) {
         builder,
         services: serviceMap,
         tagId: tag.id,
-        ratePolicy: (_d = ctx.fallbackSettings) == null ? void 0 : _d.ratePolicy,
+        ratePolicy,
         invalidFieldIds: v.invalidRateFieldIds
       });
       for (const diag of diags) {
@@ -6695,18 +6732,23 @@ function createNodeIndex(builder) {
 
 // src/core/service-filter.ts
 function filterServicesForVisibleGroup(input, deps) {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
   const svcMap = (_c = (_b = (_a = deps.builder).getServiceMap) == null ? void 0 : _b.call(_a)) != null ? _c : {};
+  const builderOptions = (_e = (_d = deps.builder).getOptions) == null ? void 0 : _e.call(_d);
   const { context } = input;
   const usedSet = new Set(context.usedServiceIds.map(String));
   const primary = context.usedServiceIds[0];
+  const explicitFallbackSettings = (_f = context.fallbackSettings) != null ? _f : context.fallback;
+  const resolvedRatePolicy = normalizeRatePolicy(
+    (_h = (_g = context.ratePolicy) != null ? _g : explicitFallbackSettings == null ? void 0 : explicitFallbackSettings.ratePolicy) != null ? _h : builderOptions == null ? void 0 : builderOptions.ratePolicy
+  );
+  const fallbackSettingsSource = explicitFallbackSettings != null ? explicitFallbackSettings : builderOptions == null ? void 0 : builderOptions.fallbackSettings;
   const fb = {
-    requireConstraintFit: true,
-    ratePolicy: { kind: "lte_primary", pct: 5 },
-    selectionStrategy: "priority",
-    mode: "strict",
-    ...(_d = context.fallback) != null ? _d : {}
+    ...DEFAULT_FALLBACK_SETTINGS,
+    ...fallbackSettingsSource != null ? fallbackSettingsSource : {},
+    ratePolicy: resolvedRatePolicy
   };
+  const policySource = (_j = (_i = context.policies) != null ? _i : builderOptions == null ? void 0 : builderOptions.policies) != null ? _j : [];
   const visibleServiceIds = context.selectedButtons === void 0 ? void 0 : collectVisibleServiceIds(
     deps.builder,
     context.tagId,
@@ -6731,11 +6773,11 @@ function filterServicesForVisibleGroup(input, deps) {
     const fitsConstraints = constraintFitOk(
       svcMap,
       cap.id,
-      (_e = context.effectiveConstraints) != null ? _e : {}
+      (_k = context.effectiveConstraints) != null ? _k : {}
     );
     const passesRate2 = primary == null ? true : rateOk(svcMap, id, primary, fb);
     const polRes = evaluatePoliciesRaw(
-      (_f = context.policies) != null ? _f : [],
+      policySource,
       [...context.usedServiceIds, id],
       svcMap,
       context.tagId,
@@ -8419,6 +8461,8 @@ function filterServicesForVisibleGroup2(ctx, candidates, input) {
       usedServiceIds: input.usedServiceIds,
       effectiveConstraints: input.effectiveConstraints,
       policies: input.policies,
+      ratePolicy: input.ratePolicy,
+      fallbackSettings: input.fallbackSettings,
       fallback: input.fallback
     }
   };
@@ -9840,6 +9884,8 @@ function CanvasProviderWorkspaceRuntime({
   children,
   builderOpts,
   canvasOpts,
+  ratePolicy,
+  fallbackSettings,
   attachToWorkspace = true
 }) {
   const ws = useWorkspaceMaybe();
@@ -9858,11 +9904,23 @@ function CanvasProviderWorkspaceRuntime({
   const resolvedBuilderOpts = (0, import_react2.useMemo)(() => {
     const svc = ws.services.data;
     const hasMap = svc != null && typeof svc === "object" && !Array.isArray(svc);
-    return hasMap ? {
+    const policies = ws.policies.policies.data;
+    return {
       ...builderOpts != null ? builderOpts : {},
-      serviceMap: svc
-    } : builderOpts;
-  }, [builderOpts, ws.services.data]);
+      ...hasMap ? {
+        serviceMap: svc
+      } : {},
+      policies: policies != null ? policies : void 0,
+      ratePolicy: ratePolicy != null ? ratePolicy : builderOpts == null ? void 0 : builderOpts.ratePolicy,
+      fallbackSettings: fallbackSettings != null ? fallbackSettings : builderOpts == null ? void 0 : builderOpts.fallbackSettings
+    };
+  }, [
+    builderOpts,
+    fallbackSettings,
+    ratePolicy,
+    ws.policies.policies.data,
+    ws.services.data
+  ]);
   if (canMountCanvas) {
     hasMountedOnceRef.current = true;
   }
@@ -9936,68 +9994,43 @@ function useCanvasFromExisting(api) {
 }
 var NO_SNAPSHOT_HYDRATION_KEY = "__no_snapshot__";
 function useHydrateEditorSnapshot(api, snapshot) {
-  const targetHydrationKey = (0, import_react2.useMemo)(() => {
+  const fallbackIdentityRef = (0, import_react2.useRef)(
+    `snapshot:fallback:${Math.random().toString(36).slice(2)}`
+  );
+  const hydratedIdentityRef = (0, import_react2.useRef)(NO_SNAPSHOT_HYDRATION_KEY);
+  const [hydrationReady, setHydrationReady] = (0, import_react2.useState)(false);
+  const targetHydrationIdentity = (0, import_react2.useMemo)(() => {
     if (!(snapshot == null ? void 0 : snapshot.props)) return NO_SNAPSHOT_HYDRATION_KEY;
-    return getSnapshotHydrationKey(snapshot);
+    return getSnapshotHydrationIdentity(snapshot, fallbackIdentityRef.current);
   }, [snapshot]);
-  const [hydratedKey, setHydratedKey] = (0, import_react2.useState)(
-    NO_SNAPSHOT_HYDRATION_KEY
-  );
   (0, import_react2.useLayoutEffect)(() => {
-    if (hydratedKey === targetHydrationKey) return;
     if (snapshot == null ? void 0 : snapshot.props) {
-      hydrateEditorFromSnapshot(api, snapshot);
+      const shouldHydrate = hydratedIdentityRef.current !== targetHydrationIdentity;
+      if (shouldHydrate) {
+        hydrateEditorFromSnapshot(api, snapshot);
+        hydratedIdentityRef.current = targetHydrationIdentity;
+      }
     }
-    setHydratedKey(targetHydrationKey);
-  }, [api, hydratedKey, snapshot, targetHydrationKey]);
-  return hydratedKey === targetHydrationKey;
+    if (!hydrationReady) {
+      setHydrationReady(true);
+    }
+  }, [api, hydrationReady, snapshot, targetHydrationIdentity]);
+  return hydrationReady;
 }
-function getSnapshotHydrationKey(snapshot) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
+function getSnapshotHydrationIdentity(snapshot, fallbackIdentity) {
+  var _a, _b, _c;
   const meta = snapshot.meta;
-  const metaKey = [
-    (_b = (_a = meta == null ? void 0 : meta.snapshot_id) != null ? _a : meta == null ? void 0 : meta.snapshotId) != null ? _b : "",
-    (_d = (_c = meta == null ? void 0 : meta.version_id) != null ? _c : meta == null ? void 0 : meta.versionId) != null ? _d : "",
-    (_f = (_e = meta == null ? void 0 : meta.branch_id) != null ? _e : meta == null ? void 0 : meta.branchId) != null ? _f : ""
-  ].join("|");
-  const layout = (_g = snapshot.layout) == null ? void 0 : _g.canvas;
-  const positionKeys = (layout == null ? void 0 : layout.positions) ? Object.keys(layout.positions).sort().join("|") : "";
-  const viewport = (layout == null ? void 0 : layout.viewport) ? `${layout.viewport.x}:${layout.viewport.y}:${layout.viewport.zoom}` : "";
-  const selection = (layout == null ? void 0 : layout.selection) ? Array.from(layout.selection).sort().join("|") : "";
-  const catalogKey = serializeForHydration(snapshot.catalog);
-  return [
-    metaKey,
-    String(((_i = (_h = snapshot.props) == null ? void 0 : _h.fields) != null ? _i : []).length),
-    String(((_k = (_j = snapshot.props) == null ? void 0 : _j.filters) != null ? _k : []).length),
-    positionKeys,
-    viewport,
-    selection,
-    catalogKey
-  ].join("::");
-}
-function serializeForHydration(value) {
-  if (value == null) return "";
-  try {
-    return JSON.stringify(sortForHydration(value));
-  } catch {
-    return "__unserializable__";
-  }
-}
-function sortForHydration(value) {
-  if (Array.isArray(value)) {
-    return value.map((entry) => sortForHydration(entry));
-  }
-  if (value && typeof value === "object") {
-    const entries = Object.entries(value).sort(
-      ([a], [b]) => a.localeCompare(b)
-    );
-    const next = {};
-    for (const [key, entry] of entries) {
-      next[key] = sortForHydration(entry);
-    }
-    return next;
+  const snapshotId = (_a = meta == null ? void 0 : meta.snapshot_id) != null ? _a : meta == null ? void 0 : meta.snapshotId;
+  const versionId = (_b = meta == null ? void 0 : meta.version_id) != null ? _b : meta == null ? void 0 : meta.versionId;
+  const branchId = (_c = meta == null ? void 0 : meta.branch_id) != null ? _c : meta == null ? void 0 : meta.branchId;
+  if (snapshotId != null || versionId != null || branchId != null) {
+    return [
+      String(snapshotId != null ? snapshotId : ""),
+      String(versionId != null ? versionId : ""),
+      String(branchId != null ? branchId : "")
+    ].join("|");
   }
-  return value;
+  return fallbackIdentity;
 }
 function hydrateEditorFromSnapshot(api, snapshot) {
   var _a;
@@ -10225,7 +10258,7 @@ function useCanvasOwned(initialProps, canvasOpts, builderOpts) {
   } else if (((_a = window.SITE) == null ? void 0 : _a.env) !== "production") {
     if (builderOptsRef.current !== builderOpts) {
       console.warn(
-        "[useCanvasOwned] builderOpts changed after init; new values are ignored. If you need to recreate the builder, remount the hook (e.g. change a React key)."
+        "[useCanvasOwned] builderOpts changed after init. Reactive keys (serviceMap/policies/ratePolicy/fallbackSettings/selectedOptionKeys) are applied via setOptions(); other keys may still require remounting to fully reinitialize."
       );
       builderOptsRef.current = builderOpts;
     }
@@ -10237,6 +10270,23 @@ function useCanvasOwned(initialProps, canvasOpts, builderOpts) {
       loadedOnceRef.current = true;
     }
   }, [initialProps]);
+  (0, import_react2.useEffect)(() => {
+    if (!builderOpts) return;
+    builder.setOptions({
+      serviceMap: builderOpts.serviceMap,
+      policies: builderOpts.policies,
+      ratePolicy: builderOpts.ratePolicy,
+      fallbackSettings: builderOpts.fallbackSettings,
+      selectedOptionKeys: builderOpts.selectedOptionKeys
+    });
+  }, [
+    builder,
+    builderOpts == null ? void 0 : builderOpts.fallbackSettings,
+    builderOpts == null ? void 0 : builderOpts.policies,
+    builderOpts == null ? void 0 : builderOpts.ratePolicy,
+    builderOpts == null ? void 0 : builderOpts.selectedOptionKeys,
+    builderOpts == null ? void 0 : builderOpts.serviceMap
+  ]);
   const lastCanvasOptsRef = (0, import_react2.useRef)();
   const stableCanvasOpts = (0, import_react2.useMemo)(() => {
     var _a2;
@@ -10562,18 +10612,18 @@ function useErrors(opts = {}) {
     setValidating(true);
     schedule(
       () => {
-        var _a2, _b2;
+        var _a2, _b2, _c2, _d2, _e2;
         if (token !== runTokenRef.current) return;
         try {
           const props = api.editor.getProps();
-          const res = validate(props);
+          const res = validate(props, (_c2 = (_b2 = (_a2 = api.builder).getOptions) == null ? void 0 : _b2.call(_a2)) != null ? _c2 : {});
           if (token !== runTokenRef.current) return;
           setValidation(toValidationRows(res != null ? res : []));
         } catch (err) {
           if (token !== runTokenRef.current) return;
           pushLog({
-            message: (_a2 = err == null ? void 0 : err.message) != null ? _a2 : "validate() threw",
-            code: (_b2 = err == null ? void 0 : err.code) != null ? _b2 : "validate_throw",
+            message: (_d2 = err == null ? void 0 : err.message) != null ? _d2 : "validate() threw",
+            code: (_e2 = err == null ? void 0 : err.code) != null ? _e2 : "validate_throw",
             meta: err
           });
           setValidation([]);
@@ -12035,6 +12085,8 @@ function Workspace(props) {
     liveDebounceMs,
     autosaveMs,
     autoAutosave,
+    ratePolicy,
+    fallbackSettings,
     tools,
     children
   } = props;
@@ -12050,7 +12102,14 @@ function Workspace(props) {
       liveDebounceMs,
       autosaveMs,
       autoAutosave,
-      children: /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(CanvasProvider, { children: children(tools) })
+      children: /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(
+        CanvasProvider,
+        {
+          ratePolicy,
+          fallbackSettings,
+          children: children(tools)
+        }
+      )
     }
   );
 }