@dudousxd/nestjs-codegen 0.23.0 → 0.25.0

package/CHANGELOG.md

@@ -1,5 +1,39 @@
 # @dudousxd/nestjs-codegen
 
+## 0.25.0
+
+### Minor Changes
+
+- 595c4b1: Follow a factory-produced controller's own heritage chain, so a factory that wraps a factory contributes every level's routes.
+
+  `class C extends createTableController(...)` was resolved one level deep: discovery found the class the factory returns and read **its own methods only**. A factory whose returned class itself extends something — another factory call, or an ordinary base class — lost everything the inner level declared. The controller was not skipped, which would at least be visible; it was generated with a subset of its routes and no warning anywhere, while Nest served all of them.
+
+  That gap made the natural way to give SOME controllers an extra route unusable. Wrapping the shared factory in a second one and declaring the extra route as an ordinary `@Post('export')` method is the shape that keeps every route statically visible — the conditionality becomes which factory a controller extends — but the wrapper's own base routes disappeared from the client, so the pattern looked broken and the alternative (declaring the handler undecorated and mounting it imperatively, `Post('export')(proto, 'export', descriptor)`) is invisible to a static scan by construction.
+
+  Discovery now walks the returned class's chain to any depth, the way Nest walks the prototype chain, resolving each base through the same factory resolution or as a plain class declaration. Nearest declaration wins, so a wrapper overriding an inner route still contributes one route rather than two — matching how a derived controller's own override was already resolved against its base.
+
+  Also fixes the types of an inherited route. A route's parameter and return annotations were resolved against the CONTROLLER's file, but they are written in the file that declares the handler — the factory's. A `@Body() body: ExportRequestDto` on a factory-declared method resolved against a file that never imports `ExportRequestDto` and silently degraded to `unknown`, so the route reached the client accepting anything. They now resolve in the declaring file, which is what the filter pass already did. For a route declared on the controller itself the two files are the same and nothing changes.
+
+  Both are additive: routes and types that were missing now appear. Regenerate and expect new entries for any controller extending a wrapping factory, and real body/query/response types where an inherited route previously had `unknown`.
+
+## 0.24.0
+
+### Minor Changes
+
+- c8d7eec: A mapped column's two declared types can disagree, so both are now emitted.
+
+  **If you upgraded to 0.23.0, you were affected** wherever an entity declares a mapped column — `@Property({ columnType: 'date', type: DateType }) x?: Opt<string>`, or a DECIMAL read back as a string. Those fields kept being emitted, but with the wrong kind, so every union a client derives from it rejected them: `.lt('serviceEndDate', …)` stopped compiling on a column that had been orderable all along.
+
+  The cause was the brand unwrapping itself. `classifyFieldType` consults the column decorator ONLY when the TS type resolves to `unknown` — so before 0.23.0 an `Opt<string>` fell through to `columnType: 'date'` and classified `date`, correctly and by accident. Making the TS side resolve meant the decorator was never reached.
+
+  The fix is not to pick a winner, because both are true and each is needed for a different question. `kind` now carries what the COLUMN is — the semantics an operator set derives from — and a new optional `valueKind` carries what the VALUE is, when they differ. A DATE column read back as `'YYYY-MM-DD'` emits `kind: 'date'` and `valueKind: 'string'`.
+
+  Collapsing them loses one or the other. Answer `string` and the field stops accepting the ordering and range operators the column supports. Answer `date` and the emitted type promises a `Date` the value never holds — which a type-preserving wire format like superjson then contradicts at runtime, since it faithfully transports the string that is actually there. That second failure predates 0.23.0 and is fixed here too: these columns used to emit as `Date` while carrying a string.
+
+  `valueKind` is absent when the two agree, which is the overwhelming majority of columns, so nothing changes for them.
+
+  Also teaches the decorator reader `columnType` (MikroORM's raw DDL slot) alongside `type`, and a mapped-type class (`type: DateType`) alongside a keyword string. It read neither, which is why the conflict was invisible from that side.
+
 ## 0.23.0
 
 ### Minor Changes

package/dist/cli/main.cjs

@@ -1503,12 +1503,19 @@ function classifyFromColumnDecorator(prop, sourceFile, project) {
             return { kind: "string" };
           }
         }
