okengine 0.10.1 → 0.10.2
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/README.md +1 -1
- package/package.json +1 -1
- package/site/content/docs/elements/clock.mdx +2 -2
- package/site/content/docs/elements/flow.mdx +10 -10
- package/site/content/docs/elements/gate.mdx +4 -4
- package/site/content/docs/elements/signal.mdx +4 -7
- package/site/content/docs/elements/store.mdx +1 -1
- package/site/content/docs/elements/vault.mdx +1 -1
- package/site/content/docs/get-started/basic-usage.mdx +1 -3
- package/site/content/docs/get-started/introduction.mdx +1 -1
- package/site/content/docs/reference/cli.md +12 -12
- package/site/content/docs/reference/fx.mdx +3 -4
- package/src/auth/auth.test.ts +1 -2
- package/src/auth/bindings.ts +5 -15
- package/src/auth/gate-auth.test.ts +2 -2
- package/src/cli/ai-setup/apply.ts +13 -0
- package/src/cli/build.test.ts +67 -0
- package/src/cli/build.ts +34 -0
- package/src/cli/db-seed.ts +1 -1
- package/src/cli/dev-controls.test.ts +43 -48
- package/src/cli/dev-controls.ts +23 -172
- package/src/cli/dev.test.ts +2 -4
- package/src/cli/dev.ts +37 -16
- package/src/client/notes-contract.test.ts +3 -4
- package/src/compiler/aot.test.ts +1 -2
- package/src/compiler/extract.test.ts +76 -21
- package/src/compiler/extract.ts +3 -3
- package/src/compiler/fixtures/raw/raw-unannotated.ts +2 -4
- package/src/compiler/fixtures/skyport/src/flows/bookings/index.ts +4 -8
- package/src/compiler/fixtures/skyport/src/flows/payments/index.ts +1 -2
- package/src/compiler/fixtures/skyport/src/flows/support/index.ts +1 -2
- package/src/compiler/fixtures/skyport.expected.json +3 -3
- package/src/compiler/fixtures/triggers/five-triggers.ts +5 -10
- package/src/compiler/generate-adopt.test.ts +85 -0
- package/src/compiler/generate-adopt.ts +85 -0
- package/src/console/server/dry-run.audit.test.ts +2 -2
- package/src/console/server/flows.ts +50 -150
- package/src/docker/compose.ts +13 -3
- package/src/docker/recipes/llama-cpp.ts +10 -1
- package/src/docker/stack-id.ts +1 -0
- package/src/elements/channel/declare.ts +27 -1
- package/src/elements/clock/chaos-child.ts +3 -6
- package/src/elements/clock/chaos.test.ts +1 -2
- package/src/elements/clock.test.ts +2 -4
- package/src/elements/signal/declare.ts +25 -1
- package/src/elements/store/declare.ts +27 -1
- package/src/elements/store/resource.ts +6 -11
- package/src/elements/store/upsert-app.test.ts +1 -2
- package/src/elements/vault/declare.ts +29 -1
- package/src/kernel/adopt-barrel-fresh.test.ts +103 -0
- package/src/kernel/app.ts +66 -9
- package/src/kernel/auto-registry.test.ts +198 -0
- package/src/kernel/boot-bind/honor-config.test.ts +5 -5
- package/src/kernel/boot.test.ts +19 -15
- package/src/kernel/boot.ts +81 -1
- package/src/kernel/call.test.ts +5 -10
- package/src/kernel/compensate.test.ts +3 -6
- package/src/kernel/concurrency.test.ts +3 -5
- package/src/kernel/correlation.test.ts +4 -8
- package/src/kernel/edge.test.ts +1 -1
- package/src/kernel/effects-stamping.test.ts +4 -7
- package/src/kernel/element-registries.ts +27 -0
- package/src/kernel/errors.ts +11 -0
- package/src/kernel/flow.test.ts +8 -15
- package/src/kernel/flow.ts +12 -14
- package/src/kernel/hook-timing.test.ts +2 -2
- package/src/kernel/hooks.test.ts +5 -10
- package/src/kernel/horizontal-child.ts +5 -10
- package/src/kernel/journal-boot.test.ts +2 -4
- package/src/kernel/pipeline.test.ts +6 -12
- package/src/kernel/plugin/capabilities.test.ts +1 -1
- package/src/kernel/plugin/decorate.test.ts +3 -8
- package/src/kernel/plugin/scoping.test.ts +6 -16
- package/src/kernel/plugin-elements.test.ts +1 -1
- package/src/kernel/plugin-needs.test.ts +1 -1
- package/src/kernel/ready.test.ts +1 -2
- package/src/kernel/registry-isolation.test.ts +5 -5
- package/src/kernel/triggers.ts +1 -1
- package/src/plugins/anonymous.ts +1 -3
- package/src/plugins/compression.test.ts +6 -8
- package/src/plugins/config-source.test.ts +1 -1
- package/src/plugins/config-source.ts +1 -2
- package/src/plugins/cors.test.ts +10 -10
- package/src/plugins/csrf.test.ts +2 -2
- package/src/plugins/headers.test.ts +14 -15
- package/src/plugins/ip-allowlist.test.ts +9 -9
- package/src/plugins/magic-link.ts +2 -6
- package/src/plugins/maintenance-mode.test.ts +6 -6
- package/src/plugins/otp.ts +5 -15
- package/src/plugins/passkey.ts +4 -12
- package/src/plugins/two-factor.ts +3 -9
- package/src/plugins/username.ts +2 -6
- package/src/release/measure.ts +1 -1
- package/src/runs/runs.test.ts +3 -5
- package/src/runtime/serve.test.ts +2 -4
- package/src/test/create-test-app.test.ts +3 -7
- package/src/test/provisions.integration.test.ts +4 -9
- package/src/test/reset-element-registries.ts +31 -0
|
@@ -173,8 +173,7 @@ describe("chaos — SIGKILL durable mid-step", () => {
|
|
|
173
173
|
|
|
174
174
|
const calls: string[] = [];
|
|
175
175
|
const journalStore = createFileJournalStore(journalPath);
|
|
176
|
-
const charge = flow({
|
|
177
|
-
name: "chaos.charge",
|
|
176
|
+
const charge = flow("chaos.charge", {
|
|
178
177
|
durable: true,
|
|
179
178
|
do: async (_input, fx) => {
|
|
180
179
|
const intent = await fx.step("create-intent", () => {
|
|
@@ -67,8 +67,7 @@ describe("durable journal", () => {
|
|
|
67
67
|
const tt = createTimeTravel(0);
|
|
68
68
|
let crashAfterFirstStep = true;
|
|
69
69
|
|
|
70
|
-
const charge = flow({
|
|
71
|
-
name: "payments.charge",
|
|
70
|
+
const charge = flow("payments.charge", {
|
|
72
71
|
durable: true,
|
|
73
72
|
do: async (_input, fx) => {
|
|
74
73
|
const intent = await fx.step("create-intent", () => {
|
|
@@ -118,8 +117,7 @@ describe("durable journal", () => {
|
|
|
118
117
|
const tt = createTimeTravel(0);
|
|
119
118
|
|
|
120
119
|
try {
|
|
121
|
-
const sleepy = flow({
|
|
122
|
-
name: "trial.wait",
|
|
120
|
+
const sleepy = flow("trial.wait", {
|
|
123
121
|
durable: true,
|
|
124
122
|
do: async (_input, fx) => {
|
|
125
123
|
await fx.step("start", () => "begun");
|
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
*/
|
|
7
7
|
|
|
8
8
|
import type { SignalDelivery } from "../../manifest/types.ts";
|
|
9
|
+
import { signalRegistry } from "../../kernel/element-registries.ts";
|
|
9
10
|
|
|
10
11
|
/** Options for {@link signal}. */
|
|
11
12
|
export interface SignalOptions {
|
|
@@ -54,6 +55,27 @@ export interface SignalDecl<T = unknown> {
|
|
|
54
55
|
readonly _payload?: T;
|
|
55
56
|
}
|
|
56
57
|
|
|
58
|
+
/**
|
|
59
|
+
* `signal()` pushes into the shared {@link signalRegistry}
|
|
60
|
+
* (`src/kernel/element-registries.ts`) so {@link oke} can auto-populate
|
|
61
|
+
* `signals` with zero explicit array — mirrors the {@link on} trigger-drain
|
|
62
|
+
* registry (`src/kernel/on.ts`).
|
|
63
|
+
*
|
|
64
|
+
* Snapshot of every signal declared since the last reset.
|
|
65
|
+
*/
|
|
66
|
+
export function listSignals(): readonly SignalDecl[] {
|
|
67
|
+
return signalRegistry.slice();
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
/**
|
|
71
|
+
* Clear the signal registry (tests / fresh app adopt).
|
|
72
|
+
*
|
|
73
|
+
* @internal
|
|
74
|
+
*/
|
|
75
|
+
export function resetSignals(): void {
|
|
76
|
+
signalRegistry.length = 0;
|
|
77
|
+
}
|
|
78
|
+
|
|
57
79
|
/**
|
|
58
80
|
* Declare a signal. `delivery` is mandatory — omitting it is a type error.
|
|
59
81
|
*
|
|
@@ -68,7 +90,7 @@ export function signal<T = unknown>(name: string, options: SignalOptions): Signa
|
|
|
68
90
|
) {
|
|
69
91
|
throw new TypeError(`signal("${name}"): delivery is mandatory (once | broadcast | live)`);
|
|
70
92
|
}
|
|
71
|
-
|
|
93
|
+
const decl: SignalDecl<T> = {
|
|
72
94
|
name,
|
|
73
95
|
delivery: options.delivery,
|
|
74
96
|
...(options.description !== undefined ? { description: options.description } : {}),
|
|
@@ -77,4 +99,6 @@ export function signal<T = unknown>(name: string, options: SignalOptions): Signa
|
|
|
77
99
|
schema: options.schema,
|
|
78
100
|
optional: options.optional ?? false,
|
|
79
101
|
};
|
|
102
|
+
signalRegistry.push(decl as SignalDecl);
|
|
103
|
+
return decl;
|
|
80
104
|
}
|
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
7
|
import type { ColumnClassification, ResourceRef, StoreFacet } from "../../manifest/types.ts";
|
|
8
|
+
import { storeRegistry } from "../../kernel/element-registries.ts";
|
|
8
9
|
import { resource } from "./resource.ts";
|
|
9
10
|
import { schema } from "./schema-decl.ts";
|
|
10
11
|
import { resolveTableName, type TableHandle } from "./table.ts";
|
|
@@ -114,6 +115,28 @@ export interface IndexStoreDecl extends StoreDeclBase {
|
|
|
114
115
|
/** Any store declaration. */
|
|
115
116
|
export type StoreDecl = SqlStoreDecl | KvStoreDecl | FilesStoreDecl | IndexStoreDecl;
|
|
116
117
|
|
|
118
|
+
/**
|
|
119
|
+
* `store.sql` / `store.files` push into the shared {@link storeRegistry}
|
|
120
|
+
* (`src/kernel/element-registries.ts`) so {@link oke} can auto-populate
|
|
121
|
+
* `stores` with zero explicit array — mirrors the {@link on} trigger-drain
|
|
122
|
+
* registry (`src/kernel/on.ts`). `store.kv` / `store.index` are
|
|
123
|
+
* intentionally not auto-registered (out of scope).
|
|
124
|
+
*
|
|
125
|
+
* Snapshot of every `store.sql` / `store.files` declared since the last reset.
|
|
126
|
+
*/
|
|
127
|
+
export function listStores(): readonly StoreDecl[] {
|
|
128
|
+
return storeRegistry.slice();
|
|
129
|
+
}
|
|
130
|
+
|
|
131
|
+
/**
|
|
132
|
+
* Clear the store registry (tests / fresh app adopt).
|
|
133
|
+
*
|
|
134
|
+
* @internal
|
|
135
|
+
*/
|
|
136
|
+
export function resetStores(): void {
|
|
137
|
+
storeRegistry.length = 0;
|
|
138
|
+
}
|
|
139
|
+
|
|
117
140
|
/**
|
|
118
141
|
* Declare a SQL store.
|
|
119
142
|
*
|
|
@@ -140,6 +163,7 @@ export function sql(name: string, options: SqlStoreOptions = {}): SqlStoreDecl {
|
|
|
140
163
|
};
|
|
141
164
|
},
|
|
142
165
|
};
|
|
166
|
+
storeRegistry.push(decl);
|
|
143
167
|
return decl;
|
|
144
168
|
}
|
|
145
169
|
|
|
@@ -165,12 +189,14 @@ export function kv(name: string, options: KvStoreOptions = {}): KvStoreDecl {
|
|
|
165
189
|
* @param options - Options
|
|
166
190
|
*/
|
|
167
191
|
export function files(name: string, options: FilesStoreOptions = {}): FilesStoreDecl {
|
|
168
|
-
|
|
192
|
+
const decl: FilesStoreDecl = {
|
|
169
193
|
facet: "files",
|
|
170
194
|
name,
|
|
171
195
|
ref: `files:${name}`,
|
|
172
196
|
...(options.description !== undefined ? { description: options.description } : {}),
|
|
173
197
|
};
|
|
198
|
+
storeRegistry.push(decl);
|
|
199
|
+
return decl;
|
|
174
200
|
}
|
|
175
201
|
|
|
176
202
|
/**
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* `store.resource(db, table, opts)` — a CRUD + list resource factory.
|
|
3
3
|
*
|
|
4
|
-
* Declarative sugar, never new physics: every op is an ordinary `flow({…})`
|
|
4
|
+
* Declarative sugar, never new physics: every op is an ordinary `flow(name, {…})`
|
|
5
5
|
* whose body composes `fx.store(db)` (select/insert/update/findById/delete +
|
|
6
6
|
* `page`/`count`) through the existing Drizzle-condition compiler. Wire
|
|
7
7
|
* binding stays in `on(http.resource(path, resource.all()))` — the factory
|
|
@@ -649,8 +649,7 @@ export function resource(db: SqlStoreDecl, table: unknown, options: ResourceOpti
|
|
|
649
649
|
return { data, meta };
|
|
650
650
|
}
|
|
651
651
|
|
|
652
|
-
const listFlow = flow({
|
|
653
|
-
name: "list",
|
|
652
|
+
const listFlow = flow("list", {
|
|
654
653
|
unit,
|
|
655
654
|
...(breaking ? { breaking: true as const } : {}),
|
|
656
655
|
// Loose record so the HTTP AoT infers `query` and lets every list URL
|
|
@@ -664,8 +663,7 @@ export function resource(db: SqlStoreDecl, table: unknown, options: ResourceOpti
|
|
|
664
663
|
},
|
|
665
664
|
});
|
|
666
665
|
|
|
667
|
-
const createFlow = flow({
|
|
668
|
-
name: "create",
|
|
666
|
+
const createFlow = flow("create", {
|
|
669
667
|
unit,
|
|
670
668
|
...(breaking ? { breaking: true as const } : {}),
|
|
671
669
|
in: options.in as never,
|
|
@@ -682,8 +680,7 @@ export function resource(db: SqlStoreDecl, table: unknown, options: ResourceOpti
|
|
|
682
680
|
},
|
|
683
681
|
});
|
|
684
682
|
|
|
685
|
-
const getFlow = flow({
|
|
686
|
-
name: "get",
|
|
683
|
+
const getFlow = flow("get", {
|
|
687
684
|
unit,
|
|
688
685
|
...(breaking ? { breaking: true as const } : {}),
|
|
689
686
|
errors,
|
|
@@ -709,8 +706,7 @@ export function resource(db: SqlStoreDecl, table: unknown, options: ResourceOpti
|
|
|
709
706
|
: patchSchema instanceof z.ZodObject
|
|
710
707
|
? patchSchema.extend({ [idKey]: z.string() })
|
|
711
708
|
: patchSchema;
|
|
712
|
-
const updateFlow = flow({
|
|
713
|
-
name: "update",
|
|
709
|
+
const updateFlow = flow("update", {
|
|
714
710
|
unit,
|
|
715
711
|
...(breaking ? { breaking: true as const } : {}),
|
|
716
712
|
in: updateIn as never,
|
|
@@ -736,8 +732,7 @@ export function resource(db: SqlStoreDecl, table: unknown, options: ResourceOpti
|
|
|
736
732
|
},
|
|
737
733
|
});
|
|
738
734
|
|
|
739
|
-
const removeFlow = flow({
|
|
740
|
-
name: "remove",
|
|
735
|
+
const removeFlow = flow("remove", {
|
|
741
736
|
unit,
|
|
742
737
|
...(breaking ? { breaking: true as const } : {}),
|
|
743
738
|
errors,
|
|
@@ -46,8 +46,7 @@ describe("fx.store(db).upsert via app.fetch (real boot)", () => {
|
|
|
46
46
|
|
|
47
47
|
const seed = on(
|
|
48
48
|
http.post("/seed").gate(gate.public),
|
|
49
|
-
flow({
|
|
50
|
-
name: "notes.seed",
|
|
49
|
+
flow("notes.seed", {
|
|
51
50
|
in: UpsertIn,
|
|
52
51
|
out: UpsertOut,
|
|
53
52
|
effects: { writes: ["sql:app"], reads: ["sql:app"] },
|
|
@@ -4,6 +4,8 @@
|
|
|
4
4
|
* Physics: secrets · config · environment.
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
+
import { secretRegistry } from "../../kernel/element-registries.ts";
|
|
8
|
+
|
|
7
9
|
/** Options for {@link vault} / {@link vault.secret} / {@link vault.config}. */
|
|
8
10
|
export interface VaultSecretOptions {
|
|
9
11
|
/** Human description shown in boot-gap listings. */
|
|
@@ -35,6 +37,30 @@ export interface VaultSecretDecl {
|
|
|
35
37
|
readonly sensitive: boolean;
|
|
36
38
|
}
|
|
37
39
|
|
|
40
|
+
/**
|
|
41
|
+
* `vault.secret` (only) pushes into the shared {@link secretRegistry}
|
|
42
|
+
* (`src/kernel/element-registries.ts`) so {@link oke} can auto-populate
|
|
43
|
+
* `secrets` with zero explicit array — mirrors the {@link on} trigger-drain
|
|
44
|
+
* registry (`src/kernel/on.ts`). `vault.config` is intentionally not
|
|
45
|
+
* auto-registered (out of scope).
|
|
46
|
+
*/
|
|
47
|
+
|
|
48
|
+
/**
|
|
49
|
+
* Snapshot of every `vault.secret` declared since the last reset.
|
|
50
|
+
*/
|
|
51
|
+
export function listSecrets(): readonly VaultSecretDecl[] {
|
|
52
|
+
return secretRegistry.slice();
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
/**
|
|
56
|
+
* Clear the vault-secret registry (tests / fresh app adopt).
|
|
57
|
+
*
|
|
58
|
+
* @internal
|
|
59
|
+
*/
|
|
60
|
+
export function resetSecrets(): void {
|
|
61
|
+
secretRegistry.length = 0;
|
|
62
|
+
}
|
|
63
|
+
|
|
38
64
|
/**
|
|
39
65
|
* Declare a vault secret contract (fingerprinted — never revealed).
|
|
40
66
|
*
|
|
@@ -45,7 +71,7 @@ function declareSecret(name: string, options: VaultSecretOptions = {}): VaultSec
|
|
|
45
71
|
if (!name) {
|
|
46
72
|
throw new TypeError("vault.secret: name is required");
|
|
47
73
|
}
|
|
48
|
-
|
|
74
|
+
const decl: VaultSecretDecl = {
|
|
49
75
|
kind: "secret",
|
|
50
76
|
name,
|
|
51
77
|
sensitive: options.sensitive ?? true,
|
|
@@ -54,6 +80,8 @@ function declareSecret(name: string, options: VaultSecretOptions = {}): VaultSec
|
|
|
54
80
|
...(options.schema !== undefined ? { schema: options.schema } : {}),
|
|
55
81
|
...(options.dev !== undefined ? { dev: options.dev } : {}),
|
|
56
82
|
};
|
|
83
|
+
secretRegistry.push(decl);
|
|
84
|
+
return decl;
|
|
57
85
|
}
|
|
58
86
|
|
|
59
87
|
/**
|
|
@@ -0,0 +1,103 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Boot-level proof: a `src/flows/<unit>` folder on disk with no adopted
|
|
3
|
+
* flow under that unit — the stale/missing `.adopt()` barrel case.
|
|
4
|
+
*
|
|
5
|
+
* Mirrors `effects-stamping.test.ts`'s OKE1008 shape exactly: opt-in only
|
|
6
|
+
* via `rootDir`, `local`/`test` warn once (dev-loop stays unbroken),
|
|
7
|
+
* `docker`/`prod` hard-fail (`OKE1009`) — never a silently-incomplete route
|
|
8
|
+
* table in a deploy-shaped environment.
|
|
9
|
+
*/
|
|
10
|
+
|
|
11
|
+
import { afterEach, describe, expect, test } from "bun:test";
|
|
12
|
+
import { mkdir, mkdtemp, rm, writeFile } from "node:fs/promises";
|
|
13
|
+
import { tmpdir } from "node:os";
|
|
14
|
+
import { join } from "node:path";
|
|
15
|
+
import { gate } from "../elements/gate.ts";
|
|
16
|
+
import { assertAdoptBarrelFresh, resetStaleAdoptBarrelWarnForTests } from "./boot.ts";
|
|
17
|
+
import { flow, resetFlowSeq } from "./flow.ts";
|
|
18
|
+
import { on, resetBindings } from "./on.ts";
|
|
19
|
+
import { http } from "./triggers.ts";
|
|
20
|
+
import { oke } from "./app.ts";
|
|
21
|
+
|
|
22
|
+
afterEach(() => {
|
|
23
|
+
resetBindings();
|
|
24
|
+
resetFlowSeq();
|
|
25
|
+
resetStaleAdoptBarrelWarnForTests();
|
|
26
|
+
});
|
|
27
|
+
|
|
28
|
+
async function makeUnitDir(root: string, unit: string): Promise<void> {
|
|
29
|
+
const dir = join(root, "src/flows", unit);
|
|
30
|
+
await mkdir(dir, { recursive: true });
|
|
31
|
+
await writeFile(join(dir, "index.ts"), "export const nothing = 1;\n");
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
describe("assertAdoptBarrelFresh — direct", () => {
|
|
35
|
+
test("no rootDir: no-op, never reads the filesystem", async () => {
|
|
36
|
+
await expect(assertAdoptBarrelFresh([], "prod", undefined)).resolves.toBeUndefined();
|
|
37
|
+
});
|
|
38
|
+
|
|
39
|
+
test("fresh: every disk unit has an adopted flow — no warn, no throw, any env", async () => {
|
|
40
|
+
const root = await mkdtemp(join(tmpdir(), "oke-adopt-fresh-"));
|
|
41
|
+
try {
|
|
42
|
+
await makeUnitDir(root, "notes");
|
|
43
|
+
const notesFlow = flow("notes.create", { do: () => ({ ok: true as const }) });
|
|
44
|
+
await expect(assertAdoptBarrelFresh([notesFlow], "docker", root)).resolves.toBeUndefined();
|
|
45
|
+
} finally {
|
|
46
|
+
await rm(root, { recursive: true, force: true });
|
|
47
|
+
}
|
|
48
|
+
});
|
|
49
|
+
|
|
50
|
+
test("stale: unit on disk, zero adopted flows for it — docker hard-fails OKE1009", async () => {
|
|
51
|
+
const root = await mkdtemp(join(tmpdir(), "oke-adopt-fresh-"));
|
|
52
|
+
try {
|
|
53
|
+
await makeUnitDir(root, "notes");
|
|
54
|
+
await expect(assertAdoptBarrelFresh([], "docker", root)).rejects.toThrow(/OKE1009/);
|
|
55
|
+
} finally {
|
|
56
|
+
await rm(root, { recursive: true, force: true });
|
|
57
|
+
}
|
|
58
|
+
});
|
|
59
|
+
|
|
60
|
+
test("stale: prod — same posture as docker", async () => {
|
|
61
|
+
const root = await mkdtemp(join(tmpdir(), "oke-adopt-fresh-"));
|
|
62
|
+
try {
|
|
63
|
+
await makeUnitDir(root, "notes");
|
|
64
|
+
await expect(assertAdoptBarrelFresh([], "prod", root)).rejects.toThrow(/OKE1009/);
|
|
65
|
+
} finally {
|
|
66
|
+
await rm(root, { recursive: true, force: true });
|
|
67
|
+
}
|
|
68
|
+
});
|
|
69
|
+
|
|
70
|
+
test("stale: local — warns, never throws (dev-loop stays unbroken)", async () => {
|
|
71
|
+
const root = await mkdtemp(join(tmpdir(), "oke-adopt-fresh-"));
|
|
72
|
+
try {
|
|
73
|
+
await makeUnitDir(root, "notes");
|
|
74
|
+
await expect(assertAdoptBarrelFresh([], "local", root)).resolves.toBeUndefined();
|
|
75
|
+
} finally {
|
|
76
|
+
await rm(root, { recursive: true, force: true });
|
|
77
|
+
}
|
|
78
|
+
});
|
|
79
|
+
});
|
|
80
|
+
|
|
81
|
+
describe("boot-level: stale barrel through a real oke() boot", () => {
|
|
82
|
+
test("docker: real app.boot() hard-fails OKE1009 when a unit folder was never adopted", async () => {
|
|
83
|
+
const root = await mkdtemp(join(tmpdir(), "oke-adopt-fresh-"));
|
|
84
|
+
try {
|
|
85
|
+
// "notes" exists on disk but this app only ever adopted "main" —
|
|
86
|
+
// exactly what a stale `src/flows/generated.ts` after adding a unit
|
|
87
|
+
// (and forgetting to rerun `oke dev` / `oke build`) looks like.
|
|
88
|
+
await makeUnitDir(root, "notes");
|
|
89
|
+
const mainFlow = flow("main.health", {
|
|
90
|
+
effects: {},
|
|
91
|
+
do: () => ({ ok: true as const }),
|
|
92
|
+
});
|
|
93
|
+
on(http.get("/health").gate(gate.public), mainFlow);
|
|
94
|
+
const app = oke({ name: "stale-barrel", gate: { unguardedHttp: "allow" } });
|
|
95
|
+
|
|
96
|
+
await expect(
|
|
97
|
+
app.boot({ env: "docker", rootDir: root, unguardedHttp: "allow", startScheduler: false }),
|
|
98
|
+
).rejects.toThrow(/OKE1009/);
|
|
99
|
+
} finally {
|
|
100
|
+
await rm(root, { recursive: true, force: true });
|
|
101
|
+
}
|
|
102
|
+
});
|
|
103
|
+
});
|
package/src/kernel/app.ts
CHANGED
|
@@ -83,6 +83,12 @@ import {
|
|
|
83
83
|
import { releaseInstanceLeases } from "./graceful-shutdown.ts";
|
|
84
84
|
import type { JournalRuntime } from "./boot-bind/journal.ts";
|
|
85
85
|
import { listBindings, resetBindings, type Binding } from "./on.ts";
|
|
86
|
+
import {
|
|
87
|
+
channelTemplateRegistry,
|
|
88
|
+
secretRegistry,
|
|
89
|
+
signalRegistry,
|
|
90
|
+
storeRegistry,
|
|
91
|
+
} from "./element-registries.ts";
|
|
86
92
|
import {
|
|
87
93
|
applyPrincipal,
|
|
88
94
|
createElementPipelineHooks,
|
|
@@ -442,6 +448,21 @@ export interface OkeApp<D extends Record<string, unknown> = {}, R extends AppRou
|
|
|
442
448
|
readonly $options: OkeOptions;
|
|
443
449
|
}
|
|
444
450
|
|
|
451
|
+
/**
|
|
452
|
+
* Concat two decl lists, skipping registry entries already present by
|
|
453
|
+
* reference (the same call-site object explicitly re-passed).
|
|
454
|
+
*
|
|
455
|
+
* @param explicit - Hand-passed decls (kept in order, always wins position)
|
|
456
|
+
* @param fromRegistry - Auto-drained decls to append
|
|
457
|
+
*/
|
|
458
|
+
function mergeUnique<T>(explicit: readonly T[] | undefined, fromRegistry: readonly T[]): T[] {
|
|
459
|
+
const out: T[] = [...(explicit ?? [])];
|
|
460
|
+
for (const item of fromRegistry) {
|
|
461
|
+
if (!out.includes(item)) out.push(item);
|
|
462
|
+
}
|
|
463
|
+
return out;
|
|
464
|
+
}
|
|
465
|
+
|
|
445
466
|
/**
|
|
446
467
|
* Create an application. Adopts bindings registered via {@link on}.
|
|
447
468
|
*
|
|
@@ -456,6 +477,42 @@ export function oke(options: OkeOptions): OkeApp {
|
|
|
456
477
|
: [...listBindings(), ...(options.bindings ?? [])];
|
|
457
478
|
if (registry === "consume") resetBindings();
|
|
458
479
|
|
|
480
|
+
// Same registry mode drains store.sql/store.files, vault.secret, signal(),
|
|
481
|
+
// and channel.<medium>().template() — module-evaluation registries that
|
|
482
|
+
// mirror `on`'s trigger drain (`listBindings`/`resetBindings` above).
|
|
483
|
+
// Explicit `options.stores` / `secrets` / `signals` / `channel.templates`
|
|
484
|
+
// are additive, never silently ignored — deduped by reference so an
|
|
485
|
+
// explicitly-passed decl that is also in the registry is not doubled.
|
|
486
|
+
const registrySnapshot =
|
|
487
|
+
registry === "ignore"
|
|
488
|
+
? { stores: [], secrets: [], signals: [], channelTemplates: [] }
|
|
489
|
+
: {
|
|
490
|
+
stores: storeRegistry.slice(),
|
|
491
|
+
secrets: secretRegistry.slice(),
|
|
492
|
+
signals: signalRegistry.slice(),
|
|
493
|
+
channelTemplates: channelTemplateRegistry.slice(),
|
|
494
|
+
};
|
|
495
|
+
if (registry === "consume") {
|
|
496
|
+
storeRegistry.length = 0;
|
|
497
|
+
secretRegistry.length = 0;
|
|
498
|
+
signalRegistry.length = 0;
|
|
499
|
+
channelTemplateRegistry.length = 0;
|
|
500
|
+
}
|
|
501
|
+
const effectiveStores = mergeUnique(options.stores, registrySnapshot.stores);
|
|
502
|
+
const effectiveSecrets = mergeUnique(options.secrets, registrySnapshot.secrets);
|
|
503
|
+
const effectiveSignals = mergeUnique(options.signals, registrySnapshot.signals);
|
|
504
|
+
// Stay `undefined` (never a defined-but-empty object) when neither an
|
|
505
|
+
// explicit `options.channel` nor a registered template exists — a defined
|
|
506
|
+
// object here would flip `resolveElementNeeds`'s `channel` need to `true`
|
|
507
|
+
// for every app, whether or not it uses channel at all.
|
|
508
|
+
const effectiveChannel: BootOptions["channel"] =
|
|
509
|
+
options.channel === undefined && registrySnapshot.channelTemplates.length === 0
|
|
510
|
+
? undefined
|
|
511
|
+
: {
|
|
512
|
+
...(options.channel ?? {}),
|
|
513
|
+
templates: mergeUnique(options.channel?.templates, registrySnapshot.channelTemplates),
|
|
514
|
+
};
|
|
515
|
+
|
|
459
516
|
// Resolve Gate bag early so auth HTTP Bindings join `adopted` + the router
|
|
460
517
|
// before posture audit (same ensureBoot → doBoot path — never a side channel).
|
|
461
518
|
const gateConfig: ResolvedGateConfig = resolveGateConfig({
|
|
@@ -772,13 +829,13 @@ export function oke(options: OkeOptions): OkeApp {
|
|
|
772
829
|
docker: overrides?.docker ?? options.docker,
|
|
773
830
|
config: overrides?.config ?? options.config,
|
|
774
831
|
elements: overrides?.elements ?? options.elements,
|
|
775
|
-
secrets: overrides?.secrets ??
|
|
832
|
+
secrets: overrides?.secrets ?? effectiveSecrets,
|
|
776
833
|
vault: overrides?.vault ?? options.vault,
|
|
777
834
|
gates: [...baseGates, ...authGates],
|
|
778
|
-
signals: overrides?.signals ??
|
|
835
|
+
signals: overrides?.signals ?? effectiveSignals,
|
|
779
836
|
clocks: overrides?.clocks ?? options.clocks,
|
|
780
|
-
stores: overrides?.stores ??
|
|
781
|
-
channel: overrides?.channel ??
|
|
837
|
+
stores: overrides?.stores ?? effectiveStores,
|
|
838
|
+
channel: overrides?.channel ?? effectiveChannel,
|
|
782
839
|
ai: overrides?.ai ?? options.ai,
|
|
783
840
|
runs: overrides?.runs ?? options.runs,
|
|
784
841
|
bindings: adopted,
|
|
@@ -790,7 +847,7 @@ export function oke(options: OkeOptions): OkeApp {
|
|
|
790
847
|
if (d.startsWith("driver:")) driverIds.push(d.slice("driver:".length));
|
|
791
848
|
}
|
|
792
849
|
}
|
|
793
|
-
const stores = overrides?.stores ??
|
|
850
|
+
const stores = overrides?.stores ?? effectiveStores;
|
|
794
851
|
const available = buildAvailableNeedTokens({
|
|
795
852
|
elements: {
|
|
796
853
|
storeSql:
|
|
@@ -829,10 +886,10 @@ export function oke(options: OkeOptions): OkeApp {
|
|
|
829
886
|
if (gateConfig.auth) available.add("auth");
|
|
830
887
|
assertPluginNeeds(caps, { pluginNames, available });
|
|
831
888
|
|
|
832
|
-
const baseSecrets = overrides?.secrets ??
|
|
833
|
-
const baseSignals = overrides?.signals ??
|
|
889
|
+
const baseSecrets = overrides?.secrets ?? effectiveSecrets;
|
|
890
|
+
const baseSignals = overrides?.signals ?? effectiveSignals;
|
|
834
891
|
const baseClocks = overrides?.clocks ?? options.clocks ?? [];
|
|
835
|
-
const baseChannel = overrides?.channel ??
|
|
892
|
+
const baseChannel = overrides?.channel ?? effectiveChannel;
|
|
836
893
|
const mergedCatalog = mergeTemplateCatalogs(baseChannel?.catalog, ...pluginChannelCatalogs);
|
|
837
894
|
|
|
838
895
|
const merged: BootOptions = {
|
|
@@ -848,7 +905,7 @@ export function oke(options: OkeOptions): OkeApp {
|
|
|
848
905
|
unguardedHttp,
|
|
849
906
|
signals: [...baseSignals, ...pluginSignals],
|
|
850
907
|
clocks: [...baseClocks, ...pluginClocks],
|
|
851
|
-
stores: overrides?.stores ??
|
|
908
|
+
stores: overrides?.stores ?? effectiveStores,
|
|
852
909
|
channel: {
|
|
853
910
|
...(baseChannel ?? {}),
|
|
854
911
|
templates: [...(baseChannel?.templates ?? []), ...pluginChannelTemplates],
|