@objectstack/objectql 9.10.0 → 9.11.0

package/dist/index.mjs

@@ -6133,6 +6133,7 @@ var ObjectStackProtocolImplementation = _ObjectStackProtocolImplementation;
 
 // src/engine.ts
 import { AsyncLocalStorage } from "async_hooks";
+import { parseAutonumberFormat, renderAutonumber, missingFieldValues } from "@objectstack/spec/data";
 import { ExecutionContextSchema } from "@objectstack/spec/kernel";
 import { createLogger } from "@objectstack/core";
 import { CoreServiceName, StorageNameMapping } from "@objectstack/spec/system";
@@ -7558,8 +7559,9 @@ var _ObjectQL = class _ObjectQL {
     const tx = execCtx?.transaction !== void 0 ? execCtx.transaction : this.txStore.getStore()?.transaction;
     const hasTx = tx !== void 0;
     const hasTenant = execCtx?.tenantId !== void 0;
+    const hasTz = execCtx?.timezone !== void 0;
     const isSystem = execCtx?.isSystem === true;
-    if (!hasTx && !hasTenant && !isSystem) return base;
+    if (!hasTx && !hasTenant && !isSystem && !hasTz) return base;
     const opts = base && typeof base === "object" ? { ...base } : {};
     if (hasTx && opts.transaction === void 0) {
       opts.transaction = tx;
@@ -7567,6 +7569,9 @@ var _ObjectQL = class _ObjectQL {
     if (hasTenant && opts.tenantId === void 0) {
       opts.tenantId = execCtx.tenantId;
     }
+    if (hasTz && opts.timezone === void 0) {
+      opts.timezone = execCtx.timezone;
+    }
     if (isSystem && opts.bypassTenantAudit === void 0) {
       opts.bypassTenantAudit = true;
     }
@@ -7640,29 +7645,48 @@ var _ObjectQL = class _ObjectQL {
    * owns the value, not the client.
    *
    * In the fallback path the next value is `max(existing) + 1`, seeded once per
-   * `object.field` from the store then incremented in memory (monotonic within
-   * the process, resilient to deletions). `autonumberFormat` is honored, e.g.
-   * `CASE-{0000}` → `CASE-0042`. NOTE: this in-memory seeding is single-instance.
+   * `object.field.<scope>` from the store then incremented in memory (monotonic
+   * within the process, resilient to deletions). The shared `autonumberFormat`
+   * renderer is honored end-to-end, so date tokens (`AD{YYYYMMDD}{0000}`), field
+   * interpolation (`{island_zone}{000}`) and per-scope reset behave identically
+   * to the SQL driver's persistent sequence (#1603). NOTE: this in-memory seeding
+   * is single-instance.
    */
   async applyAutonumbers(object, record, execCtx, driverOwnsAutonumber) {
     if (driverOwnsAutonumber) return;
     const fields = this.getSchema(object)?.fields;
     if (!fields || typeof fields !== "object" || Array.isArray(fields)) return;
+    const now = /* @__PURE__ */ new Date();
+    const timezone = execCtx?.timezone;
     for (const [name, def] of Object.entries(fields)) {
       if (def?.type !== "autonumber") continue;
       const current = record[name];
       if (current != null && current !== "") continue;
-      const key = `${object}.${name}`;
-      let next = this.autonumberCounters.get(key);
-      if (next == null) next = await this.seedAutonumber(object, name, execCtx);
-      next += 1;
-      this.autonumberCounters.set(key, next);
       const fmt = def.autonumberFormat ?? def.format;
-      record[name] = this.formatAutonumber(fmt, next);
+      const tokens = parseAutonumberFormat(typeof fmt === "string" ? fmt : "");
+      const missing = missingFieldValues(tokens, record);
+      if (missing.length > 0) {
+        throw new Error(
+          `Cannot generate autonumber "${object}.${name}" (format "${fmt}"): referenced field(s) [${missing.join(", ")}] are empty on the record. Fields interpolated into an autonumber format must be set before the record is created.`
+        );
+      }
+      const probe = renderAutonumber({ tokens, seq: 0, record, now, timezone });
+      const counterKey = `${object}.${name}.${probe.scope}`;
+      let next = this.autonumberCounters.get(counterKey);
+      if (next == null) next = await this.seedAutonumber(object, name, probe.prefix, execCtx);
+      next += 1;
+      this.autonumberCounters.set(counterKey, next);
+      record[name] = renderAutonumber({ tokens, seq: next, record, now, timezone }).value;
     }
   }
-  /** Seed the autonumber counter from the current max numeric value in store. */
-  async seedAutonumber(object, field, execCtx) {
+  /**
+   * Seed the autonumber counter from the current max in store, scoped to
+   * `prefix`. With a non-empty prefix (date/field formats) only rows in the
+   * same scope count, and the counter is the digit-run immediately after the
+   * prefix; with an empty prefix (legacy fixed-prefix formats) the last digit
+   * run of the whole value is used, preserving the original behaviour.
+   */
+  async seedAutonumber(object, field, prefix, execCtx) {
     try {
       const rows = await this.find(object, {
         select: ["id", field],
@@ -7673,22 +7697,24 @@ var _ObjectQL = class _ObjectQL {
       for (const r of rows || []) {
         const v = r?.[field];
         if (v == null) continue;
-        const m = String(v).match(/(\d+)(?!.*\d)/);
-        if (m) max = Math.max(max, parseInt(m[1], 10) || 0);
+        const s = String(v);
+        if (prefix && !s.startsWith(prefix)) continue;
+        const tail = prefix ? s.slice(prefix.length) : s;
+        let digits;
+        if (prefix) {
+          const head = tail.match(/^\d+/);
+          digits = head ? head[0] : void 0;
+        } else {
+          const runs = tail.match(/\d+/g);
+          digits = runs ? runs[runs.length - 1] : void 0;
+        }
+        if (digits) max = Math.max(max, parseInt(digits, 10) || 0);
       }
       return max;
     } catch {
       return 0;
     }
   }
-  /** Apply an autonumber format like `CASE-{0000}`; default to the bare number. */
-  formatAutonumber(format, value) {
-    if (!format) return String(value);
-    const m = format.match(/\{(0+)\}/);
-    if (!m) return format.includes("{0}") ? format.replace("{0}", String(value)) : `${format}${value}`;
-    const padded = String(value).padStart(m[1].length, "0");
-    return format.replace(m[0], padded);
-  }
   /**
    * Register contribution (Manifest)
    *