@decaf-ts/core 0.10.1 → 0.11.0

package/lib/esm/tasks/builder.js

@@ -100,6 +100,17 @@ export class TaskBuilder extends Model {
         this.input = value;
         return this;
     }
+    setLock(value) {
+        this.lock = value;
+        return this;
+    }
+    setDependencies(value) {
+        this.dependencies = value;
+        return this;
+    }
+    setDependsOn(value) {
+        return this.setDependencies(value);
+    }
     setMaxAttempts(value) {
         this.maxAttempts = value;
         return this;
@@ -143,11 +154,55 @@ __decorate([
     prop(),
     __metadata("design:type", Object)
 ], TaskBuilder.prototype, "input", void 0);
+__decorate([
+    prop(),
+    __metadata("design:type", String)
+], TaskBuilder.prototype, "lock", void 0);
+__decorate([
+    prop(),
+    list(() => String),
+    __metadata("design:type", Array)
+], TaskBuilder.prototype, "dependencies", void 0);
 __decorate([
     min(1),
     required(),
     __metadata("design:type", Number)
 ], TaskBuilder.prototype, "maxAttempts", void 0);
+export class TaskStepSpecBuilder {
+    constructor(parent, step) {
+        this.parent = parent;
+        this.step = step;
+    }
+    setClassification(value) {
+        this.step.classification = value;
+        return this;
+    }
+    setName(value) {
+        this.step.name = value;
+        return this;
+    }
+    setInput(value) {
+        this.step.input = value;
+        return this;
+    }
+    setLock(value) {
+        this.step.lock = value;
+        return this;
+    }
+    setDependsOn(value) {
+        this.step.dependsOn = value;
+        return this;
+    }
+    addStep(classification, nameOrInput, inputMaybe) {
+        return this.parent.addStep(classification, nameOrInput, inputMaybe);
+    }
+    setSteps(value) {
+        return this.parent.setSteps(value);
+    }
+    build() {
+        return this.parent;
+    }
+}
 export class CompositeTaskBuilder extends TaskBuilder {
     constructor(arg) {
         super(arg);
@@ -166,16 +221,24 @@ export class CompositeTaskBuilder extends TaskBuilder {
     addStep(classification, nameOrInput, inputMaybe) {
         this.steps = this.steps || [];
         const now = new Date();
+        const hasOnlyClassification = arguments.length === 1;
         const hasThirdArg = arguments.length >= 3;
         const name = hasThirdArg && typeof nameOrInput === "string" ? nameOrInput : undefined;
-        const input = hasThirdArg ? inputMaybe : nameOrInput;
-        this.steps.push(new TaskStepSpecModel({
+        const input = hasThirdArg
+            ? inputMaybe
+            : hasOnlyClassification
+                ? undefined
+                : nameOrInput;
+        const step = new TaskStepSpecModel({
             classification,
             name,
             input,
             createdAt: now,
             updatedAt: now,
-        }));
+        });
+        this.steps.push(step);
+        if (hasOnlyClassification)
+            return new TaskStepSpecBuilder(this, step);
         return this;
     }
 }

package/lib/esm/tasks/builder.js.map

@@ -1 +1 @@
-{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../../src/tasks/builder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../../src/tasks/builder.ts"],"names":[],"mappings":"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"}

package/lib/esm/tasks/constants.d.ts

@@ -18,6 +18,7 @@ export declare enum JitterStrategy {
 }
 export declare enum TaskEventType {
     STATUS = "status",
+    UPDATE = "update",
     LOG = "log",
     PROGRESS = "progress",
     ALL = "all"

package/lib/esm/tasks/constants.js

@@ -21,6 +21,7 @@ export var JitterStrategy;
 export var TaskEventType;
 (function (TaskEventType) {
     TaskEventType["STATUS"] = "status";
+    TaskEventType["UPDATE"] = "update";
     TaskEventType["LOG"] = "log";
     TaskEventType["PROGRESS"] = "progress";
     TaskEventType["ALL"] = "all";

package/lib/esm/tasks/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/tasks/constants.ts"],"names":[],"mappings":"AAEA,MAAM,CAAN,IAAY,UAQX;AARD,WAAY,UAAU;IACpB,iCAAmB,CAAA;IACnB,qCAAuB,CAAA;IACvB,iCAAmB,CAAA;IACnB,+BAAiB,CAAA;IACjB,qCAAuB,CAAA;IACvB,mCAAqB,CAAA;IACrB,6CAA+B,CAAA;AACjC,CAAC,EARW,UAAU,KAAV,UAAU,QAQrB;AAED,MAAM,CAAN,IAAY,eAGX;AAHD,WAAY,eAAe;IACzB,8CAA2B,CAAA;IAC3B,kCAAe,CAAA;AACjB,CAAC,EAHW,eAAe,KAAf,eAAe,QAG1B;AAED,MAAM,CAAN,IAAY,cAGX;AAHD,WAAY,cAAc;IACxB,+BAAa,CAAA;IACb,+BAAa,CAAA;AACf,CAAC,EAHW,cAAc,KAAd,cAAc,QAGzB;AAED,MAAM,CAAN,IAAY,aAKX;AALD,WAAY,aAAa;IACvB,kCAAiB,CAAA;IACjB,4BAAW,CAAA;IACX,sCAAqB,CAAA;IACrB,4BAAW,CAAA;AACb,CAAC,EALW,aAAa,KAAb,aAAa,QAKxB;AAED,MAAM,CAAN,IAAY,QAGX;AAHD,WAAY,QAAQ;IAClB,6BAAiB,CAAA;IACjB,mCAAuB,CAAA;AACzB,CAAC,EAHW,QAAQ,KAAR,QAAQ,QAGnB;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,OAAO,CAAC;AAEhC,MAAM,CAAC,MAAM,uBAAuB,GAA0B;IAC5D,QAAQ,EAAE,gBAAgB;IAC1B,WAAW,EAAE,EAAE;IACf,OAAO,EAAE,KAAK;IACd,UAAU,EAAE,IAAI;IAChB,UAAU,EAAE,GAAG;IACf,UAAU,EAAE,GAAG;IACf,gBAAgB,EAAE,CAAC;IACnB,gBAAgB,EAAE,GAAG;IACrB,uBAAuB,EAAE,EAAE;IAC3B,yBAAyB,EAAE,EAAE,GAAG,CAAC,GAAG,IAAI;IACxC,YAAY,EAAE;QACZ,OAAO,EAAE,KAAK;QACd,aAAa,EAAE,IAAI;QACnB,cAAc,EAAE,EAAE,GAAG,IAAI;KAC1B;CACuB,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/tasks/constants.ts"],"names":[],"mappings":"AAEA,MAAM,CAAN,IAAY,UAQX;AARD,WAAY,UAAU;IACpB,iCAAmB,CAAA;IACnB,qCAAuB,CAAA;IACvB,iCAAmB,CAAA;IACnB,+BAAiB,CAAA;IACjB,qCAAuB,CAAA;IACvB,mCAAqB,CAAA;IACrB,6CAA+B,CAAA;AACjC,CAAC,EARW,UAAU,KAAV,UAAU,QAQrB;AAED,MAAM,CAAN,IAAY,eAGX;AAHD,WAAY,eAAe;IACzB,8CAA2B,CAAA;IAC3B,kCAAe,CAAA;AACjB,CAAC,EAHW,eAAe,KAAf,eAAe,QAG1B;AAED,MAAM,CAAN,IAAY,cAGX;AAHD,WAAY,cAAc;IACxB,+BAAa,CAAA;IACb,+BAAa,CAAA;AACf,CAAC,EAHW,cAAc,KAAd,cAAc,QAGzB;AAED,MAAM,CAAN,IAAY,aAMX;AAND,WAAY,aAAa;IACvB,kCAAiB,CAAA;IACjB,kCAAiB,CAAA;IACjB,4BAAW,CAAA;IACX,sCAAqB,CAAA;IACrB,4BAAW,CAAA;AACb,CAAC,EANW,aAAa,KAAb,aAAa,QAMxB;AAED,MAAM,CAAN,IAAY,QAGX;AAHD,WAAY,QAAQ;IAClB,6BAAiB,CAAA;IACjB,mCAAuB,CAAA;AACzB,CAAC,EAHW,QAAQ,KAAR,QAAQ,QAGnB;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,OAAO,CAAC;AAEhC,MAAM,CAAC,MAAM,uBAAuB,GAA0B;IAC5D,QAAQ,EAAE,gBAAgB;IAC1B,WAAW,EAAE,EAAE;IACf,OAAO,EAAE,KAAK;IACd,UAAU,EAAE,IAAI;IAChB,UAAU,EAAE,GAAG;IACf,UAAU,EAAE,GAAG;IACf,gBAAgB,EAAE,CAAC;IACnB,gBAAgB,EAAE,GAAG;IACrB,uBAAuB,EAAE,EAAE;IAC3B,yBAAyB,EAAE,EAAE,GAAG,CAAC,GAAG,IAAI;IACxC,YAAY,EAAE;QACZ,OAAO,EAAE,KAAK;QACd,aAAa,EAAE,IAAI;QACnB,cAAc,EAAE,EAAE,GAAG,IAAI;KAC1B;CACuB,CAAC"}

package/lib/esm/tasks/models/TaskModel.d.ts

@@ -10,6 +10,7 @@ export declare class TaskModel<INPUT = any, OUTPUT = any> extends Model {
     atomicity: TaskType;
     classification: string;
     name?: string;
+    lock?: string;
     status: TaskStatus;
     input?: INPUT;
     output?: OUTPUT;
@@ -19,6 +20,7 @@ export declare class TaskModel<INPUT = any, OUTPUT = any> extends Model {
     backoff: TaskBackoffModel;
     nextRunAt?: Date;
     scheduledTo?: Date;
+    dependencies?: string[];
     leaseOwner?: string;
     leaseExpiry?: Date;
     steps?: TaskStepSpecModel[];

package/lib/esm/tasks/models/TaskModel.js

@@ -60,12 +60,21 @@ __decorate([
     description("optional task name for ambiguity"),
     __metadata("design:type", String)
 ], TaskModel.prototype, "name", void 0);
+__decorate([
+    column(),
+    prop(),
+    description("Optional lock key. Tasks/steps sharing the same key cannot run concurrently"),
+    __metadata("design:type", String)
+], TaskModel.prototype, "lock", void 0);
 __decorate([
     column(),
     required(),
     type(String),
     option(TaskStatus),
     index([OrderDirection.ASC, OrderDirection.DSC]),
+    index([OrderDirection.ASC, OrderDirection.DSC], ["nextRunAt"]),
+    index([OrderDirection.ASC, OrderDirection.DSC], ["leaseExpiry"]),
+    index([OrderDirection.ASC, OrderDirection.DSC], ["scheduledTo"]),
     description("Holds the task current status"),
     __metadata("design:type", String)
 ], TaskModel.prototype, "status", void 0);
@@ -124,6 +133,12 @@ __decorate([
     description("Task scheduled timestamp"),
     __metadata("design:type", Date)
 ], TaskModel.prototype, "scheduledTo", void 0);
+__decorate([
+    column(),
+    serialize(),
+    description("Task dependencies. Supports '<taskId>' or '<taskId>:<step index|step reference>'"),
+    __metadata("design:type", Array)
+], TaskModel.prototype, "dependencies", void 0);
 __decorate([
     prop(),
     column(),

package/lib/esm/tasks/models/TaskModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"TaskModel.js","sourceRoot":"","sources":["../../../../src/tasks/models/TaskModel.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"TaskModel.js","sourceRoot":"","sources":["../../../../src/tasks/models/TaskModel.ts"],"names":[],"mappings":"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"}

package/lib/esm/tasks/models/TaskStepSpecModel.d.ts

@@ -3,5 +3,7 @@ export declare class TaskStepSpecModel extends Model {
     classification: string;
     name?: string;
     input?: any;
+    lock?: string;
+    dependsOn?: string[];
     constructor(arg?: ModelArg<TaskStepSpecModel>);
 }

package/lib/esm/tasks/models/TaskStepSpecModel.js

@@ -9,6 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 import { minlength, Model, model, required, } from "@decaf-ts/decorator-validation";
 import { description, prop } from "@decaf-ts/decoration";
+import { list } from "@decaf-ts/decorator-validation";
 let TaskStepSpecModel = class TaskStepSpecModel extends Model {
     constructor(arg) {
         super(arg);
@@ -29,6 +30,17 @@ __decorate([
     prop(),
     __metadata("design:type", Object)
 ], TaskStepSpecModel.prototype, "input", void 0);
+__decorate([
+    description("Optional lock key. Tasks/steps sharing the same key cannot run concurrently"),
+    prop(),
+    __metadata("design:type", String)
+], TaskStepSpecModel.prototype, "lock", void 0);
+__decorate([
+    description("Task-step dependencies. Supports '<taskId>' or '<taskId>:<step index|step reference>'"),
+    prop(),
+    list(() => String),
+    __metadata("design:type", Array)
+], TaskStepSpecModel.prototype, "dependsOn", void 0);
 TaskStepSpecModel = __decorate([
     model(),
     __metadata("design:paramtypes", [Object])

package/lib/esm/tasks/models/TaskStepSpecModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"TaskStepSpecModel.js","sourceRoot":"","sources":["../../../../src/tasks/models/TaskStepSpecModel.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EACL,SAAS,EACT,KAAK,EACL,KAAK,EAEL,QAAQ,GACT,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAGlD,IAAM,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,KAAK;IAa1C,YAAY,GAAiC;QAC3C,KAAK,CAAC,GAAG,CAAC,CAAC;IACb,CAAC;CACF,CAAA;AAbC;IAFC,QAAQ,EAAE;IACV,WAAW,CAAC,mBAAmB,CAAC;;yDACT;AAIxB;IAFC,SAAS,CAAC,CAAC,CAAC;IACZ,WAAW,CAAC,kCAAkC,CAAC;;+CAClC;AAId;IAFC,WAAW,CAAC,0BAA0B,CAAC;IACvC,IAAI,EAAE;;gDACK;AAXD,iBAAiB;IAD7B,KAAK,EAAE;;GACK,iBAAiB,CAgB7B"}
+{"version":3,"file":"TaskStepSpecModel.js","sourceRoot":"","sources":["../../../../src/tasks/models/TaskStepSpecModel.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EACL,SAAS,EACT,KAAK,EACL,KAAK,EAEL,QAAQ,GACT,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,IAAI,EAAE,MAAM,gCAAgC,CAAC;AAG/C,IAAM,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,KAAK;IA0B1C,YAAY,GAAiC;QAC3C,KAAK,CAAC,GAAG,CAAC,CAAC;IACb,CAAC;CACF,CAAA;AA1BC;IAFC,QAAQ,EAAE;IACV,WAAW,CAAC,mBAAmB,CAAC;;yDACT;AAIxB;IAFC,SAAS,CAAC,CAAC,CAAC;IACZ,WAAW,CAAC,kCAAkC,CAAC;;+CAClC;AAId;IAFC,WAAW,CAAC,0BAA0B,CAAC;IACvC,IAAI,EAAE;;gDACK;AAMZ;IAJC,WAAW,CACV,6EAA6E,CAC9E;IACA,IAAI,EAAE;;+CACO;AAOd;IALC,WAAW,CACV,uFAAuF,CACxF;IACA,IAAI,EAAE;IACN,IAAI,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;oDACE;AAxBV,iBAAiB;IAD7B,KAAK,EAAE;;GACK,iBAAiB,CA6B7B"}

package/lib/esm/tasks/types.d.ts

@@ -8,10 +8,15 @@ import { TaskHandlerRegistry } from "./TaskHandlerRegistry";
 import { TaskEventModel } from "./models/TaskEventModel";
 import { TaskStatus } from "./constants";
 import { TaskErrorModel } from "./models/TaskErrorModel";
+import { TaskStepSpecModel } from "./models/TaskStepSpecModel";
 export interface ITaskHandler<I = any, O = any> {
     type: string;
     run(input: I, ctx: TaskContext): Promise<O>;
+    catch?(input: I, error: unknown, ctx: TaskContext): Promise<void>;
 }
+export type TaskDependencySpec = {
+    dependencies?: string[];
+};
 export type LogPipeOptions = {
     style: boolean;
     logProgress: boolean;
@@ -30,6 +35,7 @@ export interface TaskFlags<LOG extends TaskLogger<any> = TaskLogger<any>> extend
     flush: () => Promise<void>;
     progress: (data: any) => Promise<void>;
     heartbeat: () => Promise<void>;
+    scheduleCompositeSteps?: (steps: TaskStepSpecModel[]) => Promise<void>;
     resultCache?: Record<string, any>;
 }
 export type TaskEngineConfig<A extends Adapter<any, any, any, any>> = {
@@ -50,7 +56,7 @@ export type TaskEngineConfig<A extends Adapter<any, any, any, any>> = {
     autoShutdown?: TaskEngineAutoShutdownConfig;
 };
 export type TaskProgressPayload = {
-    status: TaskStatus;
+    status: TaskStatus | "update";
     currentStep?: number;
     totalSteps?: number;
     output?: any;

package/lib/esm/utils/ContextualLoggedClass.js

@@ -1,6 +1,18 @@
 import { LoggedClass, Logging } from "@decaf-ts/logging";
 import { InternalError, } from "@decaf-ts/db-decorators";
 import { Context } from "./../persistence/Context.js";
+function isContextLike(value) {
+    if (!value || typeof value !== "object")
+        return false;
+    const v = value;
+    // Avoid `instanceof` here because multiple linked builds of `@decaf-ts/core`
+    // can lead to duplicate Context constructors and failing realm checks.
+    return (typeof v.get === "function" &&
+        typeof v.accumulate === "function" &&
+        typeof v.override === "function" &&
+        typeof v.toOverrides === "function" &&
+        v.cache !== undefined);
+}
 export class ContextualLoggedClass extends LoggedClass {
     logCtx(args, operation, allowCreate = false, overrides) {
         return ContextualLoggedClass.logCtx.call(this, operation, overrides || {}, allowCreate, ...args.filter((e) => typeof e !== "undefined"));
@@ -41,7 +53,7 @@ export class ContextualLoggedClass extends LoggedClass {
             return resp;
         };
         let ctx = args.pop();
-        const hasContext = ctx instanceof Context;
+        const hasContext = ctx instanceof Context || isContextLike(ctx);
         if (ctx && !hasContext) {
             args.push(ctx);
             ctx = undefined;

package/lib/esm/utils/ContextualLoggedClass.js.map

@@ -1 +1 @@
-{"version":3,"file":"ContextualLoggedClass.js","sourceRoot":"","sources":["../../../src/utils/ContextualLoggedClass.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ContextualLoggedClass.js","sourceRoot":"","sources":["../../../src/utils/ContextualLoggedClass.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAU,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACjE,OAAO,EAGL,aAAa,GAEd,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,oCAA+B;AAMjD,SAAS,aAAa,CAAC,KAAc;IACnC,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IACtD,MAAM,CAAC,GAAG,KAAY,CAAC;IACvB,6EAA6E;IAC7E,uEAAuE;IACvE,OAAO,CACL,OAAO,CAAC,CAAC,GAAG,KAAK,UAAU;QAC3B,OAAO,CAAC,CAAC,UAAU,KAAK,UAAU;QAClC,OAAO,CAAC,CAAC,QAAQ,KAAK,UAAU;QAChC,OAAO,CAAC,CAAC,WAAW,KAAK,UAAU;QACnC,CAAC,CAAC,KAAK,KAAK,SAAS,CACtB,CAAC;AACJ,CAAC;AAqCD,MAAM,OAAgB,qBAEpB,SAAQ,WAAW;IA+BT,MAAM,CAMd,IAAuC,EACvC,SAAiB,EACjB,cAAsB,KAAe,EACrC,SAAqC;QAMrC,OAAO,qBAAqB,CAAC,MAAM,CAAC,IAAI,CACtC,IAAI,EACJ,SAAS,EACT,SAAS,IAAI,EAAE,EACf,WAAW,EACX,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,WAAW,CAAC,CAS0B,CAAC;IAC9E,CAAC;IAED,MAAM,CAAC,OAAO,CAKZ,GAAM,EACN,MAAqB,EACrB,GAAY,EACZ,MAAyB;QAEzB,MAAM,GAAG,GAAI,GAAkB,CAAC,SAAS,CAAC;YACxC,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,GAAU,CAAC,CAAC,wBAAwB;YACzD,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACpB,gBAAgB;QAChB,+CAA+C;QAC/C,oCAAoC;QACpC,4CAA4C;QAC5C,0BAA0B;QAC1B,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,MAAa,CAAC,CAAC,CAAC,CAAC,GAAG,CAAW,CAAC;IAC3D,CAAC;IAWD,MAAM,CAAC,MAAM,CAQX,SAAiB,EACjB,SAAgD,EAChD,cAAsB,KAAe,EACrC,GAAG,IAAuC;QAM1C,MAAM,OAAO,GAAG,KAAK,UAAU,OAAO,CAEpC,GAAG,IAAiC;YAEpC,IAAI,CAAC,IAAI;gBAAE,MAAM,IAAI,aAAa,CAAC,wBAAwB,CAAC,CAAC;YAC7D,IAAI,CAAE,IAAY,CAAC,SAAS,CAAC;gBAC3B,MAAM,IAAI,aAAa,CAAC,6BAA6B,CAAC,CAAC;YACzD,OAAQ,IAAuC,CAAC,OAAO,CACrD,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,EAC1D,SAAS,IAAK,EAAgC,EAC9C,GAAG,IAAI,CACR,CAAC;QACJ,CAAC,CAAC;QAEF,MAAM,QAAQ,GAAG,CACf,GAAqB,EACrB,IAAuC,EACvC,EAAU,EAG0B,EAAE;YACtC,2EAA2E;YAC3E,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;YAC1C,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC,OAAO;gBACpB,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,wBAAwB;gBACnD,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAErB,IAAI,OAAO,EAAE,KAAK,QAAQ,EAAE,CAAC;gBAC1B,IAAgD,CAAC,GAAG,GAAG,CACtD,MAA+B,EAC/B,EAAE;oBACF,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBAC5D,CAAC,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAC9B,CAAC;YACD,OAAO,IAE8B,CAAC;QACxC,CAAC,CAAC;QAEF,IAAI,GAAG,GAAQ,IAAI,CAAC,GAAG,EAAE,CAAC;QAC1B,MAAM,UAAU,GAAG,GAAG,YAAY,OAAO,IAAI,aAAa,CAAC,GAAG,CAAC,CAAC;QAChE,IAAI,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;YACvB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACf,GAAG,GAAG,SAAS,CAAC;QAClB,CAAC;QACD,IAAI,CAAC,WAAW,IAAI,CAAC,UAAU;YAC7B,MAAM,IAAI,aAAa,CAAC,qBAAqB,CAAC,CAAC;QACjD,IAAI,UAAU,IAAI,CAAC,WAAW,EAAE,CAAC;YAC/B,IAAI,CAAC,GAAG;gBACN,MAAM,IAAI,aAAa,CAAC,uCAAuC,CAAC,CAAC;YACnE,OAAO,QAAQ,CACb,IAAI,EACJ;gBACE,GAAG,EAAE,GAAG,CAAC,MAAM;gBACf,GAAG,EAAE,GAAG;gBACR,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,CAAC;aACa,EACtC,SAAS,CACH,CAAC;QACX,CAAC;QACD,OAAO,OAAO;aACX,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;aAC7C,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;YACb,OAAO,QAAQ,CACb,IAAI,EACJ;gBACE,GAAG,EAAE,IAAI,CAAC,MAAM;gBAChB,GAAG,EAAE,IAAI;gBACT,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,IAAI,CAAC;aACY,EACtC,SAAS,CACV,CAAC;QACJ,CAAC,CAQwE,CAAC;IAC9E,CAAC;CACF;AAED,MAAM,OAAgB,aACpB,SAAQ,qBAAwB;IAGhC;QACE,KAAK,EAAE,CAAC;QAGV;;;WAGG;QACc,aAAQ,GAAmB,CAAA,OAEd,CAAA,CAAC;IAR/B,CAAC;IASD,IAAc,OAAO;QACnB,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,OAAO,CACX,SAMU,EACV,SAA8B,EAC9B,GAAG,IAA6C;QAEhD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACvC,GAAG,CAAC,KAAK,CACP,4BAA4B,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,mCAAmC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAClJ,CAAC;QACF,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACrB,IAAI,CAAC,CAAC,GAAG,YAAY,OAAO,CAAC,EAAE,CAAC;YAC9B,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACf,GAAG,GAAG,SAAS,CAAC;QAClB,CAAC;QAED,wBAAwB;QACxB,gEAAgE;QAChE,6DAA6D;QAC7D,MAAM,QAAQ,GAAG,OAAQ,IAAY,CAAC,KAAK,KAAK,UAAU,CAAC;QAC3D,yBAAyB;QACzB,iCAAiC;QACjC,uBAAuB;QACvB,0CAA0C;QAC1C,gBAAgB;QAChB,QAAQ;QACR,iCAAiC;QAEjC,IAAI,GAAG,IAAI,CAAC,CAAC,GAAG,YAAY,IAAI,CAAC,OAAO,CAAC;YACvC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,SAAS,CAAM,CAAC;QAC1D,OAAO,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC,UAAU,CAAC,SAAS,CAAM,CAAC;IACvD,CAAC;CACF"}

package/lib/identity/decorators.cjs

@@ -28,13 +28,6 @@ function resolveSequenceName(model, suffix) {
     const anchor = suffix || "pk";
     return [tableName, anchor].filter(Boolean).join("_");
 }
-function normalizePropertyKey(attr) {
-    if (typeof attr === "string")
-        return attr;
-    if (typeof attr === "symbol")
-        return attr.description || attr.toString();
-    return String(attr);
-}
 function ensureSequenceOptions(obj, attr, options) {
     if (!options.type) {
         const metaType = decoration_1.Metadata.type(obj.constructor, attr);
@@ -136,8 +129,13 @@ async function pkOnCreate(context, data, key, model) {
 async function sequenceOnCreateUpdate(context, data, key, model, oldModel) {
     if (!data.type || !data.generated)
         return;
-    if (!data.name)
-        data.name = decorator_validation_1.Model.sequenceName(model, String(key));
+    if (!data.name) {
+        const id = decorator_validation_1.Model.pk(model, true);
+        if (typeof id === "undefined" || id === null) {
+            throw new db_decorators_1.InternalError(`Cannot generate sequence without an id for ${model.constructor.name}`);
+        }
+        data.name = decorator_validation_1.Model.sequenceName(model, String(id), String(key));
+    }
     let sequence;
     try {
         sequence = await this.adapter.Sequence(data, this._overrides);
@@ -188,10 +186,6 @@ function sequenceDec(options, params = {}, groupsort) {
     return function sequenceDec(obj, attr) {
         (0, decoration_1.prop)()(obj, attr);
         ensureSequenceOptions(obj, attr, options);
-        if (!options.name) {
-            const suffix = normalizePropertyKey(attr);
-            options.name = resolveSequenceName(obj.constructor, suffix);
-        }
         const decs = [
             (0, decorator_validation_1.required)(),
             (0, decoration_1.propMetadata)(decoration_1.Metadata.key(constants_1.PersistenceKeys.SEQUENCE, attr), options),
@@ -247,7 +241,8 @@ function sequence(opts, updateOrParams) {
     return decoration_1.Decoration.for(constants_1.PersistenceKeys.SEQUENCE)
         .define({
         decorator: sequenceDec,
-        args: [opts, params, { priority: defaultPkPriority }],
+        // Run after pk generation so the model id exists for per-instance sequences.
+        args: [opts, params, { priority: defaultPkPriority + 10 }],
     })
         .apply();
 }

package/lib/identity/decorators.js.map

@@ -1 +1 @@
-{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../../src/identity/decorators.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../../src/identity/decorators.ts"],"names":[],"mappings":"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"}

package/lib/index.cjs

@@ -49,7 +49,7 @@ __exportStar(require("./persistence/index.cjs"), exports);
  * @const VERSION
  * @memberOf module:core
  */
-exports.VERSION = "0.10.0";
+exports.VERSION = "0.10.2";
 /**
  * @description Stores the current package version
  * @summary A constant representing the version of the core package

package/lib/index.d.ts

@@ -22,7 +22,7 @@ export * from "./persistence";
  * @const VERSION
  * @memberOf module:core
  */
-export declare const VERSION = "0.10.0";
+export declare const VERSION = "0.10.2";
 /**
  * @description Stores the current package version
  * @summary A constant representing the version of the core package

package/lib/model/decorators.cjs

@@ -206,6 +206,13 @@ function updatedAt() {
     return (0, db_decorators_1.timestamp)();
 }
 async function persistentVersionOnCreate(context, data, key, model) {
+    // Sequences are meta-records that can be updated during other lifecycle hooks
+    // (for example while computing persistent versions). Persisting a persistent
+    // version for the sequence records themselves causes name recursion like:
+    // `owner_<id>_version -> ??sequence_owner_<id>_version_version -> ...`.
+    // Sequence versions do not need to be persistent.
+    if (decorator_validation_1.Model.tableName(model) === "??sequence")
+        return;
     const id = decorator_validation_1.Model.pk(model, true);
     if (typeof id === "undefined" || id === null) {
         throw new db_decorators_1.InternalError(`Cannot generate persistent version without an id for ${model.constructor.name}`);
@@ -232,6 +239,9 @@ async function persistentVersionOnCreate(context, data, key, model) {
     model[key] = next;
 }
 async function persistentVersionOnUpdate(context, data, key, model, oldModel) {
+    // See persistentVersionOnCreate comment above.
+    if (decorator_validation_1.Model.tableName(model) === "??sequence")
+        return;
     if (context.get("applyUpdateValidation") &&
         oldModel &&
         model[key] !== oldModel[key]) {
@@ -264,7 +274,9 @@ function persistentVersion() {
     const key = constants_1.PersistenceKeys.PERSISTENT_VERSION;
     return function version(target, propertyKey) {
         return decoration_1.Decoration.for(key)
-            .define((0, decoration_1.propMetadata)(decoration_1.Metadata.key(key, propertyKey), true), (0, db_decorators_1.generated)(key), (0, decorator_validation_1.type)(Number), (0, db_decorators_1.onCreate)(persistentVersionOnCreate, {}, { priority: 70 }), (0, db_decorators_1.onUpdate)(persistentVersionOnUpdate, {}, { priority: 70 }))
+            .define(
+        // Ensure class-level decorators (for example Fabric shared/private data) can "see" this attribute.
+        (0, decoration_1.prop)(), (0, decoration_1.propMetadata)(decoration_1.Metadata.key(key, propertyKey), true), (0, db_decorators_1.generated)(key), (0, decorator_validation_1.type)(Number), (0, db_decorators_1.onCreate)(persistentVersionOnCreate, {}, { priority: 70 }), (0, db_decorators_1.onUpdate)(persistentVersionOnUpdate, {}, { priority: 70 }))
             .apply()(target, propertyKey);
     };
 }

package/lib/model/decorators.js.map

@@ -1 +1 @@
-{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../../src/model/decorators.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../../src/model/decorators.ts"],"names":[],"mappings":"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"}

package/lib/overrides/overrides.cjs

@@ -114,6 +114,25 @@ decorator_validation_1.Model.defaultQueryAttributes = function defaultQueryAttri
 decorator_validation_1.Model.sequenceName = function (model, ...args) {
     return [decorator_validation_1.Model.tableName(model), ...args].join("_");
 };
+decorator_validation_1.Model.versionOf = function versionOf(model) {
+    const meta = decoration_1.Metadata.get(model.constructor);
+    // Prefer persistent version if present (for `@version(true)` / `@persistentVersion()`).
+    const persistentMeta = meta?.[constants_1.PersistenceKeys.PERSISTENT_VERSION];
+    const persistentProp = persistentMeta && typeof persistentMeta === "object"
+        ? Object.keys(persistentMeta)[0]
+        : undefined;
+    const versionMeta = meta?.[db_decorators_1.DBKeys.VERSION];
+    const versionProp = versionMeta && typeof versionMeta === "object"
+        ? Object.keys(versionMeta)[0]
+        : undefined;
+    const prop = (persistentProp ?? versionProp);
+    if (!prop)
+        throw new db_decorators_1.InternalError(`No version found for ${model.constructor.name}`);
+    const version = model[prop];
+    if (typeof version !== "number" || version < 1)
+        throw new db_decorators_1.InternalError(`Invalid version number: ${version}`);
+    return version;
+}.bind(decorator_validation_1.Model);
 decorator_validation_1.Model.sequenceFor = function sequenceFor(model, property) {
     const target = typeof model !== "function" ? model.constructor : model;
     let key = constants_1.PersistenceKeys.SEQUENCE;