-        const typeProp = arg.getProperty("type");
-        if (typeProp && import_ts_morph4.Node.isPropertyAssignment(typeProp)) {
+        for (const key of ["columnType", "type"]) {
+          const typeProp = arg.getProperty(key);
+          if (!typeProp || !import_ts_morph4.Node.isPropertyAssignment(typeProp)) continue;
           const init = typeProp.getInitializer();
-          if (init && import_ts_morph4.Node.isStringLiteral(init)) {
+          if (!init) continue;
+          if (import_ts_morph4.Node.isStringLiteral(init)) {
             const kind = classifyTypeKeyword(init.getLiteralValue());
             if (kind) return { kind };
+            continue;
+          }
+          if (import_ts_morph4.Node.isIdentifier(init)) {
+            const kind = classifyTypeKeyword(init.getText());
+            if (kind) return { kind };
           }
         }
       }
@@ -1520,12 +1527,18 @@ function classifyFromColumnDecorator(prop, sourceFile, project) {
 function classifyFieldType(prop, sourceFile, project) {
   let nullable = prop.hasQuestionToken();
   const typeNode = prop.getTypeNode();
+  const fromDecorator = classifyFromColumnDecorator(prop, sourceFile, project);
   if (typeNode) {
     const r = classifyTypeNode(typeNode, sourceFile, project);
     if (r.nullable) nullable = true;
-    if (r.kind !== "unknown") return markNullable(r, nullable);
+    if (r.kind !== "unknown") {
+      const conflicts = fromDecorator !== null && fromDecorator.kind !== "unknown" && fromDecorator.kind !== r.kind;
+      if (conflicts) {
+        return markNullable({ ...fromDecorator, valueKind: r.kind }, nullable);
+      }
+      return markNullable(r, nullable);
+    }
   }
-  const fromDecorator = classifyFromColumnDecorator(prop, sourceFile, project);
   if (fromDecorator) {
     return markNullable(fromDecorator, nullable || fromDecorator.nullable === true);
   }
@@ -1533,6 +1546,7 @@ function classifyFieldType(prop, sourceFile, project) {
 }
 function toFilterFieldType(name, r) {
   const ft = { name, kind: r.kind };
+  if (r.valueKind && r.valueKind !== r.kind) ft.valueKind = r.valueKind;
   if (r.enumValues && r.enumValues.length > 0) ft.enumValues = r.enumValues;
   if (r.nullable) ft.nullable = true;
   if (r.numericEnum) ft.numericEnum = true;
@@ -1639,6 +1653,32 @@ function resolveFactoryStaticClass(node) {
   if (!import_ts_morph5.Node.isIdentifier(inner)) return void 0;
   return inner.getDefinitions().map((d) => d.getDeclarationNode()).find((n) => n !== void 0 && import_ts_morph5.Node.isClassDeclaration(n));
 }
+function resolveBaseClass(cls) {
+  const heritage = cls.getExtends()?.getExpression();
+  if (!heritage) return void 0;
+  const call = resolveHeritageCall(heritage);
+  if (call) {
+    const factoryDecl = resolveFactoryDeclaration(call);
+    return factoryDecl ? resolveReturnedClass(factoryDecl) : void 0;
+  }
+  const expr = unwrapExpression(heritage);
+  if (!import_ts_morph5.Node.isIdentifier(expr)) return void 0;
+  return expr.getDefinitions().map((d) => d.getDeclarationNode()).find((n) => n !== void 0 && import_ts_morph5.Node.isClassDeclaration(n));
+}
+function collectMethodsThroughChain(returnedClass) {
+  const byName = /* @__PURE__ */ new Map();
+  const seen = /* @__PURE__ */ new Set();
+  let current = returnedClass;
+  while (current && !seen.has(current)) {
+    seen.add(current);
+    for (const method of current.getMethods()) {
+      const name = method.getName();
+      if (!byName.has(name)) byName.set(name, method);
+    }
+    current = resolveBaseClass(current);
+  }
+  return [...byName.values()];
+}
 function resolveInheritedMethods(cls) {
   const expr = resolveHeritageCall(cls.getExtends()?.getExpression());
   if (!expr) return void 0;
@@ -1678,7 +1718,7 @@ function resolveInheritedMethods(cls) {
     }
   }
   return {
-    methods: returnedClass.getMethods(),
+    methods: collectMethodsThroughChain(returnedClass),
     // The DECLARATION's name, not the call-site text: consumers look the factory
     // back up by name inside `factoryFilePath`, which a qualified
     // `tables.createTableController` would never match. For a bare identifier
@@ -3052,7 +3092,7 @@ function extractDtoRoute(args) {
   const methodName = method.getName();
   const classAs = readAsDecorator(cls, `class ${className}`);
   const methodAs = readAsDecorator(method, `${className}.${methodName}`);
-  const dtoContract = extractDtoContract(method, sourceFile, project, mixin, cls);
+  const dtoContract = extractDtoContract(method, method.getSourceFile(), project, mixin, cls);
   const mixinResponse = mixin ? resolveInstantiatedReturnType(cls, methodName) : void 0;
   return buildRoute({
     className,
@@ -3338,7 +3378,7 @@ function kindToTs(kind, enumValues, numericEnum) {
 }
 function emitFieldTypesLiteral(fts) {
   const entries = fts.map((f) => {
-    let t = f.typeRef ? f.typeRef.name : kindToTs(f.kind, f.enumValues, f.numericEnum);
+    let t = f.typeRef ? f.typeRef.name : kindToTs(f.valueKind ?? f.kind, f.enumValues, f.numericEnum);
     if (f.nullable) t = `${t} | null`;
     return `${JSON.stringify(f.name)}: ${t}`;
   });
@@ -5259,7 +5299,7 @@ async function watch(config, onChange, options = {}) {
 }
 
 // src/index.ts
-var VERSION = "0.23.0";
+var VERSION = "0.25.0";
 
 // src/cli/codegen.ts
 async function runCodegen(opts = {}) {