@fougere/defaults 0.13.1-alpha.0 → 0.14.0-alpha.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 +6 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +5 -2
- package/dist/index.js.map +1 -1
- package/dist/storage/ResolvedStorage.d.ts +6 -4
- package/dist/storage/ResolvedStorage.d.ts.map +1 -1
- package/dist/storage/ResolvedStorage.js +15 -3
- package/dist/storage/ResolvedStorage.js.map +1 -1
- package/package.json +8 -8
- package/src/index.ts +11 -4
- package/src/storage/ResolvedStorage.ts +22 -6
package/dist/index.d.ts
CHANGED
|
@@ -19,6 +19,12 @@ export interface BootAppOptions {
|
|
|
19
19
|
* Appended after the framework's own members, or replacing one by naming it.
|
|
20
20
|
*/
|
|
21
21
|
extensions?: CreateAppOptions['extensions'];
|
|
22
|
+
/**
|
|
23
|
+
* This process writes its own schema at boot, instead of refusing a database behind the
|
|
24
|
+
* entities. Only for a database born with the process — `path: ':memory:'`, a test — since
|
|
25
|
+
* anything that outlives it is migrated by `fougere migrate --apply`.
|
|
26
|
+
*/
|
|
27
|
+
migrates?: boolean;
|
|
22
28
|
}
|
|
23
29
|
/**
|
|
24
30
|
* Boot a Fougere app from the `fougere.config.ts` at `root`, wired the
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,gEAAgE;AAChE,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,gEAAgE;AAChE,OAAO,EAAa,KAAK,GAAG,EAAE,KAAK,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAO3E,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AACpF,YAAY,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACtD,YAAY,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAEpE,MAAM,WAAW,cAAc;IAC7B,wEAAwE;IACxE,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,gDAAgD;IAChD,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;OAGG;IACH,UAAU,CAAC,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;IAC5C;;;;OAIG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED;;;GAGG;AACH,wBAAsB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,GAAE,cAAmB,GAAG,OAAO,CAAC,GAAG,CAAC,CAmBnF"}
|
package/dist/index.js
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
/** @fougere/defaults — the conventional boot, declared once. */
|
|
2
|
+
import { migrating } from '@fougere/core';
|
|
1
3
|
import { boot } from '@fougere/compiler';
|
|
2
4
|
import { loadConfig, remotesOf } from '@fougere/core/node';
|
|
3
5
|
import { createHttpTransport } from '@fougere/transport-http';
|
|
@@ -15,6 +17,7 @@ export async function bootApp(root, opts = {}) {
|
|
|
15
17
|
const served = new Set(opts.only ?? opts.fronds ?? []);
|
|
16
18
|
const elsewhere = Object.fromEntries(Object.entries(remotesOf(config)).filter(([frond]) => !served.has(frond)));
|
|
17
19
|
const useRemotes = (opts.topology ?? true) && Object.keys(elsewhere).length > 0;
|
|
20
|
+
let storage;
|
|
18
21
|
return boot({
|
|
19
22
|
root,
|
|
20
23
|
only: opts.only ?? opts.fronds,
|
|
@@ -22,8 +25,8 @@ export async function bootApp(root, opts = {}) {
|
|
|
22
25
|
remotes: useRemotes ? elsewhere : {},
|
|
23
26
|
remoteTransport: useRemotes ? (url) => createHttpTransport(url) : undefined,
|
|
24
27
|
// One resolver, one place that knows a storage package.
|
|
25
|
-
db: (cfg) => resolveStorage(cfg.db, cfg.sources, root),
|
|
26
|
-
extensions: opts.extensions,
|
|
28
|
+
db: (cfg) => (storage = resolveStorage(cfg.db, cfg.sources, root)),
|
|
29
|
+
extensions: [...(opts.migrates ? [migrating((app) => storage?.migrate?.(app))] : []), ...(opts.extensions ?? [])],
|
|
27
30
|
});
|
|
28
31
|
}
|
|
29
32
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,gEAAgE;AAChE,OAAO,EAAE,SAAS,EAAmC,MAAM,eAAe,CAAC;AAC3E,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAE9D,OAAO,EAAE,cAAc,EAAwB,MAAM,8BAA8B,CAAC;AAEpF,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AA2BpF;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,IAAY,EAAE,IAAI,GAAmB,EAAE;IACnE,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,CAAC;IACtC,2FAA2F;IAC3F,sFAAsF;IACtF,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;IACvD,MAAM,SAAS,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAChH,MAAM,UAAU,GAAG,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;IAChF,IAAI,OAAoC,CAAC;IAEzC,OAAO,IAAI,CAAC;QACV,IAAI;QACJ,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM;QAC9B,yFAAyF;QACzF,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE;QACpC,eAAe,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS;QAC3E,wDAAwD;QACxD,EAAE,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,OAAO,GAAG,cAAc,CAAC,GAAG,CAAC,EAAc,EAAG,GAA6B,CAAC,OAAgB,EAAE,IAAI,CAAC,CAAC;QAClH,UAAU,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC;KAClH,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -27,10 +27,12 @@ export interface ResolvedStorage {
|
|
|
27
27
|
/** Run `fn` inside one transaction of that source, with a storage factory bound to it. */
|
|
28
28
|
transacted?: <R>(source: string, fn: (storageFactory: (entity: any, name: string) => any) => Promise<R>) => Promise<R>;
|
|
29
29
|
/**
|
|
30
|
-
* Brings the schema up to date
|
|
31
|
-
*
|
|
30
|
+
* Brings the schema up to date — what `fougere migrate --apply` runs, and `migrating()` for a
|
|
31
|
+
* process whose database is born with it. Answers what it could not bring, when anything.
|
|
32
32
|
*/
|
|
33
|
-
migrate?: (app: App) => Promise<
|
|
33
|
+
migrate?: (app: App) => Promise<string | void>;
|
|
34
|
+
/** What `migrate` would create, READ — the dual the boot checks and never writes past. */
|
|
35
|
+
pending?: (app: App) => Promise<string[]>;
|
|
34
36
|
/** Close every engine this opened — the dual of opening them, declared by whoever did. */
|
|
35
37
|
close?: () => Promise<void>;
|
|
36
38
|
}
|
|
@@ -61,6 +63,6 @@ export declare function layerOf(storage: ResolvedStorage): {
|
|
|
61
63
|
transacts: ((source: string) => boolean) | undefined;
|
|
62
64
|
enforces: ((source: string, constraint: Constraint) => boolean) | undefined;
|
|
63
65
|
transacted: never;
|
|
64
|
-
|
|
66
|
+
pending: ((app: App) => Promise<string[]>) | undefined;
|
|
65
67
|
};
|
|
66
68
|
//# sourceMappingURL=ResolvedStorage.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ResolvedStorage.d.ts","sourceRoot":"","sources":["../../src/storage/ResolvedStorage.ts"],"names":[],"mappings":"AAAA,OAAO,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAKzC,OAAO,EAAmB,KAAK,UAAU,EAAgC,MAAM,eAAe,CAAC;AAG/F,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAExD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE5D,MAAM,WAAW,eAAe;IAC9B,iGAAiG;IACjG,EAAE,CAAC,EAAE,OAAO,CAAC;IACb,cAAc,EAAE,CAAC,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,GAAG,CAAC,GAAG,SAAS,CAAC;IACjE;;;OAGG;IACH,QAAQ,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,MAAM,CAAC;IAC1C;;;OAGG;IACH,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC;IACnC,8DAA8D;IAC9D,OAAO,CAAC,EAAE,MAAM,MAAM,EAAE,CAAC;IACzB,mFAAmF;IACnF,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC;IACxC,kGAAkG;IAClG,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,KAAK,OAAO,CAAC;IAC/D,0FAA0F;IAC1F,UAAU,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,cAAc,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,GAAG,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;IACvH;;;OAGG;IACH,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"ResolvedStorage.d.ts","sourceRoot":"","sources":["../../src/storage/ResolvedStorage.ts"],"names":[],"mappings":"AAAA,OAAO,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAKzC,OAAO,EAAmB,KAAK,UAAU,EAAgC,MAAM,eAAe,CAAC;AAG/F,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAExD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE5D,MAAM,WAAW,eAAe;IAC9B,iGAAiG;IACjG,EAAE,CAAC,EAAE,OAAO,CAAC;IACb,cAAc,EAAE,CAAC,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,GAAG,CAAC,GAAG,SAAS,CAAC;IACjE;;;OAGG;IACH,QAAQ,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,MAAM,CAAC;IAC1C;;;OAGG;IACH,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC;IACnC,8DAA8D;IAC9D,OAAO,CAAC,EAAE,MAAM,MAAM,EAAE,CAAC;IACzB,mFAAmF;IACnF,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC;IACxC,kGAAkG;IAClG,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,KAAK,OAAO,CAAC;IAC/D,0FAA0F;IAC1F,UAAU,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,cAAc,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,GAAG,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;IACvH;;;OAGG;IACH,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC/C,0FAA0F;IAC1F,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAC1C,0FAA0F;IAC1F,KAAK,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAE7B;AAsBD,8BAA8B;AAC9B,wBAAgB,cAAc,CAC5B,MAAM,EAAE,QAAQ,EAChB,OAAO,CAAC,EAAE,aAAa;AACvB;;;;;;;;GAQG;AACH,IAAI,CAAC,EAAE,MAAM,GACZ,eAAe,CAgBjB;AAoCD,iFAAiF;AACjF,wBAAgB,WAAW,CAAC,QAAQ,EAAE,eAAe,GAAG,eAAe,CAqFtE;AAED;;;;;;GAMG;AACH,wBAAgB,OAAO,CAAC,OAAO,EAAE,eAAe;IAE5C,cAAc,YAtNU,GAAG,QAAQ,MAAM,KAAK,GAAG;IAuNjD,QAAQ,gBAlNc,MAAM,KAAK,MAAM;IAmNvC,SAAS,YA1MU,MAAM,KAAK,OAAO;IA2MrC,QAAQ,YAzMU,MAAM,cAAc,UAAU,KAAK,OAAO;IA0M5D,UAAU,EAAwB,KAAK;IACvC,OAAO,SAlMO,GAAG,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC;EAoM1C"}
|
|
@@ -126,10 +126,22 @@ export function storageFrom(declared) {
|
|
|
126
126
|
// which is what makes a cross-source `ref()` a miss rather than a constraint against a
|
|
127
127
|
// stranger. What a pass DOES is the source's own: it knows its engine, this does not.
|
|
128
128
|
migrate: async (app) => {
|
|
129
|
-
await base.migrate?.(viewOf(app, (name) => !home.has(lowerFirst(name))));
|
|
129
|
+
const said = [await base.migrate?.(viewOf(app, (name) => !home.has(lowerFirst(name))))];
|
|
130
130
|
for (const [name, engine] of engines) {
|
|
131
|
-
await engine.migrate?.(viewOf(app, (e) => home.get(lowerFirst(e)) === name));
|
|
131
|
+
said.push(await engine.migrate?.(viewOf(app, (e) => home.get(lowerFirst(e)) === name)));
|
|
132
132
|
}
|
|
133
|
+
const reports = said.filter((report) => Boolean(report));
|
|
134
|
+
return reports.length > 0 ? reports.join('\n') : undefined;
|
|
135
|
+
},
|
|
136
|
+
// The same partition `migrate` writes through, read — so what the boot refuses is exactly
|
|
137
|
+
// what the command would create. A named source says its name; the default one needs none.
|
|
138
|
+
pending: async (app) => {
|
|
139
|
+
const lines = [...(await base.pending?.(viewOf(app, (name) => !home.has(lowerFirst(name)))) ?? [])];
|
|
140
|
+
for (const [name, engine] of engines) {
|
|
141
|
+
const behind = await engine.pending?.(viewOf(app, (e) => home.get(lowerFirst(e)) === name)) ?? [];
|
|
142
|
+
lines.push(...behind.map((line) => `${name}: ${line}`));
|
|
143
|
+
}
|
|
144
|
+
return lines;
|
|
133
145
|
},
|
|
134
146
|
// Every source, the default one last: a named source may hold what the default refers
|
|
135
147
|
// to, and closing in reverse of opening is the rule everywhere else.
|
|
@@ -154,7 +166,7 @@ export function layerOf(storage) {
|
|
|
154
166
|
transacts: storage.transacts,
|
|
155
167
|
enforces: storage.enforces,
|
|
156
168
|
transacted: storage.transacted,
|
|
157
|
-
|
|
169
|
+
pending: storage.pending,
|
|
158
170
|
};
|
|
159
171
|
}
|
|
160
172
|
//# sourceMappingURL=ResolvedStorage.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ResolvedStorage.js","sourceRoot":"","sources":["../../src/storage/ResolvedStorage.ts"],"names":[],"mappings":"AAAA,OAAO,6BAA6B,CAAC;AAErC,OAAO,EAAE,MAAM,EAAwB,MAAM,eAAe,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,OAAO,EAAiD,MAAM,eAAe,CAAC;AAC/F,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"ResolvedStorage.js","sourceRoot":"","sources":["../../src/storage/ResolvedStorage.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fougere/defaults",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.14.0-alpha.0",
|
|
4
4
|
"description": "The conventional boot of a Fougere app — the one place storage is wired.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"fougere",
|
|
@@ -29,18 +29,18 @@
|
|
|
29
29
|
"src"
|
|
30
30
|
],
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@fougere/core": "0.
|
|
33
|
-
"@fougere/adapter-sql": "0.
|
|
34
|
-
"@fougere/transport-http": "0.
|
|
35
|
-
"@fougere/container": "0.
|
|
36
|
-
"@fougere/compiler": "0.
|
|
37
|
-
"@fougere/adapter-memory": "0.
|
|
32
|
+
"@fougere/core": "0.14.0-alpha.0",
|
|
33
|
+
"@fougere/adapter-sql": "0.14.0-alpha.0",
|
|
34
|
+
"@fougere/transport-http": "0.14.0-alpha.0",
|
|
35
|
+
"@fougere/container": "0.14.0-alpha.0",
|
|
36
|
+
"@fougere/compiler": "0.14.0-alpha.0",
|
|
37
|
+
"@fougere/adapter-memory": "0.14.0-alpha.0"
|
|
38
38
|
},
|
|
39
39
|
"publishConfig": {
|
|
40
40
|
"access": "public"
|
|
41
41
|
},
|
|
42
42
|
"devDependencies": {
|
|
43
|
-
"@fougere/schema": "0.
|
|
43
|
+
"@fougere/schema": "0.14.0-alpha.0",
|
|
44
44
|
"kysely": "^0.28.17",
|
|
45
45
|
"better-sqlite3": "^13.0.3",
|
|
46
46
|
"@types/better-sqlite3": "^7.6.13"
|
package/src/index.ts
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
/** @fougere/defaults — the conventional boot, declared once. */
|
|
2
|
-
import { type App, type CreateAppOptions } from '@fougere/core';
|
|
2
|
+
import { migrating, type App, type CreateAppOptions } from '@fougere/core';
|
|
3
3
|
import { boot } from '@fougere/compiler';
|
|
4
4
|
import { loadConfig, remotesOf } from '@fougere/core/node';
|
|
5
5
|
import { createHttpTransport } from '@fougere/transport-http';
|
|
6
6
|
import { type DbConfig } from './storage/DbConfig.js';
|
|
7
|
-
import { resolveStorage } from './storage/ResolvedStorage.js';
|
|
7
|
+
import { resolveStorage, type ResolvedStorage } from './storage/ResolvedStorage.js';
|
|
8
8
|
|
|
9
9
|
export { declaresStorage } from './storage/DeclaredStorage.js';
|
|
10
10
|
export { layerOf, resolveStorage, storageFrom } from './storage/ResolvedStorage.js';
|
|
@@ -26,6 +26,12 @@ export interface BootAppOptions {
|
|
|
26
26
|
* Appended after the framework's own members, or replacing one by naming it.
|
|
27
27
|
*/
|
|
28
28
|
extensions?: CreateAppOptions['extensions'];
|
|
29
|
+
/**
|
|
30
|
+
* This process writes its own schema at boot, instead of refusing a database behind the
|
|
31
|
+
* entities. Only for a database born with the process — `path: ':memory:'`, a test — since
|
|
32
|
+
* anything that outlives it is migrated by `fougere migrate --apply`.
|
|
33
|
+
*/
|
|
34
|
+
migrates?: boolean;
|
|
29
35
|
}
|
|
30
36
|
|
|
31
37
|
/**
|
|
@@ -39,6 +45,7 @@ export async function bootApp(root: string, opts: BootAppOptions = {}): Promise<
|
|
|
39
45
|
const served = new Set(opts.only ?? opts.fronds ?? []);
|
|
40
46
|
const elsewhere = Object.fromEntries(Object.entries(remotesOf(config)).filter(([frond]) => !served.has(frond)));
|
|
41
47
|
const useRemotes = (opts.topology ?? true) && Object.keys(elsewhere).length > 0;
|
|
48
|
+
let storage: ResolvedStorage | undefined;
|
|
42
49
|
|
|
43
50
|
return boot({
|
|
44
51
|
root,
|
|
@@ -47,7 +54,7 @@ export async function bootApp(root: string, opts: BootAppOptions = {}): Promise<
|
|
|
47
54
|
remotes: useRemotes ? elsewhere : {},
|
|
48
55
|
remoteTransport: useRemotes ? (url) => createHttpTransport(url) : undefined,
|
|
49
56
|
// One resolver, one place that knows a storage package.
|
|
50
|
-
db: (cfg) => resolveStorage(cfg.db as DbConfig, (cfg as { sources?: unknown }).sources as never, root),
|
|
51
|
-
extensions: opts.extensions,
|
|
57
|
+
db: (cfg) => (storage = resolveStorage(cfg.db as DbConfig, (cfg as { sources?: unknown }).sources as never, root)),
|
|
58
|
+
extensions: [...(opts.migrates ? [migrating((app) => storage?.migrate?.(app))] : []), ...(opts.extensions ?? [])],
|
|
52
59
|
});
|
|
53
60
|
}
|
|
@@ -35,10 +35,12 @@ export interface ResolvedStorage {
|
|
|
35
35
|
/** Run `fn` inside one transaction of that source, with a storage factory bound to it. */
|
|
36
36
|
transacted?: <R>(source: string, fn: (storageFactory: (entity: any, name: string) => any) => Promise<R>) => Promise<R>;
|
|
37
37
|
/**
|
|
38
|
-
* Brings the schema up to date
|
|
39
|
-
*
|
|
38
|
+
* Brings the schema up to date — what `fougere migrate --apply` runs, and `migrating()` for a
|
|
39
|
+
* process whose database is born with it. Answers what it could not bring, when anything.
|
|
40
40
|
*/
|
|
41
|
-
migrate?: (app: App) => Promise<
|
|
41
|
+
migrate?: (app: App) => Promise<string | void>;
|
|
42
|
+
/** What `migrate` would create, READ — the dual the boot checks and never writes past. */
|
|
43
|
+
pending?: (app: App) => Promise<string[]>;
|
|
42
44
|
/** Close every engine this opened — the dual of opening them, declared by whoever did. */
|
|
43
45
|
close?: () => Promise<void>;
|
|
44
46
|
/** Raw synchronous handle, when the engine exposes one. */
|
|
@@ -190,10 +192,24 @@ export function storageFrom(declared: DeclaredStorage): ResolvedStorage {
|
|
|
190
192
|
// which is what makes a cross-source `ref()` a miss rather than a constraint against a
|
|
191
193
|
// stranger. What a pass DOES is the source's own: it knows its engine, this does not.
|
|
192
194
|
migrate: async (app) => {
|
|
193
|
-
await base.migrate?.(viewOf(app, (name) => !home.has(lowerFirst(name))));
|
|
195
|
+
const said = [await base.migrate?.(viewOf(app, (name) => !home.has(lowerFirst(name))))];
|
|
194
196
|
for (const [name, engine] of engines) {
|
|
195
|
-
await engine.migrate?.(viewOf(app, (e) => home.get(lowerFirst(e)) === name));
|
|
197
|
+
said.push(await engine.migrate?.(viewOf(app, (e) => home.get(lowerFirst(e)) === name)));
|
|
196
198
|
}
|
|
199
|
+
const reports = said.filter((report): report is string => Boolean(report));
|
|
200
|
+
|
|
201
|
+
return reports.length > 0 ? reports.join('\n') : undefined;
|
|
202
|
+
},
|
|
203
|
+
// The same partition `migrate` writes through, read — so what the boot refuses is exactly
|
|
204
|
+
// what the command would create. A named source says its name; the default one needs none.
|
|
205
|
+
pending: async (app) => {
|
|
206
|
+
const lines = [...(await base.pending?.(viewOf(app, (name) => !home.has(lowerFirst(name)))) ?? [])];
|
|
207
|
+
for (const [name, engine] of engines) {
|
|
208
|
+
const behind = await engine.pending?.(viewOf(app, (e) => home.get(lowerFirst(e)) === name)) ?? [];
|
|
209
|
+
lines.push(...behind.map((line) => `${name}: ${line}`));
|
|
210
|
+
}
|
|
211
|
+
|
|
212
|
+
return lines;
|
|
197
213
|
},
|
|
198
214
|
// Every source, the default one last: a named source may hold what the default refers
|
|
199
215
|
// to, and closing in reverse of opening is the rule everywhere else.
|
|
@@ -218,6 +234,6 @@ export function layerOf(storage: ResolvedStorage) {
|
|
|
218
234
|
transacts: storage.transacts,
|
|
219
235
|
enforces: storage.enforces,
|
|
220
236
|
transacted: storage.transacted as never,
|
|
221
|
-
|
|
237
|
+
pending: storage.pending,
|
|
222
238
|
};
|
|
223
239
|
}
|