npm - @dudousxd/nestjs-codegen - Versions diffs - 0.3.0 → 0.4.1 - Mend

@dudousxd/nestjs-codegen 0.3.0 → 0.4.1

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 (22) hide show

package/CHANGELOG.md +33 -0
package/dist/cli/main.cjs +79 -20
package/dist/cli/main.cjs.map +1 -1
package/dist/cli/main.js +79 -20
package/dist/cli/main.js.map +1 -1
package/dist/extension/index.d.cts +1 -1
package/dist/extension/index.d.ts +1 -1
package/dist/{index-oH5t7x4G.d.cts → index-DA4uySjo.d.cts} +29 -1
package/dist/{index-oH5t7x4G.d.ts → index-DA4uySjo.d.ts} +29 -1
package/dist/index.cjs +130 -20
package/dist/index.cjs.map +1 -1
package/dist/index.d.cts +29 -4
package/dist/index.d.ts +29 -4
package/dist/index.js +129 -20
package/dist/index.js.map +1 -1
package/dist/nest/index.cjs +78 -19
package/dist/nest/index.cjs.map +1 -1
package/dist/nest/index.d.cts +1 -1
package/dist/nest/index.d.ts +1 -1
package/dist/nest/index.js +78 -19
package/dist/nest/index.js.map +1 -1
package/package.json +2 -2

package/dist/extension/index.d.cts CHANGED Viewed

@@ -1,2 +1,2 @@
-export { l as ApiClientLayer, m as ApiHeaderContribution, n as ApiModuleDeps, C as CodegenExtension, o as EmittedFile, E as ExtensionContext, L as LeafModel, p as RequestModel, q as RequestShape, s as defineExtension, t as requestShape } from '../index-oH5t7x4G.cjs';
+export { l as ApiClientLayer, m as ApiHeaderContribution, n as ApiModuleDeps, C as CodegenExtension, o as EmittedFile, E as ExtensionContext, L as LeafModel, p as RequestModel, q as RequestShape, s as defineExtension, t as requestShape } from '../index-DA4uySjo.cjs';
 import 'ts-morph';

package/dist/extension/index.d.ts CHANGED Viewed

@@ -1,2 +1,2 @@
-export { l as ApiClientLayer, m as ApiHeaderContribution, n as ApiModuleDeps, C as CodegenExtension, o as EmittedFile, E as ExtensionContext, L as LeafModel, p as RequestModel, q as RequestShape, s as defineExtension, t as requestShape } from '../index-oH5t7x4G.js';
+export { l as ApiClientLayer, m as ApiHeaderContribution, n as ApiModuleDeps, C as CodegenExtension, o as EmittedFile, E as ExtensionContext, L as LeafModel, p as RequestModel, q as RequestShape, s as defineExtension, t as requestShape } from '../index-DA4uySjo.js';
 import 'ts-morph';

package/dist/{index-oH5t7x4G.d.cts → index-DA4uySjo.d.cts} RENAMED Viewed

@@ -111,6 +111,14 @@ interface SchemaModule {
     root: SchemaNode;
     named: Map<string, SchemaNode>;
     warnings: string[];
+    /**
+     * Names (keys of {@link named}) that are genuinely self/mutually recursive,
+     * i.e. reachable from themselves through a `lazyRef` back-edge. Adapters use
+     * this to break the TypeScript inference cycle (annotated const + hoisted
+     * structural type for zod/valibot; `this`/degrade for arktype). Absent or
+     * empty means no recursion.
+     */
+    recursive?: Set<string>;
 }
 /** Signals to an adapter what it must import to render the current output. */
