@adaptivestone/framework 5.0.0-beta.54 → 5.0.0-beta.55

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.
Files changed (32) hide show
  1. package/CHANGELOG.md +15 -1
  2. package/dist/codegen/appTypes.js +18 -1
  3. package/dist/codegen/appTypes.js.map +1 -1
  4. package/dist/codegen/collectMetadata.d.ts +9 -0
  5. package/dist/codegen/collectMetadata.js.map +1 -1
  6. package/dist/codegen/emit.d.ts +4 -5
  7. package/dist/codegen/emit.js +29 -137
  8. package/dist/codegen/emit.js.map +1 -1
  9. package/dist/codegen/importResolution.d.ts +55 -0
  10. package/dist/codegen/importResolution.js +342 -0
  11. package/dist/codegen/importResolution.js.map +1 -0
  12. package/dist/codegen/routeTypes.js +10 -4
  13. package/dist/codegen/routeTypes.js.map +1 -1
  14. package/dist/controllers/Home.d.ts +2 -3
  15. package/dist/controllers/Home.js +7 -3
  16. package/dist/controllers/Home.js.map +1 -1
  17. package/dist/controllers/Home.routes.gen.d.ts +1 -2
  18. package/dist/controllers/index.js +6 -10
  19. package/dist/controllers/index.js.map +1 -1
  20. package/dist/models/User.d.ts +20 -0
  21. package/dist/models/User.js.map +1 -1
  22. package/dist/services/http/middleware/Auth.d.ts +13 -0
  23. package/dist/services/http/middleware/Auth.js +12 -0
  24. package/dist/services/http/middleware/Auth.js.map +1 -1
  25. package/dist/services/http/middleware/GetUserByToken.d.ts +3 -3
  26. package/dist/services/http/middleware/GetUserByToken.js.map +1 -1
  27. package/dist/services/http/routing/RouteNode.d.ts +0 -7
  28. package/dist/services/http/routing/middlewareNormalization.d.ts +2 -7
  29. package/dist/services/http/routing/middlewareNormalization.js +5 -10
  30. package/dist/services/http/routing/middlewareNormalization.js.map +1 -1
  31. package/docs/codegen-ast-approach.md +147 -0
  32. package/package.json +1 -1
