@adaptivestone/framework 5.0.0-rc.2 → 5.0.0-rc.4
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/codegen/astEmit.d.ts +6 -2
- package/dist/codegen/astEmit.js +27 -6
- package/dist/codegen/astEmit.js.map +1 -1
- package/dist/codegen/emit.d.ts +11 -0
- package/dist/codegen/emit.js +18 -9
- package/dist/codegen/emit.js.map +1 -1
- package/dist/codegen/index.d.ts +5 -2
- package/dist/codegen/index.js +10 -6
- package/dist/codegen/index.js.map +1 -1
- package/package.json +1 -1
|
@@ -22,7 +22,9 @@ export interface PlannedOutput {
|
|
|
22
22
|
export interface RoutePlan {
|
|
23
23
|
/** Gen files to write (user controllers only; framework-internal skipped). */
|
|
24
24
|
outputs: PlannedOutput[];
|
|
25
|
-
/** Controllers that aren't statically analyzable
|
|
25
|
+
/** Controllers that aren't statically analyzable. By default the caller
|
|
26
|
+
* throws; with `skipNonAnalyzable` they're skipped (no types) and listed
|
|
27
|
+
* here so the caller can warn. */
|
|
26
28
|
needsBoot: string[];
|
|
27
29
|
/** Existing `*.routes.gen.ts` in the user folder with no sibling source. */
|
|
28
30
|
orphans: string[];
|
|
@@ -36,7 +38,9 @@ export interface RoutePlan {
|
|
|
36
38
|
* Pure analysis so the caller can fail before any write (atomicity) and so a
|
|
37
39
|
* `--check` run can compare against disk using the exact same rendering path.
|
|
38
40
|
*/
|
|
39
|
-
export declare function planRouteTypes(app: IApp, logger?: CodegenLogger | null
|
|
41
|
+
export declare function planRouteTypes(app: IApp, logger?: CodegenLogger | null, options?: {
|
|
42
|
+
skipNonAnalyzable?: boolean;
|
|
43
|
+
}): Promise<RoutePlan>;
|
|
40
44
|
/**
|
|
41
45
|
* AST-primary route-type generation: plan, then write each user controller's
|
|
42
46
|
* `<File>.routes.gen.ts` and delete orphaned gen files. If ANY controller isn't
|
package/dist/codegen/astEmit.js
CHANGED
|
@@ -28,7 +28,7 @@ import { renderGenFile } from "./emit.js";
|
|
|
28
28
|
* Pure analysis so the caller can fail before any write (atomicity) and so a
|
|
29
29
|
* `--check` run can compare against disk using the exact same rendering path.
|
|
30
30
|
*/
|
|
31
|
-
export async function planRouteTypes(app, logger) {
|
|
31
|
+
export async function planRouteTypes(app, logger, options = {}) {
|
|
32
32
|
const discovered = await discoverControllers(app.foldersConfig.controllers, logger);
|
|
33
33
|
logger?.info?.(`Found ${discovered.length} controller source(s) for route types`);
|
|
34
34
|
// One parse cache for the whole run — shared ancestors parse once.
|
|
@@ -41,10 +41,17 @@ export async function planRouteTypes(app, logger) {
|
|
|
41
41
|
const needsBoot = resolvedAll
|
|
42
42
|
.filter((r) => r.resolved.needsBoot)
|
|
43
43
|
.map((r) => r.srcPath);
|
|
44
|
-
|
|
44
|
+
// Strict default: one non-analyzable controller aborts the whole run (the
|
|
45
|
+
// caller throws). `skipNonAnalyzable` flips this to skip-those-and-continue,
|
|
46
|
+
// emitting types for the rest (used by `generateAll`).
|
|
47
|
+
if (needsBoot.length > 0 && !options.skipNonAnalyzable) {
|
|
45
48
|
logger?.info?.(`${needsBoot.length} controller(s) aren't statically analyzable — no route types written (caller will throw)`);
|
|
46
49
|
return { outputs: [], needsBoot, orphans };
|
|
47
50
|
}
|
|
51
|
+
// Analyze only the statically-analyzable controllers (= all of them when none
|
|
52
|
+
// needsBoot). Non-analyzable ones are skipped from BOTH the registry and the
|
|
53
|
+
// outputs, so a skipped controller never contributes — or blocks — types.
|
|
54
|
+
const analyzable = resolvedAll.filter((r) => !r.resolved.needsBoot);
|
|
48
55
|
// One registry resolves cross-controller bleed exactly like runtime. Register
|
|
49
56
|
// BOTH framework-internal and user controllers so bleed/conflict sees the full
|
|
50
57
|
// picture. A per-controller collision pre-check names BOTH offending files —
|
|
@@ -56,7 +63,7 @@ export async function planRouteTypes(app, logger) {
|
|
|
56
63
|
// type intersections commute). Do not "fix" the order into a real difference.
|
|
57
64
|
const registry = new RouteRegistry();
|
|
58
65
|
const owner = new Map();
|
|
59
|
-
for (const r of
|
|
66
|
+
for (const r of analyzable) {
|
|
60
67
|
const check = new RouteRegistry();
|
|
61
68
|
check.registerSubtree(r.resolved.urlPrefix, buildSubtreeFromSpec(r.spec));
|
|
62
69
|
for (const fr of check.flatten()) {
|
|
@@ -71,7 +78,7 @@ export async function planRouteTypes(app, logger) {
|
|
|
71
78
|
}
|
|
72
79
|
const flatByKey = indexFlat(registry.flatten());
|
|
73
80
|
const outputs = [];
|
|
74
|
-
for (const r of
|
|
81
|
+
for (const r of analyzable) {
|
|
75
82
|
// Framework-internal controllers ship pre-generated gen files — registered
|
|
76
83
|
// above for bleed, but never written into the installed package.
|
|
77
84
|
if (r.isInternal) {
|
|
@@ -83,7 +90,7 @@ export async function planRouteTypes(app, logger) {
|
|
|
83
90
|
`${path.basename(r.srcPath, path.extname(r.srcPath))}.routes.gen.ts`);
|
|
84
91
|
outputs.push({ outPath, text });
|
|
85
92
|
}
|
|
86
|
-
return { outputs, needsBoot
|
|
93
|
+
return { outputs, needsBoot, orphans };
|
|
87
94
|
}
|
|
88
95
|
/**
|
|
89
96
|
* AST-primary route-type generation: plan, then write each user controller's
|
|
@@ -173,7 +180,21 @@ function renderResolved(srcPath, resolved, flatByKey, urlPrefix) {
|
|
|
173
180
|
urlPrefix,
|
|
174
181
|
routes,
|
|
175
182
|
};
|
|
176
|
-
|
|
183
|
+
// A `.js` controller has no inferable type unless a sibling `.d.ts` exists, so
|
|
184
|
+
// the gen file can't `import type` it without a `TS7016` in a strict consumer
|
|
185
|
+
// build (no `allowJs`). TS sources are always importable.
|
|
186
|
+
const ctrlExt = path.extname(srcPath);
|
|
187
|
+
const controllerTypeImportable = ctrlExt === '.ts' ||
|
|
188
|
+
ctrlExt === '.mts' ||
|
|
189
|
+
ctrlExt === '.cts' ||
|
|
190
|
+
existsSync(path.join(path.dirname(srcPath), `${path.basename(srcPath, ctrlExt)}.d.ts`));
|
|
191
|
+
return renderGenFile({
|
|
192
|
+
controller,
|
|
193
|
+
srcPath,
|
|
194
|
+
filteredChains,
|
|
195
|
+
importMap,
|
|
196
|
+
controllerTypeImportable,
|
|
197
|
+
});
|
|
177
198
|
}
|
|
178
199
|
/** The deduped, importable middleware chain (binding names) for one flat route. */
|
|
179
200
|
function chainAt(flatByKey, method, absPath, importable) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"astEmit.js","sourceRoot":"","sources":["../../src/codegen/astEmit.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EAAe,UAAU,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,SAAS,CAAC;AAClE,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EACL,oBAAoB,EACpB,iBAAiB,GAClB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AAGlE,OAAO,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAG1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAMjD,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"astEmit.js","sourceRoot":"","sources":["../../src/codegen/astEmit.ts"],"names":[],"mappings":"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"}
|
package/dist/codegen/emit.d.ts
CHANGED
|
@@ -21,6 +21,17 @@ export interface RenderInput {
|
|
|
21
21
|
filteredChains: MiddlewareRef[][];
|
|
22
22
|
/** `binding → specifier` for every binding referenced in `filteredChains`. */
|
|
23
23
|
importMap: Map<string, string>;
|
|
24
|
+
/**
|
|
25
|
+
* Whether the gen file may `import type` the controller's own module to
|
|
26
|
+
* navigate its `routes` type for precise inline-schema `InferOutput`. False
|
|
27
|
+
* for a `.js` controller with no sibling `.d.ts`: importing it would be a
|
|
28
|
+
* `TS7016` ("no declaration file") under `strict` with no `allowJs`. When
|
|
29
|
+
* false, inline request/query schemas degrade to the base
|
|
30
|
+
* `Record<string, unknown>` (no self-import) so the consumer's typecheck gate
|
|
31
|
+
* stays green during an incremental `.js` → `.ts` migration. `.ts`
|
|
32
|
+
* controllers (and `.js` with a `.d.ts`) keep precise types.
|
|
33
|
+
*/
|
|
34
|
+
controllerTypeImportable: boolean;
|
|
24
35
|
}
|
|
25
36
|
/**
|
|
26
37
|
* Render the gen.ts text from already-resolved chains + import map. The AST
|
package/dist/codegen/emit.js
CHANGED
|
@@ -44,6 +44,12 @@ export function renderGenFile(input) {
|
|
|
44
44
|
.sort();
|
|
45
45
|
const routesAlias = `${controller.className}Routes`;
|
|
46
46
|
const anyRouteHasSchema = controller.routes.some((r) => r.hasSchema || r.hasQuerySchema);
|
|
47
|
+
// Only navigate the controller's own `routes` type (which requires importing
|
|
48
|
+
// it) when that import would actually type-check. For an untyped `.js`
|
|
49
|
+
// controller we degrade instead — inline schemas fall back to the permissive
|
|
50
|
+
// base type rather than emit a `TS7016`-producing self-import.
|
|
51
|
+
const navigateSchema = anyRouteHasSchema && input.controllerTypeImportable;
|
|
52
|
+
const schemaDegraded = anyRouteHasSchema && !input.controllerTypeImportable;
|
|
47
53
|
// Group routes by handler name so a method serving multiple routes
|
|
48
54
|
// (e.g., both POST and GET wired to the same `getContainers`) emits
|
|
49
55
|
// a single union alias instead of duplicate identifiers.
|
|
@@ -64,7 +70,7 @@ export function renderGenFile(input) {
|
|
|
64
70
|
}
|
|
65
71
|
const handlerBlocks = [];
|
|
66
72
|
for (const [, group] of groupedByHandler) {
|
|
67
|
-
const block = renderHandlerGroup(group, routesAlias);
|
|
73
|
+
const block = renderHandlerGroup(group, routesAlias, navigateSchema);
|
|
68
74
|
if (block !== null) {
|
|
69
75
|
handlerBlocks.push(block);
|
|
70
76
|
}
|
|
@@ -72,21 +78,24 @@ export function renderGenFile(input) {
|
|
|
72
78
|
const importLines = [];
|
|
73
79
|
importLines.push(...middlewareImports);
|
|
74
80
|
importLines.push(`import type {`, ` BaseRequestContext,`, ` UnionAppInfoProvides,`, `} from '${typesPath}';`);
|
|
75
|
-
if (
|
|
81
|
+
if (navigateSchema) {
|
|
76
82
|
importLines.push(`import type { StandardSchemaV1 } from '${validateTypesPath}';`);
|
|
77
83
|
importLines.push(`import type ${controller.className} from '${ctrlImportPath}';`);
|
|
78
84
|
}
|
|
79
85
|
const importBlock = importLines.join('\n');
|
|
80
|
-
const routesAliasBlock =
|
|
86
|
+
const routesAliasBlock = navigateSchema
|
|
81
87
|
? `\n/**\n * Type-level navigation into the controller's \`routes\` getter. Schema\n * references for inline schemas resolve through this alias.\n */\ntype ${routesAlias} = InstanceType<typeof ${controller.className}>['routes'];\n`
|
|
82
88
|
: '';
|
|
89
|
+
const degradedNote = schemaDegraded
|
|
90
|
+
? `\n *\n * NOTE: \`${ctrlBaseName}${ctrlExt}\` has no type declaration (no \`.d.ts\`), so its\n * inline request/query schemas fall back to \`Record<string, unknown>\` rather\n * than precise types. Convert it to TypeScript (or add a \`.d.ts\`) for full\n * request/response typing.`
|
|
91
|
+
: '';
|
|
83
92
|
const header = `/**
|
|
84
93
|
* AUTOGENERATED — do not edit by hand.
|
|
85
94
|
*
|
|
86
95
|
* Regenerate with: \`npm run gen\`
|
|
87
96
|
*
|
|
88
97
|
* Source of truth: \`${ctrlBaseName}${ctrlExt}\`'s \`routes\` getter and
|
|
89
|
-
* \`static get middleware()\` Map
|
|
98
|
+
* \`static get middleware()\` Map.${degradedNote}
|
|
90
99
|
*/
|
|
91
100
|
`;
|
|
92
101
|
return `${header}\n${importBlock}\n${routesAliasBlock}\n${handlerBlocks.join('\n\n')}\n`;
|
|
@@ -101,7 +110,7 @@ export function renderGenFile(input) {
|
|
|
101
110
|
* gen files are gitignored, so biome skips them (`vcs.useIgnoreFile`),
|
|
102
111
|
* and TS doesn't care about line length. No formatter post-step needed.
|
|
103
112
|
*/
|
|
104
|
-
function renderHandlerGroup(group, routesAlias) {
|
|
113
|
+
function renderHandlerGroup(group, routesAlias, navigateSchema) {
|
|
105
114
|
if (group.length === 0 || !group[0]?.route.handlerName) {
|
|
106
115
|
return null;
|
|
107
116
|
}
|
|
@@ -113,7 +122,7 @@ function renderHandlerGroup(group, routesAlias) {
|
|
|
113
122
|
// Dedup identical shapes (same chain + same schemas + same path params)
|
|
114
123
|
// so multi-route handlers with structurally-equivalent contexts emit one
|
|
115
124
|
// shape instead of an N-way union of identical branches.
|
|
116
|
-
const allShapes = group.map(({ route, chain }) => renderShape(route, chain, routesAlias));
|
|
125
|
+
const allShapes = group.map(({ route, chain }) => renderShape(route, chain, routesAlias, navigateSchema));
|
|
117
126
|
const shapes = Array.from(new Set(allShapes));
|
|
118
127
|
if (shapes.length === 1) {
|
|
119
128
|
return `/** Request type for ${docComment} (handler: \`${handlerName}\`). */
|
|
@@ -124,7 +133,7 @@ export type ${typeName} =
|
|
|
124
133
|
| ${shapes.join('\n | ')};`;
|
|
125
134
|
}
|
|
126
135
|
/** Render the BaseRequestContext intersection for one route. */
|
|
127
|
-
function renderShape(route, chain, routesAlias) {
|
|
136
|
+
function renderShape(route, chain, routesAlias, navigateSchema) {
|
|
128
137
|
const tupleInner = chain.length === 0
|
|
129
138
|
? 'readonly []'
|
|
130
139
|
: `readonly [${chain.map((m) => `typeof ${m.className}`).join(', ')}]`;
|
|
@@ -138,7 +147,7 @@ function renderShape(route, chain, routesAlias) {
|
|
|
138
147
|
// appInfo overrides for body/query when their schema is declared inline
|
|
139
148
|
// on the route entry.
|
|
140
149
|
const appInfoOverrides = [];
|
|
141
|
-
if (route.hasSchema) {
|
|
150
|
+
if (route.hasSchema && navigateSchema) {
|
|
142
151
|
if (route.requestContentTypes?.length) {
|
|
143
152
|
// Content-type map → discriminated union keyed by `contentType`. Each
|
|
144
153
|
// branch reads InferOutput of that media type's schema.
|
|
@@ -155,7 +164,7 @@ function renderShape(route, chain, routesAlias) {
|
|
|
155
164
|
appInfoOverrides.push(`request: StandardSchemaV1.InferOutput<${routesAlias}[${sq(route.method)}][${sq(route.path)}]['request']>`);
|
|
156
165
|
}
|
|
157
166
|
}
|
|
158
|
-
if (route.hasQuerySchema) {
|
|
167
|
+
if (route.hasQuerySchema && navigateSchema) {
|
|
159
168
|
appInfoOverrides.push(`query: StandardSchemaV1.InferOutput<${routesAlias}[${sq(route.method)}][${sq(route.path)}]['query']>`);
|
|
160
169
|
}
|
|
161
170
|
const appInfoOverride = appInfoOverrides.length > 0 ? ` & { ${appInfoOverrides.join('; ')} }` : '';
|
package/dist/codegen/emit.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"emit.js","sourceRoot":"","sources":["../../src/codegen/emit.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAMzC,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"emit.js","sourceRoot":"","sources":["../../src/codegen/emit.ts"],"names":[],"mappings":"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"}
|
package/dist/codegen/index.d.ts
CHANGED
|
@@ -20,8 +20,11 @@ export interface GenerateAllOptions {
|
|
|
20
20
|
/**
|
|
21
21
|
* Generate both app-level and per-controller route types from the AST front-end
|
|
22
22
|
* — no app boot, no model imports. A controller whose `routes` / `middleware` /
|
|
23
|
-
* `getHttpPath` isn't a literal
|
|
24
|
-
*
|
|
23
|
+
* `getHttpPath` isn't a literal (a loop, conditional, computed key, or `super`
|
|
24
|
+
* — e.g. one that extends another controller and merges `super.routes`) can't be
|
|
25
|
+
* statically analyzed. Rather than abort the whole run, such controllers are
|
|
26
|
+
* SKIPPED with a warning: they work at runtime, only their generated request
|
|
27
|
+
* types are omitted. Types for every analyzable controller are still written.
|
|
25
28
|
*
|
|
26
29
|
* Analysis runs fully BEFORE any write, so a failure never leaves partially
|
|
27
30
|
* refreshed output (atomicity). With `{ check: true }` nothing is written and
|
package/dist/codegen/index.js
CHANGED
|
@@ -15,8 +15,11 @@ export { generateAppTypes, generateRouteTypesViaAst };
|
|
|
15
15
|
/**
|
|
16
16
|
* Generate both app-level and per-controller route types from the AST front-end
|
|
17
17
|
* — no app boot, no model imports. A controller whose `routes` / `middleware` /
|
|
18
|
-
* `getHttpPath` isn't a literal
|
|
19
|
-
*
|
|
18
|
+
* `getHttpPath` isn't a literal (a loop, conditional, computed key, or `super`
|
|
19
|
+
* — e.g. one that extends another controller and merges `super.routes`) can't be
|
|
20
|
+
* statically analyzed. Rather than abort the whole run, such controllers are
|
|
21
|
+
* SKIPPED with a warning: they work at runtime, only their generated request
|
|
22
|
+
* types are omitted. Types for every analyzable controller are still written.
|
|
20
23
|
*
|
|
21
24
|
* Analysis runs fully BEFORE any write, so a failure never leaves partially
|
|
22
25
|
* refreshed output (atomicity). With `{ check: true }` nothing is written and
|
|
@@ -25,12 +28,13 @@ export { generateAppTypes, generateRouteTypesViaAst };
|
|
|
25
28
|
export async function generateAll(app, logger, options = {}) {
|
|
26
29
|
// 1. Analyze everything first (pure text, no writes).
|
|
27
30
|
const appTypesText = await getTemplate(app.internalFilesCache.configs, app.internalFilesCache.modelPaths);
|
|
28
|
-
const plan = await planRouteTypes(app, logger);
|
|
31
|
+
const plan = await planRouteTypes(app, logger, { skipNonAnalyzable: true });
|
|
29
32
|
if (plan.needsBoot.length > 0) {
|
|
30
33
|
const names = plan.needsBoot.map((p) => path.basename(p)).join(', ');
|
|
31
|
-
|
|
32
|
-
'Their `routes` / `middleware` / `getHttpPath`
|
|
33
|
-
'
|
|
34
|
+
logger?.warn?.(`Route-type codegen skipped ${plan.needsBoot.length} controller(s) that aren't statically analyzable: ${names}. ` +
|
|
35
|
+
'Their `routes` / `middleware` / `getHttpPath` use a loop, conditional, computed value, or `super` ' +
|
|
36
|
+
'(e.g. a controller that extends another and merges `super.routes`). They work at runtime — only their ' +
|
|
37
|
+
'generated request types are skipped. Declare literal `routes` to get types.');
|
|
34
38
|
}
|
|
35
39
|
const outputs = [
|
|
36
40
|
{ outPath: path.join(process.cwd(), 'genTypes.d.ts'), text: appTypesText },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/codegen/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAEL,gBAAgB,EAChB,WAAW,GACZ,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,aAAa,EACb,wBAAwB,EAExB,cAAc,EACd,YAAY,GACb,MAAM,cAAc,CAAC;AAGtB,OAAO,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,CAAC;AAQtD
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/codegen/index.ts"],"names":[],"mappings":"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"}
|