@@ -121,12 +129,32 @@ interface AdapterUsage {
 interface RenderContext {
     /** Hoisted named schemas being emitted alongside the root. */
     named: Map<string, SchemaNode>;
+    /**
+     * Name of the hoisted schema currently being rendered, when rendering a named
+     * schema's own body. Lets an adapter express a self-reference specially (e.g.
+     * arktype's `this` keyword). Absent when rendering the root.
+     */
+    selfName?: string;
 }
 interface RenderedModule {
     /** Root schema source text, e.g. `"z.object({ email: z.string().email() })"`. */
     schemaText: string;
     /** name → schema source text, hoisted above the parent. */
     namedNestedSchemas: Map<string, string>;
+    /**
+     * name → hoisted TS `type` alias *body* for a recursive schema (e.g.
+     * `"{ field?: string; and?: Array<ColumnFilter> }"`), emitted as
+     * `type <TypeName> = <body>;` above the const. The alias name is derived from
+     * the schema name. Absent for adapters/schemas that don't need it (arktype,
+     * non-recursive schemas).
+     */
+    namedTypeAliases?: Map<string, string>;
+    /**
+     * name → const type annotation for a recursive schema (e.g.
+     * `"z.ZodType<ColumnFilter>"`), emitted as `const <name>: <annotation> = ...`
+     * to break the implicit-any self-reference cycle.
+     */
+    namedAnnotations?: Map<string, string>;
     warnings: string[];
 }
 /**
@@ -521,4 +549,4 @@ declare function requestShape(route: RouteDescriptor): RequestShape;
 /** Identity helper for authoring extensions with full type inference. */
 declare function defineExtension(ext: CodegenExtension): CodegenExtension;
-export { type AdapterUsage as A, type CodegenExtension as C, type ExtensionContext as E, type LeafModel as L, type NumberCheck as N, type ResolvedConfig as R, type SchemaModule as S, type TypeRef as T, type UserConfig as U, type ValidationAdapter as V, type RouteDescriptor as a, type ResolvedFormsConfig as b, type ContractDescriptor as c, type ContractSource as d, type ControllerRef as e, type RenderContext as f, type RenderedModule as g, type SchemaNode as h, type ScopeConfig as i, type StringCheck as j, type ValidationOption as k, type ApiClientLayer as l, type ApiHeaderContribution as m, type ApiModuleDeps as n, type EmittedFile as o, type RequestModel as p, type RequestShape as q, resolveAdapter as r, defineExtension as s, requestShape as t };
+export { type AdapterUsage as A, type CodegenExtension as C, type ExtensionContext as E, type LeafModel as L, type NumberCheck as N, type ResolvedConfig as R, type SchemaNode as S, type TypeRef as T, type UserConfig as U, type ValidationAdapter as V, type RouteDescriptor as a, type SchemaModule as b, type ResolvedFormsConfig as c, type ContractDescriptor as d, type ContractSource as e, type ControllerRef as f, type RenderContext as g, type RenderedModule as h, type ScopeConfig as i, type StringCheck as j, type ValidationOption as k, type ApiClientLayer as l, type ApiHeaderContribution as m, type ApiModuleDeps as n, type EmittedFile as o, type RequestModel as p, type RequestShape as q, resolveAdapter as r, defineExtension as s, requestShape as t };

package/dist/{index-oH5t7x4G.d.ts → index-DA4uySjo.d.ts} RENAMED Viewed

@@ -111,6 +111,14 @@ interface SchemaModule {
     root: SchemaNode;
     named: Map<string, SchemaNode>;
     warnings: string[];
+    /**
+     * Names (keys of {@link named}) that are genuinely self/mutually recursive,
+     * i.e. reachable from themselves through a `lazyRef` back-edge. Adapters use
+     * this to break the TypeScript inference cycle (annotated const + hoisted
+     * structural type for zod/valibot; `this`/degrade for arktype). Absent or
+     * empty means no recursion.
+     */
+    recursive?: Set<string>;
 }
 /** Signals to an adapter what it must import to render the current output. */
@@ -121,12 +129,32 @@ interface AdapterUsage {
 interface RenderContext {
     /** Hoisted named schemas being emitted alongside the root. */
     named: Map<string, SchemaNode>;
+    /**
+     * Name of the hoisted schema currently being rendered, when rendering a named
+     * schema's own body. Lets an adapter express a self-reference specially (e.g.
+     * arktype's `this` keyword). Absent when rendering the root.
+     */
+    selfName?: string;
 }
 interface RenderedModule {
     /** Root schema source text, e.g. `"z.object({ email: z.string().email() })"`. */
     schemaText: string;
     /** name → schema source text, hoisted above the parent. */
     namedNestedSchemas: Map<string, string>;
+    /**
+     * name → hoisted TS `type` alias *body* for a recursive schema (e.g.
+     * `"{ field?: string; and?: Array<ColumnFilter> }"`), emitted as
+     * `type <TypeName> = <body>;` above the const. The alias name is derived from
+     * the schema name. Absent for adapters/schemas that don't need it (arktype,
+     * non-recursive schemas).
+     */
+    namedTypeAliases?: Map<string, string>;
+    /**
+     * name → const type annotation for a recursive schema (e.g.
+     * `"z.ZodType<ColumnFilter>"`), emitted as `const <name>: <annotation> = ...`
+     * to break the implicit-any self-reference cycle.
+     */
+    namedAnnotations?: Map<string, string>;
     warnings: string[];
 }
 /**
@@ -521,4 +549,4 @@ declare function requestShape(route: RouteDescriptor): RequestShape;
 /** Identity helper for authoring extensions with full type inference. */
 declare function defineExtension(ext: CodegenExtension): CodegenExtension;
-export { type AdapterUsage as A, type CodegenExtension as C, type ExtensionContext as E, type LeafModel as L, type NumberCheck as N, type ResolvedConfig as R, type SchemaModule as S, type TypeRef as T, type UserConfig as U, type ValidationAdapter as V, type RouteDescriptor as a, type ResolvedFormsConfig as b, type ContractDescriptor as c, type ContractSource as d, type ControllerRef as e, type RenderContext as f, type RenderedModule as g, type SchemaNode as h, type ScopeConfig as i, type StringCheck as j, type ValidationOption as k, type ApiClientLayer as l, type ApiHeaderContribution as m, type ApiModuleDeps as n, type EmittedFile as o, type RequestModel as p, type RequestShape as q, resolveAdapter as r, defineExtension as s, requestShape as t };
+export { type AdapterUsage as A, type CodegenExtension as C, type ExtensionContext as E, type LeafModel as L, type NumberCheck as N, type ResolvedConfig as R, type SchemaNode as S, type TypeRef as T, type UserConfig as U, type ValidationAdapter as V, type RouteDescriptor as a, type SchemaModule as b, type ResolvedFormsConfig as c, type ContractDescriptor as d, type ContractSource as e, type ControllerRef as f, type RenderContext as g, type RenderedModule as h, type ScopeConfig as i, type StringCheck as j, type ValidationOption as k, type ApiClientLayer as l, type ApiHeaderContribution as m, type ApiModuleDeps as n, type EmittedFile as o, type RequestModel as p, type RequestShape as q, resolveAdapter as r, defineExtension as s, requestShape as t };

package/dist/index.cjs CHANGED Viewed

@@ -42,6 +42,7 @@ __export(src_exports, {
   extractSchemaFromDto: () => extractSchemaFromDto,
   generate: () => generate,
   loadConfig: () => loadConfig,
+  renderTsType: () => renderTsType,
   resolveAdapter: () => resolveAdapter,
   resolveConfig: () => resolveConfig,
   watch: () => watch
@@ -1306,6 +1307,8 @@ function buildFormsFileWithAdapter(routes, outDir, adapter, config) {
   }
   const { globalSchemas, renamesByEntry } = planNestedSchemas(entries);
   const irNamed = /* @__PURE__ */ new Map();
+  const irTypeAliases = /* @__PURE__ */ new Map();
+  const irAnnotations = /* @__PURE__ */ new Map();
   const decls = [];
   const mapEntries = [];
   let used = false;
@@ -1313,6 +1316,8 @@ function buildFormsFileWithAdapter(routes, outDir, adapter, config) {
     if (src.schema) {
       const r = adapter.renderModule(src.schema);
       for (const [n, t] of r.namedNestedSchemas) irNamed.set(n, t);
+      if (r.namedTypeAliases) for (const [n, t] of r.namedTypeAliases) irTypeAliases.set(n, t);
+      if (r.namedAnnotations) for (const [n, a] of r.namedAnnotations) irAnnotations.set(n, a);
       return { text: r.schemaText };
     }
     if (src.zodText) {
@@ -1386,7 +1391,13 @@ function buildFormsFileWithAdapter(routes, outDir, adapter, config) {
   for (const [n, t] of irNamed) if (!allNested.has(n)) allNested.set(n, t);
   if (allNested.size > 0) {
     lines.push("// Hoisted nested schemas (shared across endpoints).");
-    for (const [n, t] of allNested) lines.push(`const ${n} = ${t};`);
+    for (const [n, alias] of irTypeAliases) {
+      if (allNested.has(n)) lines.push(`${alias};`);
+    }
+    for (const [n, t] of allNested) {
+      const annotation = irAnnotations.get(n);
+      lines.push(`const ${n}${annotation ? `: ${annotation}` : ""} = ${t};`);
+    }
     lines.push("");
   }
   lines.push(...decls);
@@ -1811,10 +1822,19 @@ function followModuleForType(name, moduleSpecifier, fromFile, project, seen) {
   }
   return null;
 }
+var _findTypeCache = /* @__PURE__ */ new WeakMap();
 function findType(name, sourceFile, project) {
+  let byKey = _findTypeCache.get(project);
+  if (byKey === void 0) {
+    byKey = /* @__PURE__ */ new Map();
+    _findTypeCache.set(project, byKey);
+  }
+  const key = `${sourceFile.getFilePath()}\0${name}`;
+  if (byKey.has(key)) return byKey.get(key) ?? null;
   const local = findTypeInFile(name, sourceFile);
-  if (local) return local;
-  return resolveImportedType(name, sourceFile, project);
+  const result = local ?? resolveImportedType(name, sourceFile, project);
+  byKey.set(key, result);
+  return result;
 }
 var _NON_REF_NAMES = /* @__PURE__ */ new Set(["string", "number", "boolean", "void", "unknown", "any", "Date"]);
 function _localDeclForKinds(name, file, kinds) {
@@ -1851,6 +1871,26 @@ function resolveTypeRef(nodeOrName, sourceFile, project, opts) {
     if (_NON_REF_NAMES.has(refName)) return null;
     name = refName;
   }
+  return _resolveNamedRef(name, sourceFile, project, opts);
+}
+var _resolveNamedRefCache = /* @__PURE__ */ new WeakMap();
+function _resolveNamedRef(name, sourceFile, project, opts) {
+  let byKey = _resolveNamedRefCache.get(project);
+  if (byKey === void 0) {
+    byKey = /* @__PURE__ */ new Map();
+    _resolveNamedRefCache.set(project, byKey);
+  }
+  const kindsKey = [...opts.kinds].sort().join(",");
+  const key = `${sourceFile.getFilePath()}\0${name}\0${kindsKey}\0${opts.allowBareSpecifier ? 1 : 0}`;
+  if (byKey.has(key)) {
+    const cached = byKey.get(key) ?? null;
+    return cached ? { ...cached } : null;
+  }
+  const computed = _computeNamedRef(name, sourceFile, project, opts);
+  byKey.set(key, computed);
+  return computed ? { ...computed } : null;
+}
+function _computeNamedRef(name, sourceFile, project, opts) {
   if (_localDeclForKinds(name, sourceFile, opts.kinds)) {
     return { name, filePath: sourceFile.getFilePath() };
   }
@@ -1928,10 +1968,7 @@ function extractSchemaFromDto(classDecl, sourceFile, project) {
     depth: 0
   };
   const root = buildObject(classDecl, sourceFile, ctx);
-  for (const schemaName of ctx.recursiveSchemas) {
-    ctx.named.set(schemaName, { kind: "unknown", note: "recursive type \u2014 not expanded" });
-  }
-  return { root, named: ctx.named, warnings: ctx.warnings };
+  return { root, named: ctx.named, warnings: ctx.warnings, recursive: ctx.recursiveSchemas };
 }
 function buildObject(classDecl, classFile, ctx) {
   const props = classDecl.getProperties();
@@ -1951,7 +1988,7 @@ function buildProperty(prop, classFile, ctx) {
   const dec = (n) => decorators.get(n);
   const typeNode = prop.getTypeNode();
   const typeText = typeNode?.getText() ?? "unknown";
-  const isArrayType = !!typeNode && typeNode.getText().endsWith("[]");
+  const isArrayType = !!typeNode && import_ts_morph4.Node.isArrayTypeNode(typeNode);
   const typeRefName = resolveTypeFactoryName(dec("Type"));
   if (has("ValidateNested") || typeRefName) {
     const childName = typeRefName ?? singularClassName(typeText);
@@ -2082,18 +2119,27 @@ function baseFromType(typeText, isArrayType) {
   }
 }
 function buildNestedReference(className, fromFile, ctx) {
-  if (ctx.visiting.has(className) || ctx.depth >= 8) {
+  if (ctx.visiting.has(className)) {
     const reserved = ctx.emittedClasses.get(className) ?? aliasFor(className, ctx);
     ctx.emittedClasses.set(className, reserved);
     ctx.recursiveSchemas.add(reserved);
     if (!ctx.warnedDecorators.has(`recursive:${reserved}`)) {
       ctx.warnedDecorators.add(`recursive:${reserved}`);
-      const msg = `${className} is a recursive type and was not expanded; the generated schema uses unknown for it.`;
+      const msg = `${className} is a recursive type; the generated schema validates it via a lazy self-reference.`;
       ctx.warnings.push(msg);
       console.warn(`[nestjs-codegen] ${msg}`);
     }
     return { kind: "lazyRef", name: reserved };
   }
+  if (ctx.depth >= 8) {
+    if (!ctx.warnedDecorators.has(`deep:${className}`)) {
+      ctx.warnedDecorators.add(`deep:${className}`);
+      const msg = `${className} nesting is too deep to expand; the generated schema uses unknown for it.`;
+      ctx.warnings.push(msg);
+      console.warn(`[nestjs-codegen] ${msg}`);
+    }
+    return { kind: "unknown", note: "nesting too deep \u2014 not expanded" };
+  }
   const existing = ctx.emittedClasses.get(className);
   if (existing) return { kind: "ref", name: existing };
   const schemaName = aliasFor(className, ctx);
@@ -2219,17 +2265,31 @@ var import_ts_morph6 = require("ts-morph");
 var import_ts_morph5 = require("ts-morph");
 // src/discovery/enum-resolution.ts
+var _enumCache = /* @__PURE__ */ new WeakMap();
 function resolveEnumValues(name, sourceFile, project) {
+  let byKey = _enumCache.get(project);
+  if (byKey === void 0) {
+    byKey = /* @__PURE__ */ new Map();
+    _enumCache.set(project, byKey);
+  }
+  const key = `${sourceFile.getFilePath()}\0${name}`;
+  if (byKey.has(key)) {
+    const cached = byKey.get(key) ?? null;
+    return cached ? { values: [...cached.values], numeric: cached.numeric } : null;
+  }
   const resolved = findType(name, sourceFile, project);
-  if (!resolved || resolved.kind !== "enum") return null;
-  let numeric = true;
-  const values = resolved.members.map((m) => {
-    const parsed = JSON.parse(m);
-    if (typeof parsed === "string") numeric = false;
-    return String(parsed);
-  });
-  if (values.length === 0) return null;
-  return { values, numeric };
+  let result = null;
+  if (resolved && resolved.kind === "enum") {
+    let numeric = true;
+    const values = resolved.members.map((m) => {
+      const parsed = JSON.parse(m);
+      if (typeof parsed === "string") numeric = false;
+      return String(parsed);
+    });
+    if (values.length > 0) result = { values, numeric };
+  }
+  byKey.set(key, result);
+  return result ? { values: [...result.values], numeric: result.numeric } : null;
 }
 // src/discovery/filter-field-types.ts
@@ -3498,8 +3558,57 @@ async function watch(config, onChange) {
   };
 }
+// src/ir/render-ts-type.ts
+function tsKey(name) {
+  return /^[A-Za-z_$][A-Za-z0-9_$]*$/.test(name) ? name : JSON.stringify(name);
+}
+function renderTsType(node, ctx) {
+  switch (node.kind) {
+    case "string":
+      return "string";
+    case "number":
+      return "number";
+    case "boolean":
+      return "boolean";
+    case "date":
+      return "Date";
+    case "unknown":
+      return "unknown";
+    case "instanceof":
+      return node.ctor;
+    case "enum":
+      return node.literals.join(" | ");
+    case "literal":
+      return node.raw;
+    case "union":
+      return node.options.map((o) => renderTsType(o, ctx)).join(" | ");
+    case "array":
+      return `Array<${renderTsType(node.element, ctx)}>`;
+    case "optional":
+      return `${renderTsType(node.inner, ctx)} | undefined`;
+    case "annotated":
+      return renderTsType(node.inner, ctx);
+    case "object": {
+      if (node.fields.length === 0) return node.passthrough ? "Record<string, unknown>" : "{}";
+      const inner = node.fields.map((f) => {
+        if (f.value.kind === "optional") {
+          return `${tsKey(f.key)}?: ${renderTsType(f.value.inner, ctx)}`;
+        }
+        return `${tsKey(f.key)}: ${renderTsType(f.value, ctx)}`;
+      }).join("; ");
+      return `{ ${inner} }`;
+    }
+    case "ref":
+    case "lazyRef": {
+      if (ctx.recursive.has(node.name)) return ctx.typeNameFor(node.name);
+      const target = ctx.named.get(node.name);
+      return target ? renderTsType(target, ctx) : "unknown";
+    }
+  }
+}
 // src/index.ts
-var VERSION = "0.3.0";
+var VERSION = "0.4.1";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   CodegenError,
@@ -3514,6 +3623,7 @@ var VERSION = "0.3.0";
   extractSchemaFromDto,
   generate,
   loadConfig,
+  renderTsType,
   resolveAdapter,
   resolveConfig,
   watch