@@ -0,0 +1,342 @@
1
+ /**
2
+ * Resolve, for each middleware in a route's chain, the local import binding and
3
+ * specifier the generated `.routes.gen.ts` file should use — so `emit` can write
4
+ * `import type <binding> from '<specifier>'` + `typeof <binding>`.
5
+ *
6
+ * This is the codegen's heaviest piece, and it exists for one reason: the route
7
+ * chain comes from the runtime registry as live CLASS objects, and a JS class
8
+ * carries no source path. So we reconstruct the path/binding from the
9
+ * controller's source — walking the `extends` chain (relative AND bare-package
10
+ * ancestors), rebasing relative imports to the gen file's directory, and
11
+ * identity-matching the live class against the imported modules to recover the
12
+ * binding (the class name may differ from the import name).
13
+ */
14
+ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
15
+ if (typeof path === "string" && /^\.\.?\//.test(path)) {
16
+ return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) {
17
+ return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : (d + ext + "." + cm.toLowerCase() + "js");
18
+ });
19
+ }
20
+ return path;
21
+ };
22
+ import { existsSync, promises as fs } from 'node:fs';
23
+ import { createRequire } from 'node:module';
24
+ import path from 'node:path';
25
+ import { pathToFileURL } from 'node:url';
26
+ /**
27
+ * Resolve the local import binding a controller uses for a middleware in its
28
+ * chain, or `null` when the middleware is imported nowhere in the extends
29
+ * chain (so it should be dropped from the emitted type).
30
+ *
31
+ * We identity-match the live class against the imported modules so a binding
32
+ * whose name merely collides with the class name (a different class imported
33
+ * under that name) can't win — `import Auth from '.../Auth.js'` where the class
34
+ * is `AuthMiddleware` is resolved to `Auth`, and an unrelated `AuthMiddleware`
35
+ * import is rejected. The class's own name is probed first (the binding in the
36
+ * common case); modules are already loaded, so these dynamic imports hit the
37
+ * cache. Synthetic refs (no live class, e.g. unit tests) fall back to matching
38
+ * the import map by name.
39
+ */
40
+ export async function resolveBinding(mw, importMap, ctrlDir, moduleCache, bindingCache) {
41
+ if (!mw.Class) {
42
+ return importMap.has(mw.className) ? mw.className : null;
43
+ }
44
+ if (bindingCache.has(mw.Class)) {
45
+ return bindingCache.get(mw.Class) ?? null;
46
+ }
47
+ // Probe the class's own name first, then scan the rest.
48
+ const names = importMap.has(mw.className)
49
+ ? [mw.className, ...importMap.keys()]
50
+ : [...importMap.keys()];
51
+ let binding = null;
52
+ for (const name of names) {
53
+ const spec = importMap.get(name);
54
+ if (spec === undefined) {
55
+ continue;
56
+ }
57
+ const mod = await importSpec(spec, ctrlDir, moduleCache);
58
+ if (mod && (mod.default === mw.Class || mod[name] === mw.Class)) {
59
+ binding = name;
60
+ break;
61
+ }
62
+ }
63
+ bindingCache.set(mw.Class, binding);
64
+ return binding;
65
+ }
66
+ /**
67
+ * Import a controller's import specifier for identity matching, tolerating the
68
+ * `.js` ↔ `.ts` extension mismatch the framework uses (source is `.ts`,
69
+ * specifiers may be `.js`). Bare specifiers are resolved from the controller's
70
+ * OWN location (its `node_modules` + the package `exports` map) rather than
71
+ * emit.ts's, so the resolved module is the same copy the controller's chain
72
+ * classes came from — otherwise a duplicate install would fail identity match.
73
+ * Returns `null` if nothing resolves. Results are cached per specifier;
74
+ * failures are cached too.
75
+ */
76
+ async function importSpec(spec, ctrlDir, cache) {
77
+ const cached = cache.get(spec);
78
+ if (cached !== undefined) {
79
+ return cached;
80
+ }
81
+ const candidates = [];
82
+ if (spec.startsWith('.')) {
83
+ const abs = path.resolve(ctrlDir, spec);
84
+ candidates.push(pathToFileURL(abs).href);
85
+ const swapped = abs.endsWith('.js')
86
+ ? `${abs.slice(0, -3)}.ts`
87
+ : abs.endsWith('.ts')
88
+ ? `${abs.slice(0, -3)}.js`
89
+ : null;
90
+ if (swapped) {
91
+ candidates.push(pathToFileURL(swapped).href);
92
+ }
93
+ }
94
+ else {
95
+ // `createRequire` anchored in the controller's directory honors that
96
+ // location's resolution (the filename need not exist — only its dir is used).
97
+ try {
98
+ const req = createRequire(path.join(ctrlDir, 'noop.js'));
99
+ candidates.push(pathToFileURL(req.resolve(spec)).href);
100
+ }
101
+ catch {
102
+ // not resolvable from the controller — fall back to process resolution
103
+ }
104
+ candidates.push(spec);
105
+ if (spec.endsWith('.js')) {
106
+ candidates.push(`${spec.slice(0, -3)}.ts`);
107
+ }
108
+ }
109
+ let mod = null;
110
+ for (const candidate of candidates) {
111
+ try {
112
+ mod = (await import(__rewriteRelativeImportExtension(candidate)));
113
+ break;
114
+ }
115
+ catch {
116
+ // try next candidate
117
+ }
118
+ }
119
+ cache.set(spec, mod);
120
+ return mod;
121
+ }
122
+ /**
123
+ * Build an import map covering the controller and its `extends` ancestors.
124
+ *
125
+ * Inherited `static get middleware()` from a parent class references
126
+ * middleware classes the parent imports — the child file doesn't import
127
+ * them. To emit `import type` lines for them, we walk the extends chain,
128
+ * scan each ancestor's source file for its imports, and merge.
129
+ *
130
+ * Resolution rules:
131
+ * - Child's imports win on name collisions (matches JS class-override
132
+ * semantics).
133
+ * - Relative ancestors are read from their sibling source on disk; their
134
+ * relative imports are rebased to the child gen file's directory.
135
+ * - Bare-package ancestors (e.g. a consumer extending the framework's
136
+ * `AbstractController` via `@adaptivestone/framework/modules/...`) are
137
+ * resolved through the importing file's `require.resolve` (honoring the
138
+ * package's `exports` map), then their RELATIVE middleware imports are
139
+ * rewritten into bare specifiers rooted at the same package subpath —
140
+ * valid because the public subpath tree mirrors `src/`. This is what lets
141
+ * a consumer relying on inherited default middleware get the right import
142
+ * lines without re-importing those classes itself.
143
+ */
144
+ export async function buildExtendsImportMap(srcPath, source) {
145
+ const merged = new Map();
146
+ const visited = new Set();
147
+ // Every emitted import must resolve from the child's gen file, which sits
148
+ // next to `srcPath`. An ancestor's relative imports are relative to the
149
+ // ancestor's own location, so they get rebased here (see `resolveImportSpec`).
150
+ const childDir = path.dirname(srcPath);
151
+ // `rewriteBase` is set when the file was reached through a bare-package
152
+ // ancestor: it's the bare subpath of that file, used to rewrite the file's
153
+ // relative imports into bare specifiers the consumer's gen file can resolve.
154
+ async function visit(filePath, fileSource, rewriteBase) {
155
+ if (visited.has(filePath)) {
156
+ return;
157
+ }
158
+ visited.add(filePath);
159
+ const localImports = parseImports(fileSource);
160
+ // Merge with "deepest ancestor first" → child wins by being applied last.
161
+ // We descend first, then set our own imports after, so we always overwrite
162
+ // ancestor entries with our own. Achieved by visiting parent before
163
+ // setting our imports.
164
+ const parentName = parseExtendsParent(fileSource);
165
+ const parentImportPath = parentName
166
+ ? localImports.get(parentName)
167
+ : undefined;
168
+ if (parentImportPath) {
169
+ const resolved = resolveAncestorSource(filePath, parentImportPath, rewriteBase);
170
+ if (resolved) {
171
+ try {
172
+ const parentSource = await fs.readFile(resolved.srcPath, 'utf8');
173
+ await visit(resolved.srcPath, parentSource, resolved.rewriteBase);
174
+ }
175
+ catch {
176
+ // Parent source unreachable — skip silently. The child's own
177
+ // imports still apply.
178
+ }
179
+ }
180
+ }
181
+ // Apply this level's imports AFTER ancestors so we overwrite collisions.
182
+ const fromDir = filePath === srcPath ? null : path.dirname(filePath);
183
+ for (const [name, importPath] of localImports) {
184
+ merged.set(name, resolveImportSpec(importPath, { rewriteBase, fromDir, childDir }));
185
+ }
186
+ }
187
+ await visit(srcPath, source, null);
188
+ return merged;
189
+ }
190
+ /**
191
+ * Resolve a controller's `extends` parent import to a readable source path.
192
+ * `rewriteBase` is the current file's bare context (null in the source tree,
193
+ * a bare subpath inside a node_modules package). Cases:
194
+ * - relative specifier with an existing sibling → that file. The bare context
195
+ * carries forward: a relative parent of a bare-package file is still inside
196
+ * that package, so `rewriteBase` is advanced to the parent's subpath.
197
+ * - bare specifier → resolved through the importing file's `require.resolve`
198
+ * (honors package `exports`); `rewriteBase` becomes that bare subpath.
199
+ * Returns `null` when nothing resolves.
200
+ */
201
+ function resolveAncestorSource(fromFile, importPath, rewriteBase) {
202
+ const sibling = resolveSiblingSource(fromFile, importPath);
203
+ if (sibling !== null) {
204
+ return {
205
+ srcPath: sibling,
206
+ rewriteBase: rewriteBase === null
207
+ ? null
208
+ : rewriteRelativeToBare(importPath, rewriteBase),
209
+ };
210
+ }
211
+ if (importPath.startsWith('.')) {
212
+ return null; // relative, but no source file exists on disk
213
+ }
214
+ try {
215
+ const resolved = createRequire(fromFile).resolve(importPath);
216
+ return { srcPath: resolved, rewriteBase: importPath };
217
+ }
218
+ catch {
219
+ return null;
220
+ }
221
+ }
222
+ /**
223
+ * Resolve one of a visited file's import specifiers to the form the child's gen
224
+ * file should emit — so it resolves from the gen file's own directory:
225
+ * - bare specifier → emitted as-is (resolvable from anywhere via node_modules).
226
+ * - relative import in a bare-package ancestor (`rewriteBase` set) → rewritten
227
+ * to a bare specifier (see `rewriteRelativeToBare`).
228
+ * - relative import in the child itself (`fromDir === null`) → kept as-is; it's
229
+ * already relative to the gen file.
230
+ * - relative import in a relative ancestor → rebased from the ancestor's
231
+ * directory to the child's, so a controller inheriting middleware from a
232
+ * parent in another folder still emits a path that resolves.
233
+ */
234
+ function resolveImportSpec(spec, opts) {
235
+ if (!spec.startsWith('.')) {
236
+ return spec;
237
+ }
238
+ if (opts.rewriteBase !== null) {
239
+ return rewriteRelativeToBare(spec, opts.rewriteBase);
240
+ }
241
+ if (opts.fromDir === null) {
242
+ return spec;
243
+ }
244
+ return relativeImport(opts.childDir, path.resolve(opts.fromDir, spec));
245
+ }
246
+ /**
247
+ * Rewrite a relative import specifier into a bare one rooted at `base`'s
248
+ * package subpath (e.g. inside `@adaptivestone/framework/modules/X.js`, the
249
+ * relative `../services/.../Auth.ts` becomes
250
+ * `@adaptivestone/framework/services/.../Auth.js`). The `.ts` source extension
251
+ * is normalized to `.js` so the spec resolves through the package's published
252
+ * `exports` (which map to the built `.js` tree). No-op when `base` is null
253
+ * (relative-ancestor case) or the spec is already bare.
254
+ */
255
+ function rewriteRelativeToBare(spec, base) {
256
+ if (base === null || !spec.startsWith('.')) {
257
+ return spec;
258
+ }
259
+ const bare = path.posix.join(path.posix.dirname(base), spec);
260
+ return bare.endsWith('.ts') ? `${bare.slice(0, -3)}.js` : bare;
261
+ }
262
+ /** `class X extends Y {` → `'Y'`. Returns `null` if no extends clause. */
263
+ function parseExtendsParent(source) {
264
+ const m = source.match(/\bclass\s+\w+\s+extends\s+(\w+)/);
265
+ return m ? (m[1] ?? null) : null;
266
+ }
267
+ /**
268
+ * Given an import path used by `fromFile`, resolve it to an absolute source
269
+ * path that EXISTS. Returns `null` for bare-package specifiers and for paths
270
+ * whose target isn't found. The existence check matters: a relative ancestor in
271
+ * source is `.ts`, but the same import inside a bare package (node_modules) is
272
+ * the built `.js` — without checking, a non-existent `.ts` would shadow the real
273
+ * `.js` and the ancestor's middleware would be silently dropped.
274
+ */
275
+ function resolveSiblingSource(fromFile, importPath) {
276
+ if (!importPath.startsWith('.')) {
277
+ return null; // bare package, resolved elsewhere
278
+ }
279
+ const fromDir = path.dirname(fromFile);
280
+ // Strip the `.js`/`.ts` extension, then probe whichever exists — source is
281
+ // `.ts`, but the same import inside a bare package (node_modules) is the
282
+ // built `.js`.
283
+ const stripped = importPath.replace(/\.[jt]s$/, '');
284
+ for (const ext of ['.ts', '.js']) {
285
+ const candidate = path.resolve(fromDir, `${stripped}${ext}`);
286
+ if (existsSync(candidate)) {
287
+ return candidate;
288
+ }
289
+ }
290
+ return null;
291
+ }
292
+ /**
293
+ * Parse top-of-file `import` declarations into a binding-name → path map.
294
+ * Handles default imports (`import X from '…'`), namespace-style default
295
+ * (`import * as X from '…'`), and named imports (`import { A, B as C }
296
+ * from '…'`). Strips `import type` and `as Alias` rebinding.
297
+ */
298
+ function parseImports(source) {
299
+ const map = new Map();
300
+ const re = /import\s+(?:type\s+)?(?:(\w+)\s*,?\s*)?(?:\*\s+as\s+(\w+)\s+)?(?:\{([^}]+)\}\s+)?from\s+['"]([^'"]+)['"]/g;
301
+ let m;
302
+ while (true) {
303
+ m = re.exec(source);
304
+ if (m === null) {
305
+ break;
306
+ }
307
+ const [, defaultName, starName, namedBlock, importPath] = m;
308
+ if (defaultName) {
309
+ map.set(defaultName, importPath ?? '');
310
+ }
311
+ if (starName) {
312
+ map.set(starName, importPath ?? '');
313
+ }
314
+ if (namedBlock) {
315
+ for (const piece of namedBlock.split(',')) {
316
+ const trimmed = piece.trim();
317
+ if (!trimmed) {
318
+ continue;
319
+ }
320
+ // `OrigName as LocalName` → bind LocalName
321
+ const asMatch = trimmed.match(/(\w+)\s+as\s+(\w+)/);
322
+ const localName = asMatch
323
+ ? asMatch[2]
324
+ : trimmed.replace(/^type\s+/, '').trim();
325
+ if (localName) {
326
+ map.set(localName, importPath ?? '');
327
+ }
328
+ }
329
+ }
330
+ }
331
+ return map;
332
+ }
333
+ /** Compute a TS-style relative import specifier from `fromDir` to `toFile`. */
334
+ export function relativeImport(fromDir, toFile) {
335
+ let rel = path.relative(fromDir, toFile);
336
+ if (!rel.startsWith('.')) {
337
+ rel = `./${rel}`;
338
+ }
339
+ // Ensure forward slashes (cross-platform)
340
+ return rel.split(path.sep).join('/');
341
+ }
342
+ //# sourceMappingURL=importResolution.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"importResolution.js","sourceRoot":"","sources":["../../src/codegen/importResolution.ts"],"names":[],"mappings":"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"}
@@ -92,16 +92,22 @@ function chainFor(route, urlPrefix, flatByKey) {
92
92
  seen.add(name);
93
93
  out.push({
94
94
  className: name,
95
+ Class: entry.Class,
95
96
  ...(entry.params !== undefined ? { params: entry.params } : {}),
96
97
  });
97
98
  }
