@intentic/engine 1.125.1 → 1.126.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.d.ts +5 -4
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -2
- package/dist/index.js.map +1 -1
- package/dist/provider.d.ts +13 -1
- package/dist/provider.d.ts.map +1 -1
- package/dist/providers/fake.d.ts.map +1 -1
- package/dist/providers/fake.js +4 -1
- package/dist/providers/fake.js.map +1 -1
- package/dist/readiness.d.ts +7 -1
- package/dist/readiness.d.ts.map +1 -1
- package/dist/readiness.js +16 -4
- package/dist/readiness.js.map +1 -1
- package/dist/reconcile/apply.d.ts.map +1 -1
- package/dist/reconcile/apply.js +7 -9
- package/dist/reconcile/apply.js.map +1 -1
- package/dist/reconcile/orphans.d.ts +2 -3
- package/dist/reconcile/orphans.d.ts.map +1 -1
- package/dist/reconcile/orphans.js +25 -6
- package/dist/reconcile/orphans.js.map +1 -1
- package/dist/reconcile/plan.d.ts.map +1 -1
- package/dist/reconcile/plan.js +5 -6
- package/dist/reconcile/plan.js.map +1 -1
- package/dist/reconcile/prune.d.ts +2 -1
- package/dist/reconcile/prune.d.ts.map +1 -1
- package/dist/reconcile/prune.js +43 -11
- package/dist/reconcile/prune.js.map +1 -1
- package/dist/reconcile/reconcile.d.ts +6 -2
- package/dist/reconcile/reconcile.d.ts.map +1 -1
- package/dist/reconcile/reconcile.js +18 -2
- package/dist/reconcile/reconcile.js.map +1 -1
- package/dist/types.d.ts +5 -2
- package/dist/types.d.ts.map +1 -1
- package/package.json +7 -7
package/dist/index.d.ts
CHANGED
|
@@ -1,16 +1,17 @@
|
|
|
1
|
-
export type { DiffResult, Observed, Provider, ProviderContext, Providers } from "./provider.js";
|
|
1
|
+
export type { DiffResult, ListedResource, Observed, Provider, ProviderContext, Providers, ScanSource } from "./provider.js";
|
|
2
2
|
export type { FakeWorld } from "./providers/fake.js";
|
|
3
3
|
export { createFakeProviders } from "./providers/fake.js";
|
|
4
4
|
export type { ReadinessProbe } from "./readiness.js";
|
|
5
|
-
export { httpProbe, parseDuration, waitReady } from "./readiness.js";
|
|
5
|
+
export { httpProbe, parseDuration, ReadinessTimeoutError, waitReady } from "./readiness.js";
|
|
6
6
|
export { apply } from "./reconcile/apply.js";
|
|
7
7
|
export { applyMoves, rewriteGraphForMoves } from "./reconcile/moves.js";
|
|
8
|
+
export { collectOrphans } from "./reconcile/orphans.js";
|
|
8
9
|
export { plan } from "./reconcile/plan.js";
|
|
9
|
-
export { prune } from "./reconcile/prune.js";
|
|
10
|
+
export { prune, pruneOrphans } from "./reconcile/prune.js";
|
|
10
11
|
export type { ConvergeResult } from "./reconcile/reconcile-loop.js";
|
|
11
12
|
export { reconcile } from "./reconcile/reconcile-loop.js";
|
|
12
13
|
export { resolveInputs } from "./resolve-inputs.js";
|
|
13
14
|
export type { OutputStore } from "./store.js";
|
|
14
15
|
export { createStore } from "./store.js";
|
|
15
|
-
export type { Action, ApplyOutcome, EngineConfig, EngineEvent, Orphan, PlanOutcome, PrunedResource, PruneOutcome, ResolvedInputs, Step, } from "./types.js";
|
|
16
|
+
export type { Action, ApplyOutcome, EngineConfig, EngineEvent, Orphan, OrphanEntry, PlanOutcome, PrunedResource, PruneOutcome, ResolvedInputs, Step, } from "./types.js";
|
|
16
17
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,UAAU,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,EAAE,eAAe,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC5H,YAAY,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC1D,YAAY,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,qBAAqB,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC5F,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAC3D,YAAY,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,YAAY,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,YAAY,EACR,MAAM,EACN,YAAY,EACZ,YAAY,EACZ,WAAW,EACX,MAAM,EACN,WAAW,EACX,WAAW,EACX,cAAc,EACd,YAAY,EACZ,cAAc,EACd,IAAI,GACP,MAAM,YAAY,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
export { createFakeProviders } from "./providers/fake.js";
|
|
2
|
-
export { httpProbe, parseDuration, waitReady } from "./readiness.js";
|
|
2
|
+
export { httpProbe, parseDuration, ReadinessTimeoutError, waitReady } from "./readiness.js";
|
|
3
3
|
export { apply } from "./reconcile/apply.js";
|
|
4
4
|
export { applyMoves, rewriteGraphForMoves } from "./reconcile/moves.js";
|
|
5
|
+
export { collectOrphans } from "./reconcile/orphans.js";
|
|
5
6
|
export { plan } from "./reconcile/plan.js";
|
|
6
|
-
export { prune } from "./reconcile/prune.js";
|
|
7
|
+
export { prune, pruneOrphans } from "./reconcile/prune.js";
|
|
7
8
|
export { reconcile } from "./reconcile/reconcile-loop.js";
|
|
8
9
|
export { resolveInputs } from "./resolve-inputs.js";
|
|
9
10
|
export { createStore } from "./store.js";
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAE1D,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAE1D,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,qBAAqB,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC5F,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAE3D,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC"}
|
package/dist/provider.d.ts
CHANGED
|
@@ -3,6 +3,7 @@ import type { ResolvedInputs } from "./types.js";
|
|
|
3
3
|
export interface Observed {
|
|
4
4
|
readonly outputs: Readonly<Record<string, unknown>>;
|
|
5
5
|
readonly detail?: Readonly<Record<string, unknown>>;
|
|
6
|
+
readonly stampHash?: string;
|
|
6
7
|
}
|
|
7
8
|
export type DiffResult = {
|
|
8
9
|
readonly action: "noop";
|
|
@@ -10,17 +11,28 @@ export type DiffResult = {
|
|
|
10
11
|
readonly action: "update";
|
|
11
12
|
readonly reason: string;
|
|
12
13
|
};
|
|
14
|
+
export interface ScanSource {
|
|
15
|
+
readonly id: string;
|
|
16
|
+
readonly type: ResourceType;
|
|
17
|
+
readonly inputs: ResolvedInputs;
|
|
18
|
+
}
|
|
19
|
+
export interface ListedResource {
|
|
20
|
+
readonly id: string;
|
|
21
|
+
readonly inputs: ResolvedInputs;
|
|
22
|
+
readonly protected?: boolean;
|
|
23
|
+
}
|
|
13
24
|
export interface ProviderContext {
|
|
14
25
|
readonly env: Readonly<Record<string, string | undefined>>;
|
|
15
26
|
readonly log: (message: string) => void;
|
|
16
27
|
readonly id: string;
|
|
17
28
|
readonly output: (id: string, name: string) => unknown;
|
|
29
|
+
readonly inputsHash?: string;
|
|
18
30
|
}
|
|
19
31
|
export interface Provider {
|
|
20
32
|
readonly read: (inputs: ResolvedInputs, ctx: ProviderContext) => Promise<Observed | undefined>;
|
|
21
33
|
readonly diff: (inputs: ResolvedInputs, observed: Observed) => DiffResult;
|
|
22
34
|
readonly apply: (inputs: ResolvedInputs, observed: Observed | undefined, ctx: ProviderContext) => Promise<Record<string, unknown>>;
|
|
23
|
-
readonly list?: (ctx: ProviderContext) => Promise<readonly
|
|
35
|
+
readonly list?: (sources: readonly ScanSource[], ctx: ProviderContext) => Promise<readonly ListedResource[]>;
|
|
24
36
|
readonly delete?: (inputs: ResolvedInputs, ctx: ProviderContext) => Promise<void>;
|
|
25
37
|
readonly restamp?: (oldId: string, inputs: ResolvedInputs, ctx: ProviderContext) => Promise<void>;
|
|
26
38
|
}
|
package/dist/provider.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAGjD,MAAM,WAAW,QAAQ;IACrB,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAIpD,QAAQ,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAGjD,MAAM,WAAW,QAAQ;IACrB,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAIpD,QAAQ,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAKpD,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;CAC/B;AAGD,MAAM,MAAM,UAAU,GAAG;IAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAK9G,MAAM,WAAW,UAAU;IACvB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;CACnC;AAMD,MAAM,WAAW,cAAc;IAC3B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;IAEhC,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;CAChC;AAED,MAAM,WAAW,eAAe;IAC5B,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC;IAC3D,QAAQ,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAExC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IAIpB,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;IAGvD,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;CAChC;AAID,MAAM,WAAW,QAAQ;IAKrB,QAAQ,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,cAAc,EAAE,GAAG,EAAE,eAAe,KAAK,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,CAAC;IAE/F,QAAQ,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,KAAK,UAAU,CAAC;IAE1E,QAAQ,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,GAAG,SAAS,EAAE,GAAG,EAAE,eAAe,KAAK,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAKnI,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,SAAS,UAAU,EAAE,EAAE,GAAG,EAAE,eAAe,KAAK,OAAO,CAAC,SAAS,cAAc,EAAE,CAAC,CAAC;IAM7G,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,cAAc,EAAE,GAAG,EAAE,eAAe,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IASlF,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,GAAG,EAAE,eAAe,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACrG;AAGD,MAAM,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fake.d.ts","sourceRoot":"","sources":["../../src/providers/fake.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,KAAK,EAAsB,SAAS,EAAE,MAAM,gBAAgB,CAAC;AACpE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAElD,UAAU,UAAU;IAChB,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;CACnC;AAID,MAAM,MAAM,SAAS,GAAG,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"fake.d.ts","sourceRoot":"","sources":["../../src/providers/fake.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,KAAK,EAAsB,SAAS,EAAE,MAAM,gBAAgB,CAAC;AACpE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAElD,UAAU,UAAU;IAChB,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;CACnC;AAID,MAAM,MAAM,SAAS,GAAG,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;AAkChD,eAAO,MAAM,mBAAmB,GAAI,QAAO,SAAqB,KAAG;IAAE,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAA;CAM5H,CAAC"}
|
package/dist/providers/fake.js
CHANGED
|
@@ -19,7 +19,10 @@ const fakeProvider = (type, world) => ({
|
|
|
19
19
|
world.set(ctx.id, { type, inputs });
|
|
20
20
|
return fakeOutputs(ctx.id, type);
|
|
21
21
|
},
|
|
22
|
-
list: async () => [...world].filter(([, entry]) => entry.type === type).map(([id]) => id),
|
|
22
|
+
list: async () => [...world].filter(([, entry]) => entry.type === type).map(([id, entry]) => ({ id, inputs: entry.inputs })),
|
|
23
|
+
delete: async (_inputs, ctx) => {
|
|
24
|
+
world.delete(ctx.id);
|
|
25
|
+
},
|
|
23
26
|
});
|
|
24
27
|
export const createFakeProviders = (world = new Map()) => {
|
|
25
28
|
const providers = {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fake.js","sourceRoot":"","sources":["../../src/providers/fake.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAe9C,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAmB,CAAC;AAI9D,MAAM,WAAW,GAAG,CAAC,EAAU,EAAE,IAAkB,EAA2B,EAAE;IAC5E,MAAM,OAAO,GAA4B,EAAE,CAAC;IAC5C,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QAC/B,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,cAAc,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,IAAI,EAAE,CAAC;IAC9G,CAAC;IACD,OAAO,OAAO,CAAC;AACnB,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,IAAkB,EAAE,KAAgB,EAAY,EAAE,CAAC,CAAC;IACtE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE;QACzB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;YACrB,OAAO,SAAS,CAAC;QACrB,CAAC;QACD,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,EAAqB,CAAC;IACrE,CAAC;IACD,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAChC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,EAAE;QACpC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;QACpC,OAAO,WAAW,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IACrC,CAAC;IACD,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"fake.js","sourceRoot":"","sources":["../../src/providers/fake.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAe9C,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAmB,CAAC;AAI9D,MAAM,WAAW,GAAG,CAAC,EAAU,EAAE,IAAkB,EAA2B,EAAE;IAC5E,MAAM,OAAO,GAA4B,EAAE,CAAC;IAC5C,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QAC/B,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,cAAc,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,IAAI,EAAE,CAAC;IAC9G,CAAC;IACD,OAAO,OAAO,CAAC;AACnB,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,IAAkB,EAAE,KAAgB,EAAY,EAAE,CAAC,CAAC;IACtE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE;QACzB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;YACrB,OAAO,SAAS,CAAC;QACrB,CAAC;QACD,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,EAAqB,CAAC;IACrE,CAAC;IACD,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAChC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,EAAE;QACpC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;QACpC,OAAO,WAAW,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IACrC,CAAC;IACD,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAC5H,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE;QAC3B,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACzB,CAAC;CACJ,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,QAAmB,IAAI,GAAG,EAAE,EAAgE,EAAE;IAC9H,MAAM,SAAS,GAAc,EAAE,CAAC;IAChC,KAAK,MAAM,IAAI,IAAI,cAAc,EAAE,CAAC;QAChC,SAAS,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAChD,CAAC;IACD,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;AAChC,CAAC,CAAC"}
|
package/dist/readiness.d.ts
CHANGED
|
@@ -1,7 +1,13 @@
|
|
|
1
1
|
export type ReadinessProbe = (url: string, expectedStatus: number) => Promise<boolean>;
|
|
2
2
|
export declare const parseDuration: (text: string) => number;
|
|
3
3
|
export declare const httpProbe: ReadinessProbe;
|
|
4
|
-
export declare
|
|
4
|
+
export declare class ReadinessTimeoutError extends Error {
|
|
5
|
+
readonly id: string;
|
|
6
|
+
readonly url: string;
|
|
7
|
+
readonly timeoutMs: number;
|
|
8
|
+
constructor(id: string, url: string, timeoutMs: number);
|
|
9
|
+
}
|
|
10
|
+
export declare const waitReady: (id: string, url: string, options: {
|
|
5
11
|
readonly status?: number;
|
|
6
12
|
readonly timeout?: string;
|
|
7
13
|
}, probe: ReadinessProbe, intervalMs?: number) => Promise<void>;
|
package/dist/readiness.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"readiness.d.ts","sourceRoot":"","sources":["../src/readiness.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"readiness.d.ts","sourceRoot":"","sources":["../src/readiness.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,cAAc,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;AAGvF,eAAO,MAAM,aAAa,GAAI,MAAM,MAAM,KAAG,MAM5C,CAAC;AAEF,eAAO,MAAM,SAAS,EAAE,cAYvB,CAAC;AAIF,qBAAa,qBAAsB,SAAQ,KAAK;IAExC,QAAQ,CAAC,EAAE,EAAE,MAAM;IACnB,QAAQ,CAAC,GAAG,EAAE,MAAM;IACpB,QAAQ,CAAC,SAAS,EAAE,MAAM;gBAFjB,EAAE,EAAE,MAAM,EACV,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,MAAM;CAKjC;AAID,eAAO,MAAM,SAAS,GAClB,IAAI,MAAM,EACV,KAAK,MAAM,EACX,SAAS;IAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,EAChE,OAAO,cAAc,EACrB,mBAAiB,KAClB,OAAO,CAAC,IAAI,CAad,CAAC"}
|
package/dist/readiness.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { setTimeout as sleep } from "node:timers/promises";
|
|
1
2
|
export const parseDuration = (text) => {
|
|
2
3
|
const match = /^(\d+)s$/.exec(text);
|
|
3
4
|
if (match === null) {
|
|
@@ -7,15 +8,26 @@ export const parseDuration = (text) => {
|
|
|
7
8
|
};
|
|
8
9
|
export const httpProbe = async (url, expectedStatus) => {
|
|
9
10
|
try {
|
|
10
|
-
const response = await fetch(url, { method: "GET" });
|
|
11
|
+
const response = await fetch(url, { method: "GET", signal: AbortSignal.timeout(10_000) });
|
|
11
12
|
return response.status === expectedStatus || response.status < 400;
|
|
12
13
|
}
|
|
13
14
|
catch {
|
|
14
15
|
return false;
|
|
15
16
|
}
|
|
16
17
|
};
|
|
17
|
-
|
|
18
|
-
|
|
18
|
+
export class ReadinessTimeoutError extends Error {
|
|
19
|
+
id;
|
|
20
|
+
url;
|
|
21
|
+
timeoutMs;
|
|
22
|
+
constructor(id, url, timeoutMs) {
|
|
23
|
+
super(`readiness check timed out after ${timeoutMs}ms for ${url} (resource "${id}")`);
|
|
24
|
+
this.id = id;
|
|
25
|
+
this.url = url;
|
|
26
|
+
this.timeoutMs = timeoutMs;
|
|
27
|
+
this.name = "ReadinessTimeoutError";
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
export const waitReady = async (id, url, options, probe, intervalMs = 1000) => {
|
|
19
31
|
const expected = options.status ?? 200;
|
|
20
32
|
const limit = options.timeout !== undefined ? parseDuration(options.timeout) : 60000;
|
|
21
33
|
const deadline = Date.now() + limit;
|
|
@@ -24,7 +36,7 @@ export const waitReady = async (url, options, probe, intervalMs = 1000) => {
|
|
|
24
36
|
return;
|
|
25
37
|
}
|
|
26
38
|
if (Date.now() >= deadline) {
|
|
27
|
-
throw new
|
|
39
|
+
throw new ReadinessTimeoutError(id, url, limit);
|
|
28
40
|
}
|
|
29
41
|
await sleep(intervalMs);
|
|
30
42
|
}
|
package/dist/readiness.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"readiness.js","sourceRoot":"","sources":["../src/readiness.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"readiness.js","sourceRoot":"","sources":["../src/readiness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,IAAI,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAK3D,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,IAAY,EAAU,EAAE;IAClD,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACpC,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CAAC,yBAAyB,IAAI,2BAA2B,CAAC,CAAC;IAC9E,CAAC;IACD,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;AACnC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAAmB,KAAK,EAAE,GAAG,EAAE,cAAc,EAAE,EAAE;IAMnE,IAAI,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC1F,OAAO,QAAQ,CAAC,MAAM,KAAK,cAAc,IAAI,QAAQ,CAAC,MAAM,GAAG,GAAG,CAAC;IACvE,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,KAAK,CAAC;IACjB,CAAC;AACL,CAAC,CAAC;AAIF,MAAM,OAAO,qBAAsB,SAAQ,KAAK;IAE/B;IACA;IACA;IAHb,YACa,EAAU,EACV,GAAW,EACX,SAAiB;QAE1B,KAAK,CAAC,mCAAmC,SAAS,UAAU,GAAG,eAAe,EAAE,IAAI,CAAC,CAAC;QAJ7E,OAAE,GAAF,EAAE,CAAQ;QACV,QAAG,GAAH,GAAG,CAAQ;QACX,cAAS,GAAT,SAAS,CAAQ;QAG1B,IAAI,CAAC,IAAI,GAAG,uBAAuB,CAAC;IACxC,CAAC;CACJ;AAID,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,EAC1B,EAAU,EACV,GAAW,EACX,OAAgE,EAChE,KAAqB,EACrB,UAAU,GAAG,IAAI,EACJ,EAAE;IACf,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,IAAI,GAAG,CAAC;IACvC,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IACrF,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;IACpC,SAAS,CAAC;QACN,IAAI,MAAM,KAAK,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC;YAC7B,OAAO;QACX,CAAC;QACD,IAAI,IAAI,CAAC,GAAG,EAAE,IAAI,QAAQ,EAAE,CAAC;YACzB,MAAM,IAAI,qBAAqB,CAAC,EAAE,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;QACpD,CAAC;QACD,MAAM,KAAK,CAAC,UAAU,CAAC,CAAC;IAC5B,CAAC;AACL,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apply.d.ts","sourceRoot":"","sources":["../../src/reconcile/apply.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAMzD,OAAO,KAAK,EAAU,YAAY,EAAE,YAAY,EAAQ,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"apply.d.ts","sourceRoot":"","sources":["../../src/reconcile/apply.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAMzD,OAAO,KAAK,EAAU,YAAY,EAAE,YAAY,EAAQ,MAAM,aAAa,CAAC;AAO5E,eAAO,MAAM,KAAK,GAAU,OAAO,iBAAiB,EAAE,QAAQ,YAAY,KAAG,OAAO,CAAC,YAAY,CAiEhG,CAAC"}
|
package/dist/reconcile/apply.js
CHANGED
|
@@ -1,10 +1,9 @@
|
|
|
1
|
-
import { linearize, refKey } from "@intentic/graph";
|
|
1
|
+
import { hashInputs, linearize, refKey } from "@intentic/graph";
|
|
2
2
|
import { httpProbe, waitReady } from "../readiness.js";
|
|
3
3
|
import { resolveInputs } from "../resolve-inputs.js";
|
|
4
4
|
import { createStore } from "../store.js";
|
|
5
|
-
import { collectOrphans } from "./orphans.js";
|
|
6
5
|
import { validateOutputs } from "./outputs-check.js";
|
|
7
|
-
import { makeContext, requireProvider } from "./reconcile.js";
|
|
6
|
+
import { decideDiff, makeContext, narratedRead, requireProvider } from "./reconcile.js";
|
|
8
7
|
export const apply = async (graph, config) => {
|
|
9
8
|
const env = config.env ?? process.env;
|
|
10
9
|
const log = config.log ?? console.log;
|
|
@@ -21,9 +20,9 @@ export const apply = async (graph, config) => {
|
|
|
21
20
|
const type = node.type;
|
|
22
21
|
emit({ kind: "node", phase: "apply", state: "start", id, type });
|
|
23
22
|
const provider = requireProvider(config.providers, type, id);
|
|
24
|
-
const ctx = makeContext(id, store, env, log);
|
|
23
|
+
const ctx = makeContext(id, store, env, log, hashInputs(node.inputs));
|
|
25
24
|
const inputs = resolveInputs(node.inputs, store, env, { lenient: false });
|
|
26
|
-
const observed = await provider
|
|
25
|
+
const observed = await narratedRead(provider, inputs, ctx, id, log);
|
|
27
26
|
let action;
|
|
28
27
|
let reason;
|
|
29
28
|
let produced;
|
|
@@ -32,7 +31,7 @@ export const apply = async (graph, config) => {
|
|
|
32
31
|
produced = await provider.apply(inputs, undefined, ctx);
|
|
33
32
|
}
|
|
34
33
|
else {
|
|
35
|
-
const result = provider
|
|
34
|
+
const result = decideDiff(provider, node, inputs, observed);
|
|
36
35
|
if (result.action === "update") {
|
|
37
36
|
action = "update";
|
|
38
37
|
reason = result.reason;
|
|
@@ -58,11 +57,10 @@ export const apply = async (graph, config) => {
|
|
|
58
57
|
...(node.readyWhen.timeout !== undefined ? { timeout: node.readyWhen.timeout } : {}),
|
|
59
58
|
};
|
|
60
59
|
emit({ kind: "readiness", state: "waiting", id, url });
|
|
61
|
-
await waitReady(url, options, probe);
|
|
60
|
+
await waitReady(id, url, options, probe);
|
|
62
61
|
emit({ kind: "readiness", state: "ready", id, url });
|
|
63
62
|
}
|
|
64
63
|
}
|
|
65
|
-
|
|
66
|
-
return { steps, outputs, orphans };
|
|
64
|
+
return { steps, outputs };
|
|
67
65
|
};
|
|
68
66
|
//# sourceMappingURL=apply.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apply.js","sourceRoot":"","sources":["../../src/reconcile/apply.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"apply.js","sourceRoot":"","sources":["../../src/reconcile/apply.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEhE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAKxF,MAAM,CAAC,MAAM,KAAK,GAAG,KAAK,EAAE,KAAwB,EAAE,MAAoB,EAAyB,EAAE;IACjG,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IACtC,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IACtC,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,IAAI,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IAC1C,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI,SAAS,CAAC;IACxC,MAAM,KAAK,GAAG,WAAW,EAAE,CAAC;IAC5B,MAAM,KAAK,GAAW,EAAE,CAAC;IACzB,MAAM,OAAO,GAAsD,EAAE,CAAC;IAEtE,KAAK,MAAM,EAAE,IAAI,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;QAChC,MAAM,IAAI,GAAG,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QACjC,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACrB,SAAS;QACb,CAAC;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,IAAoB,CAAC;QACvC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;QACjE,MAAM,QAAQ,GAAG,eAAe,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;QAC7D,MAAM,GAAG,GAAG,WAAW,CAAC,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QACtE,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;QAC1E,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;QAEpE,IAAI,MAAc,CAAC;QACnB,IAAI,MAA0B,CAAC;QAC/B,IAAI,QAAiC,CAAC;QACtC,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YACzB,MAAM,GAAG,QAAQ,CAAC;YAClB,QAAQ,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;QAC5D,CAAC;aAAM,CAAC;YACJ,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;YAC5D,IAAI,MAAM,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;gBAC7B,MAAM,GAAG,QAAQ,CAAC;gBAClB,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;gBACvB,QAAQ,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;YAC3D,CAAC;iBAAM,CAAC;gBACJ,MAAM,GAAG,MAAM,CAAC;gBAChB,QAAQ,GAAG,EAAE,GAAG,QAAQ,CAAC,OAAO,EAAE,CAAC;YACvC,CAAC;QACL,CAAC;QAED,eAAe,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;QACpC,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QAClB,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YACnD,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC;QACvC,CAAC;QACD,OAAO,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC;QACvB,KAAK,CAAC,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;QACvF,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QAKrH,IAAI,MAAM,KAAK,MAAM,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;YACpD,MAAM,GAAG,GACL,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAE,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAY,CAAC;YACrI,MAAM,OAAO,GAAG;gBACZ,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACjF,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACvF,CAAC;YACF,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;YACvD,MAAM,SAAS,CAAC,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;YACzC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;QACzD,CAAC;IACL,CAAC;IAED,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;AAC9B,CAAC,CAAC"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import type { DesiredStateGraph } from "@intentic/graph";
|
|
2
|
-
import type {
|
|
3
|
-
|
|
4
|
-
export declare const collectOrphans: (graph: DesiredStateGraph, providers: Providers, ctx: ProviderContext, emit: (event: EngineEvent) => void) => Promise<Orphan[]>;
|
|
2
|
+
import type { EngineConfig, OrphanEntry } from "../types.js";
|
|
3
|
+
export declare const collectOrphans: (graph: DesiredStateGraph, config: EngineConfig) => Promise<OrphanEntry[]>;
|
|
5
4
|
//# sourceMappingURL=orphans.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orphans.d.ts","sourceRoot":"","sources":["../../src/reconcile/orphans.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"orphans.d.ts","sourceRoot":"","sources":["../../src/reconcile/orphans.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAKzD,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAS7D,eAAO,MAAM,cAAc,GAAU,OAAO,iBAAiB,EAAE,QAAQ,YAAY,KAAG,OAAO,CAAC,WAAW,EAAE,CAiC1G,CAAC"}
|
|
@@ -1,14 +1,33 @@
|
|
|
1
|
-
|
|
1
|
+
import { resolveInputs } from "../resolve-inputs.js";
|
|
2
|
+
import { createStore } from "../store.js";
|
|
3
|
+
import { makeContext } from "./reconcile.js";
|
|
4
|
+
export const collectOrphans = async (graph, config) => {
|
|
5
|
+
const env = config.env ?? process.env;
|
|
6
|
+
const log = config.log ?? console.log;
|
|
7
|
+
const emit = config.onEvent ?? (() => { });
|
|
8
|
+
const store = createStore();
|
|
9
|
+
const sources = Object.values(graph.resources).map((node) => ({
|
|
10
|
+
id: node.id,
|
|
11
|
+
type: node.type,
|
|
12
|
+
inputs: resolveInputs(node.inputs, store, env, { lenient: true }),
|
|
13
|
+
}));
|
|
14
|
+
const ctx = makeContext("", store, env, log);
|
|
2
15
|
const known = new Set(Object.keys(graph.resources));
|
|
3
16
|
const orphans = [];
|
|
4
|
-
for (const [type, provider] of Object.entries(providers)) {
|
|
17
|
+
for (const [type, provider] of Object.entries(config.providers)) {
|
|
5
18
|
if (provider?.list === undefined) {
|
|
6
19
|
continue;
|
|
7
20
|
}
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
21
|
+
log(`orphan scan: ${type}`);
|
|
22
|
+
for (const listed of await provider.list(sources, ctx)) {
|
|
23
|
+
if (!known.has(listed.id)) {
|
|
24
|
+
emit({ kind: "orphan", id: listed.id, type: type });
|
|
25
|
+
orphans.push({
|
|
26
|
+
id: listed.id,
|
|
27
|
+
type: type,
|
|
28
|
+
inputs: listed.inputs,
|
|
29
|
+
...(listed.protected === true ? { protected: true } : {}),
|
|
30
|
+
});
|
|
12
31
|
}
|
|
13
32
|
}
|
|
14
33
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orphans.js","sourceRoot":"","sources":["../../src/reconcile/orphans.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"orphans.js","sourceRoot":"","sources":["../../src/reconcile/orphans.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAQ7C,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EAAE,KAAwB,EAAE,MAAoB,EAA0B,EAAE;IAC3G,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IACtC,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IACtC,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,IAAI,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IAC1C,MAAM,KAAK,GAAG,WAAW,EAAE,CAAC;IAC5B,MAAM,OAAO,GAAiB,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACxE,EAAE,EAAE,IAAI,CAAC,EAAE;QACX,IAAI,EAAE,IAAI,CAAC,IAAoB;QAC/B,MAAM,EAAE,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;KACpE,CAAC,CAAC,CAAC;IACJ,MAAM,GAAG,GAAG,WAAW,CAAC,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IAC7C,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;IACpD,MAAM,OAAO,GAAkB,EAAE,CAAC;IAClC,KAAK,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;QAC9D,IAAI,QAAQ,EAAE,IAAI,KAAK,SAAS,EAAE,CAAC;YAC/B,SAAS;QACb,CAAC;QAGD,GAAG,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAC;QAC5B,KAAK,MAAM,MAAM,IAAI,MAAM,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE,CAAC;YACrD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC;gBACxB,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE,IAAoB,EAAE,CAAC,CAAC;gBACpE,OAAO,CAAC,IAAI,CAAC;oBACT,EAAE,EAAE,MAAM,CAAC,EAAE;oBACb,IAAI,EAAE,IAAoB;oBAC1B,MAAM,EAAE,MAAM,CAAC,MAAM;oBACrB,GAAG,CAAC,MAAM,CAAC,SAAS,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBAC5D,CAAC,CAAC;YACP,CAAC;QACL,CAAC;IACL,CAAC;IACD,OAAO,OAAO,CAAC;AACnB,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan.d.ts","sourceRoot":"","sources":["../../src/reconcile/plan.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAMzD,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAQ,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"plan.d.ts","sourceRoot":"","sources":["../../src/reconcile/plan.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAMzD,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAQ,MAAM,aAAa,CAAC;AAOnE,eAAO,MAAM,IAAI,GAAU,OAAO,iBAAiB,EAAE,QAAQ,YAAY,KAAG,OAAO,CAAC,WAAW,CAgE9F,CAAC"}
|
package/dist/reconcile/plan.js
CHANGED
|
@@ -2,8 +2,7 @@ import { linearize, refKey } from "@intentic/graph";
|
|
|
2
2
|
import { OUTPUTS } from "@intentic/resources";
|
|
3
3
|
import { resolveInputs } from "../resolve-inputs.js";
|
|
4
4
|
import { createStore, PENDING } from "../store.js";
|
|
5
|
-
import {
|
|
6
|
-
import { makeContext, requireProvider } from "./reconcile.js";
|
|
5
|
+
import { decideDiff, makeContext, narratedRead, requireProvider } from "./reconcile.js";
|
|
7
6
|
export const plan = async (graph, config) => {
|
|
8
7
|
const env = config.env ?? process.env;
|
|
9
8
|
const log = config.log ?? console.log;
|
|
@@ -18,8 +17,9 @@ export const plan = async (graph, config) => {
|
|
|
18
17
|
const type = node.type;
|
|
19
18
|
const provider = requireProvider(config.providers, type, id);
|
|
20
19
|
const ctx = makeContext(id, store, env, log);
|
|
20
|
+
emit({ kind: "node", phase: "plan", state: "start", id, type });
|
|
21
21
|
const inputs = resolveInputs(node.inputs, store, env, { lenient: true });
|
|
22
|
-
const observed = await provider
|
|
22
|
+
const observed = await narratedRead(provider, inputs, ctx, id, log);
|
|
23
23
|
store.set(id, id);
|
|
24
24
|
if (observed === undefined) {
|
|
25
25
|
steps.push({ id, type, action: "create" });
|
|
@@ -42,7 +42,7 @@ export const plan = async (graph, config) => {
|
|
|
42
42
|
}
|
|
43
43
|
continue;
|
|
44
44
|
}
|
|
45
|
-
const result = provider
|
|
45
|
+
const result = decideDiff(provider, node, inputs, observed);
|
|
46
46
|
steps.push(result.action === "update" ? { id, type, action: "update", reason: result.reason } : { id, type, action: "noop" });
|
|
47
47
|
emit(result.action === "update"
|
|
48
48
|
? { kind: "node", phase: "plan", state: "done", id, type, action: "update", reason: result.reason }
|
|
@@ -54,7 +54,6 @@ export const plan = async (graph, config) => {
|
|
|
54
54
|
}
|
|
55
55
|
}
|
|
56
56
|
}
|
|
57
|
-
|
|
58
|
-
return { steps, orphans };
|
|
57
|
+
return { steps };
|
|
59
58
|
};
|
|
60
59
|
//# sourceMappingURL=plan.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan.js","sourceRoot":"","sources":["../../src/reconcile/plan.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEpD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEnD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"plan.js","sourceRoot":"","sources":["../../src/reconcile/plan.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { DesiredStateGraph } from "@intentic/graph";
|
|
2
|
-
import type { EngineConfig, PruneOutcome } from "../types.js";
|
|
2
|
+
import type { EngineConfig, OrphanEntry, PruneOutcome } from "../types.js";
|
|
3
3
|
export declare const prune: (previous: DesiredStateGraph, current: DesiredStateGraph, config: EngineConfig) => Promise<PruneOutcome>;
|
|
4
|
+
export declare const pruneOrphans: (orphans: readonly OrphanEntry[], config: EngineConfig) => Promise<PruneOutcome>;
|
|
4
5
|
//# sourceMappingURL=prune.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prune.d.ts","sourceRoot":"","sources":["../../src/reconcile/prune.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,
|
|
1
|
+
{"version":3,"file":"prune.d.ts","sourceRoot":"","sources":["../../src/reconcile/prune.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAgB,MAAM,iBAAiB,CAAC;AAMvE,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAkB,YAAY,EAAE,MAAM,aAAa,CAAC;AAgD3F,eAAO,MAAM,KAAK,GAAU,UAAU,iBAAiB,EAAE,SAAS,iBAAiB,EAAE,QAAQ,YAAY,KAAG,OAAO,CAAC,YAAY,CA4C/H,CAAC;AAQF,eAAO,MAAM,YAAY,GAAU,SAAS,SAAS,WAAW,EAAE,EAAE,QAAQ,YAAY,KAAG,OAAO,CAAC,YAAY,CAwB9G,CAAC"}
|
package/dist/reconcile/prune.js
CHANGED
|
@@ -3,33 +3,35 @@ import { OUTPUTS } from "@intentic/resources";
|
|
|
3
3
|
import { resolveInputs } from "../resolve-inputs.js";
|
|
4
4
|
import { createStore, PENDING } from "../store.js";
|
|
5
5
|
import { makeContext, requireProvider } from "./reconcile.js";
|
|
6
|
-
const
|
|
6
|
+
const seedOutputs = async (nodes, config, store) => {
|
|
7
7
|
const env = config.env ?? process.env;
|
|
8
8
|
const log = config.log ?? console.log;
|
|
9
|
-
for (const
|
|
10
|
-
|
|
11
|
-
if (node === undefined) {
|
|
9
|
+
for (const node of nodes) {
|
|
10
|
+
if (store.has(node.id)) {
|
|
12
11
|
continue;
|
|
13
12
|
}
|
|
14
13
|
const type = node.type;
|
|
15
|
-
const provider = requireProvider(config.providers, type, id);
|
|
16
|
-
const ctx = makeContext(id, store, env, log);
|
|
14
|
+
const provider = requireProvider(config.providers, type, node.id);
|
|
15
|
+
const ctx = makeContext(node.id, store, env, log);
|
|
17
16
|
const inputs = resolveInputs(node.inputs, store, env, { lenient: true });
|
|
18
17
|
const observed = await provider.read(inputs, ctx);
|
|
19
|
-
store.set(id, id);
|
|
18
|
+
store.set(node.id, node.id);
|
|
20
19
|
if (observed === undefined) {
|
|
21
20
|
for (const name of OUTPUTS[type]) {
|
|
22
|
-
store.set(refKey(id, name), PENDING);
|
|
21
|
+
store.set(refKey(node.id, name), PENDING);
|
|
23
22
|
}
|
|
24
23
|
continue;
|
|
25
24
|
}
|
|
26
25
|
for (const [name, value] of Object.entries(observed.outputs)) {
|
|
27
26
|
if (OUTPUTS[type].includes(name)) {
|
|
28
|
-
store.set(refKey(id, name), value);
|
|
27
|
+
store.set(refKey(node.id, name), value);
|
|
29
28
|
}
|
|
30
29
|
}
|
|
31
30
|
}
|
|
32
31
|
};
|
|
32
|
+
const inOrder = (graph) => linearize(graph)
|
|
33
|
+
.map((id) => graph.resources[id])
|
|
34
|
+
.filter((node) => node !== undefined);
|
|
33
35
|
export const prune = async (previous, current, config) => {
|
|
34
36
|
const env = config.env ?? process.env;
|
|
35
37
|
const log = config.log ?? console.log;
|
|
@@ -40,7 +42,7 @@ export const prune = async (previous, current, config) => {
|
|
|
40
42
|
return { deleted: [], skipped: [] };
|
|
41
43
|
}
|
|
42
44
|
const store = createStore();
|
|
43
|
-
await
|
|
45
|
+
await seedOutputs([...inOrder(current), ...inOrder(previous)], config, store);
|
|
44
46
|
const deleted = [];
|
|
45
47
|
const skipped = [];
|
|
46
48
|
for (const id of [...linearize(previous)].toReversed()) {
|
|
@@ -53,8 +55,13 @@ export const prune = async (previous, current, config) => {
|
|
|
53
55
|
}
|
|
54
56
|
const type = node.type;
|
|
55
57
|
const provider = requireProvider(config.providers, type, id);
|
|
58
|
+
if (node.inputs["protect"] === true) {
|
|
59
|
+
emit({ kind: "prune", state: "skipped", id, type, reason: "protected" });
|
|
60
|
+
skipped.push({ id, type });
|
|
61
|
+
continue;
|
|
62
|
+
}
|
|
56
63
|
if (provider.delete === undefined) {
|
|
57
|
-
emit({ kind: "prune", state: "skipped", id, type });
|
|
64
|
+
emit({ kind: "prune", state: "skipped", id, type, reason: "no-delete" });
|
|
58
65
|
skipped.push({ id, type });
|
|
59
66
|
continue;
|
|
60
67
|
}
|
|
@@ -66,4 +73,29 @@ export const prune = async (previous, current, config) => {
|
|
|
66
73
|
}
|
|
67
74
|
return { deleted, skipped };
|
|
68
75
|
};
|
|
76
|
+
export const pruneOrphans = async (orphans, config) => {
|
|
77
|
+
const env = config.env ?? process.env;
|
|
78
|
+
const log = config.log ?? console.log;
|
|
79
|
+
const emit = config.onEvent ?? (() => { });
|
|
80
|
+
const deleted = [];
|
|
81
|
+
const skipped = [];
|
|
82
|
+
for (const orphan of orphans) {
|
|
83
|
+
const provider = requireProvider(config.providers, orphan.type, orphan.id);
|
|
84
|
+
if (orphan.protected === true) {
|
|
85
|
+
emit({ kind: "prune", state: "skipped", id: orphan.id, type: orphan.type, reason: "protected" });
|
|
86
|
+
skipped.push({ id: orphan.id, type: orphan.type });
|
|
87
|
+
continue;
|
|
88
|
+
}
|
|
89
|
+
if (provider.delete === undefined) {
|
|
90
|
+
emit({ kind: "prune", state: "skipped", id: orphan.id, type: orphan.type, reason: "no-delete" });
|
|
91
|
+
skipped.push({ id: orphan.id, type: orphan.type });
|
|
92
|
+
continue;
|
|
93
|
+
}
|
|
94
|
+
const ctx = makeContext(orphan.id, createStore(), env, log);
|
|
95
|
+
await provider.delete(orphan.inputs, ctx);
|
|
96
|
+
emit({ kind: "prune", state: "deleted", id: orphan.id, type: orphan.type });
|
|
97
|
+
deleted.push({ id: orphan.id, type: orphan.type });
|
|
98
|
+
}
|
|
99
|
+
return { deleted, skipped };
|
|
100
|
+
};
|
|
69
101
|
//# sourceMappingURL=prune.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prune.js","sourceRoot":"","sources":["../../src/reconcile/prune.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEpD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAoB,OAAO,EAAE,MAAM,aAAa,CAAC;AAErE,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"prune.js","sourceRoot":"","sources":["../../src/reconcile/prune.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,10 @@
|
|
|
1
|
+
import type { ResourceNode } from "@intentic/graph";
|
|
1
2
|
import type { ResourceType } from "@intentic/resources";
|
|
2
|
-
import type { Provider, ProviderContext, Providers } from "../provider.js";
|
|
3
|
+
import type { DiffResult, Observed, Provider, ProviderContext, Providers } from "../provider.js";
|
|
3
4
|
import type { OutputStore } from "../store.js";
|
|
5
|
+
import type { ResolvedInputs } from "../types.js";
|
|
4
6
|
export declare const requireProvider: (providers: Providers, type: ResourceType, id: string) => Provider;
|
|
5
|
-
export declare const makeContext: (id: string, store: OutputStore, env: Readonly<Record<string, string | undefined>>, log: (message: string) => void) => ProviderContext;
|
|
7
|
+
export declare const makeContext: (id: string, store: OutputStore, env: Readonly<Record<string, string | undefined>>, log: (message: string) => void, inputsHash?: string) => ProviderContext;
|
|
8
|
+
export declare const narratedRead: (provider: Provider, inputs: ResolvedInputs, ctx: ProviderContext, id: string, log: (message: string) => void) => Promise<Observed | undefined>;
|
|
9
|
+
export declare const decideDiff: (provider: Provider, node: ResourceNode, inputs: ResolvedInputs, observed: Observed) => DiffResult;
|
|
6
10
|
//# sourceMappingURL=reconcile.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reconcile.d.ts","sourceRoot":"","sources":["../../src/reconcile/reconcile.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"reconcile.d.ts","sourceRoot":"","sources":["../../src/reconcile/reconcile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AACjG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAElD,eAAO,MAAM,eAAe,GAAI,WAAW,SAAS,EAAE,MAAM,YAAY,EAAE,IAAI,MAAM,KAAG,QAMtF,CAAC;AAEF,eAAO,MAAM,WAAW,GACpB,IAAI,MAAM,EACV,OAAO,WAAW,EAClB,KAAK,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC,EACjD,KAAK,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,EAC9B,aAAa,MAAM,KACpB,eAMD,CAAC;AASH,eAAO,MAAM,YAAY,GACrB,UAAU,QAAQ,EAClB,QAAQ,cAAc,EACtB,KAAK,eAAe,EACpB,IAAI,MAAM,EACV,KAAK,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,KAC/B,OAAO,CAAC,QAAQ,GAAG,SAAS,CAS9B,CAAC;AAMF,eAAO,MAAM,UAAU,GAAI,UAAU,QAAQ,EAAE,MAAM,YAAY,EAAE,QAAQ,cAAc,EAAE,UAAU,QAAQ,KAAG,UAGvE,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { refKey } from "@intentic/graph";
|
|
1
|
+
import { hashInputs, refKey } from "@intentic/graph";
|
|
2
2
|
export const requireProvider = (providers, type, id) => {
|
|
3
3
|
const provider = providers[type];
|
|
4
4
|
if (provider === undefined) {
|
|
@@ -6,10 +6,26 @@ export const requireProvider = (providers, type, id) => {
|
|
|
6
6
|
}
|
|
7
7
|
return provider;
|
|
8
8
|
};
|
|
9
|
-
export const makeContext = (id, store, env, log) => ({
|
|
9
|
+
export const makeContext = (id, store, env, log, inputsHash) => ({
|
|
10
10
|
env,
|
|
11
11
|
log,
|
|
12
12
|
id,
|
|
13
13
|
output: (depId, name) => store.get(refKey(depId, name), { lenient: false }),
|
|
14
|
+
...(inputsHash !== undefined ? { inputsHash } : {}),
|
|
14
15
|
});
|
|
16
|
+
const READ_NARRATE_INTERVAL_MS = 15_000;
|
|
17
|
+
export const narratedRead = async (provider, inputs, ctx, id, log) => {
|
|
18
|
+
const started = Date.now();
|
|
19
|
+
const narrator = setInterval(() => log(`still reading ${id} (${Math.round((Date.now() - started) / 1000)}s)`), READ_NARRATE_INTERVAL_MS);
|
|
20
|
+
narrator.unref();
|
|
21
|
+
try {
|
|
22
|
+
return await provider.read(inputs, ctx);
|
|
23
|
+
}
|
|
24
|
+
finally {
|
|
25
|
+
clearInterval(narrator);
|
|
26
|
+
}
|
|
27
|
+
};
|
|
28
|
+
export const decideDiff = (provider, node, inputs, observed) => observed.stampHash !== undefined && observed.stampHash !== hashInputs(node.inputs)
|
|
29
|
+
? { action: "update", reason: "authored inputs changed since last stamped apply" }
|
|
30
|
+
: provider.diff(inputs, observed);
|
|
15
31
|
//# sourceMappingURL=reconcile.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reconcile.js","sourceRoot":"","sources":["../../src/reconcile/reconcile.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"reconcile.js","sourceRoot":"","sources":["../../src/reconcile/reconcile.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAMrD,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,SAAoB,EAAE,IAAkB,EAAE,EAAU,EAAY,EAAE;IAC9F,MAAM,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;IACjC,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CAAC,oCAAoC,IAAI,gBAAgB,EAAE,IAAI,CAAC,CAAC;IACpF,CAAC;IACD,OAAO,QAAQ,CAAC;AACpB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAG,CACvB,EAAU,EACV,KAAkB,EAClB,GAAiD,EACjD,GAA8B,EAC9B,UAAmB,EACJ,EAAE,CAAC,CAAC;IACnB,GAAG;IACH,GAAG;IACH,EAAE;IACF,MAAM,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAC3E,GAAG,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;CACtD,CAAC,CAAC;AAGH,MAAM,wBAAwB,GAAG,MAAM,CAAC;AAMxC,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAC7B,QAAkB,EAClB,MAAsB,EACtB,GAAoB,EACpB,EAAU,EACV,GAA8B,EACD,EAAE;IAC/B,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC3B,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,iBAAiB,EAAE,KAAK,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,wBAAwB,CAAC,CAAC;IACzI,QAAQ,CAAC,KAAK,EAAE,CAAC;IACjB,IAAI,CAAC;QACD,OAAO,MAAM,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5C,CAAC;YAAS,CAAC;QACP,aAAa,CAAC,QAAQ,CAAC,CAAC;IAC5B,CAAC;AACL,CAAC,CAAC;AAMF,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,QAAkB,EAAE,IAAkB,EAAE,MAAsB,EAAE,QAAkB,EAAc,EAAE,CACzH,QAAQ,CAAC,SAAS,KAAK,SAAS,IAAI,QAAQ,CAAC,SAAS,KAAK,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC;IAC9E,CAAC,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,kDAAkD,EAAE;IAClF,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC"}
|
package/dist/types.d.ts
CHANGED
|
@@ -13,14 +13,16 @@ export interface Orphan {
|
|
|
13
13
|
readonly id: string;
|
|
14
14
|
readonly type: ResourceType;
|
|
15
15
|
}
|
|
16
|
+
export interface OrphanEntry extends Orphan {
|
|
17
|
+
readonly inputs: Readonly<Record<string, unknown>>;
|
|
18
|
+
readonly protected?: boolean;
|
|
19
|
+
}
|
|
16
20
|
export interface PlanOutcome {
|
|
17
21
|
readonly steps: readonly Step[];
|
|
18
|
-
readonly orphans: readonly Orphan[];
|
|
19
22
|
}
|
|
20
23
|
export interface ApplyOutcome {
|
|
21
24
|
readonly steps: readonly Step[];
|
|
22
25
|
readonly outputs: Readonly<Record<string, Readonly<Record<string, unknown>>>>;
|
|
23
|
-
readonly orphans: readonly Orphan[];
|
|
24
26
|
}
|
|
25
27
|
export interface PrunedResource {
|
|
26
28
|
readonly id: string;
|
|
@@ -52,6 +54,7 @@ export type EngineEvent = {
|
|
|
52
54
|
readonly state: "deleted" | "skipped";
|
|
53
55
|
readonly id: string;
|
|
54
56
|
readonly type: ResourceType;
|
|
57
|
+
readonly reason?: "no-delete" | "protected";
|
|
55
58
|
} | {
|
|
56
59
|
readonly kind: "orphan";
|
|
57
60
|
readonly id: string;
|
package/dist/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAIrD,MAAM,MAAM,cAAc,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAE/D,MAAM,MAAM,MAAM,GAAG,QAAQ,GAAG,QAAQ,GAAG,MAAM,CAAC;AAElD,MAAM,WAAW,IAAI;IACjB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,MAAM;IACnB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC;CAC/B;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@intentic/engine",
|
|
3
|
-
"version": "1.
|
|
4
|
-
"description": "",
|
|
3
|
+
"version": "1.126.0",
|
|
4
|
+
"description": "Stateless reconcile engine: plan/apply, the Provider SPI, and the reconcile loop.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"repository": {
|
|
8
8
|
"type": "git",
|
|
9
|
-
"url": "git+https://
|
|
9
|
+
"url": "git+https://gitlab.com/radarsu/intentic.git",
|
|
10
10
|
"directory": "_libs/engine"
|
|
11
11
|
},
|
|
12
12
|
"files": [
|
|
@@ -31,15 +31,15 @@
|
|
|
31
31
|
},
|
|
32
32
|
"dependencies": {
|
|
33
33
|
"tslib": "2.8.1",
|
|
34
|
-
"@intentic/
|
|
35
|
-
"@intentic/
|
|
34
|
+
"@intentic/graph": "1.126.0",
|
|
35
|
+
"@intentic/resources": "1.126.0"
|
|
36
36
|
},
|
|
37
37
|
"devDependencies": {
|
|
38
38
|
"@types/node": "24.13.2",
|
|
39
39
|
"typescript": "5.9.3",
|
|
40
40
|
"vitest": "4.1.9",
|
|
41
|
-
"@intentic/
|
|
42
|
-
"@intentic/
|
|
41
|
+
"@intentic/tsconfig": "0.0.0",
|
|
42
|
+
"@intentic/sdk": "1.126.0"
|
|
43
43
|
},
|
|
44
44
|
"scripts": {
|
|
45
45
|
"build": "tsc",
|