98
99
  return out;
99
100
  }
101
+ /**
102
+ * Join a controller's URL prefix with a route sub-path the same way the
103
+ * registry builds flat-route paths: concatenate non-empty segments with a
104
+ * single `/`, no trailing slash. A root sub-path (`/`) under prefix `/file`
105
+ * must resolve to `/file` (not `/file/`), or the `flatByKey` lookup misses
106
+ * and the route's middleware chain comes back empty.
107
+ */
100
108
  function joinPath(prefix, sub) {
101
- const p = prefix.endsWith('/') ? prefix.slice(0, -1) : prefix;
102
- const s = sub.startsWith('/') ? sub : `/${sub}`;
103
- const joined = `${p}${s}`;
104
- return joined === '' ? '/' : joined;
109
+ const segments = [...prefix.split('/'), ...sub.split('/')].filter((s) => s.length > 0);
110
+ return segments.length === 0 ? '/' : `/${segments.join('/')}`;
105
111
  }
106
112
  /**
107
113
  * Find a controller's source file by convention:
@@ -1 +1 @@
1
- {"version":3,"file":"routeTypes.js","sourceRoot":"","sources":["../../src/codegen/routeTypes.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"routeTypes.js","sourceRoot":"","sources":["../../src/codegen/routeTypes.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,6 @@
1
1
  import type { Response } from 'express';
2
- import AbstractController from '../modules/AbstractController.ts';
2
+ import AbstractController, { type TMiddleware } from '../modules/AbstractController.ts';
3
3
  import type { FrameworkRequest } from '../services/http/HttpServer.ts';
4
- import GetUserByToken from '../services/http/middleware/GetUserByToken.ts';
5
4
  declare class Home extends AbstractController {
6
5
  get routes(): {
7
6
  get: {
@@ -10,6 +9,6 @@ declare class Home extends AbstractController {
10
9
  };
11
10
  home(_req: FrameworkRequest, res: Response): Promise<Response<any, Record<string, any>>>;
12
11
  getHttpPath(): string;
13
- static get middleware(): Map<string, (typeof GetUserByToken)[]>;
12
+ static get middleware(): Map<string, TMiddleware>;
14
13
  }
15
14
  export default Home;
@@ -1,5 +1,4 @@
1
- import AbstractController from "../modules/AbstractController.js";
2
- import GetUserByToken from "../services/http/middleware/GetUserByToken.js";
1
+ import AbstractController, {} from "../modules/AbstractController.js";
3
2
  class Home extends AbstractController {
4
3
  get routes() {
5
4
  return {
@@ -14,8 +13,13 @@ class Home extends AbstractController {
14
13
  getHttpPath() {
15
14
  return '/';
16
15
  }
16
+ // Home is public AND mounts at `/`, so any `/{*splat}` middleware here would
17
+ // land on the route-tree root and run on EVERY request in the app. Override
18
+ // the inherited default `[GetUserByToken, Auth]` with an empty Map: Home adds
19
+ // no middleware and imposes nothing globally. (Re-add `[GetUserByToken]` if
20
+ // you want a token-aware, personalized home.)
17
21
  static get middleware() {
18
- return new Map([['/{*splat}', [GetUserByToken]]]);
22
+ return new Map();
19
23
  }
20
24
  }
21
25
  export default Home;
@@ -1 +1 @@
1
- {"version":3,"file":"Home.js","sourceRoot":"","sources":["../../src/controllers/Home.ts"],"names":[],"mappings":"AACA,OAAO,kBAAkB,MAAM,kCAAkC,CAAC;AAElE,OAAO,cAAc,MAAM,+CAA+C,CAAC;AAE3E,MAAM,IAAK,SAAQ,kBAAkB;IACnC,IAAI,MAAM;QACR,OAAO;YACL,GAAG,EAAE;gBACH,GAAG,EAAE,IAAI,CAAC,IAAI;aACf;SACF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,IAAsB,EAAE,GAAa;QAC9C,OAAO,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;IACvC,CAAC;IAED,WAAW;QACT,OAAO,GAAG,CAAC;IACb,CAAC;IAED,MAAM,KAAK,UAAU;QACnB,OAAO,IAAI,GAAG,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;IACpD,CAAC;CACF;AAED,eAAe,IAAI,CAAC"}
1
+ {"version":3,"file":"Home.js","sourceRoot":"","sources":["../../src/controllers/Home.ts"],"names":[],"mappings":"AACA,OAAO,kBAAkB,EAAE,EAE1B,MAAM,kCAAkC,CAAC;AAG1C,MAAM,IAAK,SAAQ,kBAAkB;IACnC,IAAI,MAAM;QACR,OAAO;YACL,GAAG,EAAE;gBACH,GAAG,EAAE,IAAI,CAAC,IAAI;aACf;SACF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,IAAsB,EAAE,GAAa;QAC9C,OAAO,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;IACvC,CAAC;IAED,WAAW;QACT,OAAO,GAAG,CAAC;IACb,CAAC;IAED,6EAA6E;IAC7E,4EAA4E;IAC5E,8EAA8E;IAC9E,4EAA4E;IAC5E,8CAA8C;IAC9C,MAAM,KAAK,UAAU;QACnB,OAAO,IAAI,GAAG,EAAE,CAAC;IACnB,CAAC;CACF;AAED,eAAe,IAAI,CAAC"}
@@ -6,9 +6,8 @@
6
6
  * Source of truth: `Home.ts`'s `routes` getter and
7
7
  * `static get middleware()` Map.
8
8
  */
9
- import type GetUserByToken from '../services/http/middleware/GetUserByToken.ts';
10
9
  import type { BaseRequestContext, UnionAppInfoProvides } from '../services/http/types.ts';
11
10
  /** Request type for `GET /` (handler: `home`). */
12
11
  export type HomeRequest = BaseRequestContext & {
13
- appInfo: UnionAppInfoProvides<readonly [typeof GetUserByToken]>;
12
+ appInfo: UnionAppInfoProvides<readonly []>;
14
13
  };
@@ -81,11 +81,7 @@ class ControllerManager extends Base {
81
81
  this.logger?.warn(`RouteRegistry not available; controller ${key} not registered with the new routing.`);
82
82
  return instance;
83
83
  }
84
- const source = {
85
- kind: 'package',
86
- spec: `<${instance.constructor.name}>`,
87
- };
88
- const subtree = this.#buildSubtree(instance, source);
84
+ const subtree = this.#buildSubtree(instance);
89
85
  // `skipWrap` is the codegen escape hatch — we only need the tree
90
86
  // structure to emit types, not the runtime validation wrappers.
91
87
  // Wrapping instantiates every middleware in every handler's chain
@@ -150,7 +146,7 @@ class ControllerManager extends Base {
150
146
  * `{*splat}` → internal `*splat`. Map scope keys: `'METHOD/path'`,
151
147
  * `'ALL/path'`, `'/path'`.
152
148
  */
153
- #buildSubtree(controller, source) {
149
+ #buildSubtree(controller) {
154
150
  const subtree = createNode('');
155
151
  const ctrlName = controller.constructor.name;
156
152
  // 1. Routes first — handlers placed in the tree before middleware
@@ -167,7 +163,7 @@ class ControllerManager extends Base {
167
163
  continue;
168
164
  }
169
165
  for (const [pathKey, routeSpec] of Object.entries(routeMap)) {
170
- const entry = buildHandlerEntry(routeSpec, controller, source);
166
+ const entry = buildHandlerEntry(routeSpec, controller);
171
167
  if (!entry) {
172
168
  // Object spec but no callable `handler` field — a common
173
169
  // misconfiguration (e.g., `{ request: schema }` without a
@@ -202,7 +198,7 @@ class ControllerManager extends Base {
202
198
  if (parsed.unknownMethod) {
203
199
  this.logger?.warn(`Controller ${ctrlName}: middleware Map key '${scopeKey}' has unknown method prefix '${parsed.unknownMethod}'. Treating the whole key as a path. Expected method prefix is one of: ${[...MAP_KEY_METHODS].join(', ')}.`);
204
200
  }
205
- const entries = normalizeMiddlewares(mwList, source);
201
+ const entries = normalizeMiddlewares(mwList);
206
202
  attachMiddlewares(subtree, parsed.method, convertPathSyntax(parsed.path), entries);
207
203
  }
208
204
  }
@@ -368,7 +364,7 @@ function parseScopeKey(key) {
368
364
  function convertPathSyntax(p) {
369
365
  return p.replace(/\{\*([a-zA-Z_][a-zA-Z0-9_]*)\}/g, '*$1');
370
366
  }
371
- function buildHandlerEntry(spec, controller, source) {
367
+ function buildHandlerEntry(spec, controller) {
372
368
  if (typeof spec === 'function') {
373
369
  return {
374
370
  handler: spec.bind(controller),
@@ -400,7 +396,7 @@ function buildHandlerEntry(spec, controller, source) {
400
396
  entry.bodyParsing = obj.bodyParsing;
401
397
  }
402
398
  if (Array.isArray(obj.middleware) && obj.middleware.length > 0) {
403
- entry.middlewares = normalizeMiddlewares(obj.middleware, source);
399
+ entry.middlewares = normalizeMiddlewares(obj.middleware);
404
400
  }
405
401
  return entry;
406
402
  }
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/controllers/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/controllers/index.ts"],"names":[],"mappings":"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"}
@@ -4,6 +4,26 @@ import type { ExtractProperty, GetModelTypeFromClass, GetModelTypeLiteFromSchema
4
4
  import { BaseModel } from '../modules/BaseModel.ts';
5
5
  export type UserModelLite = GetModelTypeLiteFromSchema<typeof User.modelSchema, ExtractProperty<typeof User, 'schemaOptions'>>;
6
6
  export type TUser = GetModelTypeFromClass<typeof User>;
7
+ /**
8
+ * Augmentation point so `req.appInfo.user` follows a project's OWN `User` model
9
+ * when it replaces the framework's. `npm run gen` emits this automatically into
10
+ * `genTypes.d.ts` (mirroring how it types `app.getModel('User')`); declare it by
11
+ * hand only if you don't run codegen:
12
+ *
13
+ * declare module '@adaptivestone/framework/models/User.js' {
14
+ * interface AppModels { User: InstanceType<typeof MyUser>; }
15
+ * }
16
+ */
17
+ export interface AppModels {
18
+ }
19
+ /**
20
+ * The `User` instance type middlewares contribute to `req.appInfo.user`: the
21
+ * project's own model when known (via `AppModels`), otherwise the framework's.
22
+ * Keeps `appInfo.user` in sync with `app.getModel('User')`.
23
+ */
24
+ export type AppUser = AppModels extends {
25
+ User: infer U;
26
+ } ? U : InstanceType<TUser>;
7
27
  declare class User extends BaseModel {
8
28
  static initHooks(schema: Schema): void;
9
29
  static get modelSchema(): {