@dudousxd/nestjs-codegen 0.5.0 → 0.5.2

package/dist/index.d.cts

@@ -1,5 +1,5 @@
-import { U as UserConfig, R as ResolvedConfig, a as RouteDescriptor, S as SchemaNode, b as SchemaModule, c as ResolvedFormsConfig, V as ValidationAdapter, C as CodegenExtension, E as ExtensionContext } from './index-B0mS84Jj.cjs';
-export { A as AdapterUsage, d as ContractDescriptor, e as ContractSource, f as ControllerRef, N as NumberCheck, g as RenderContext, h as RenderedModule, i as ScopeConfig, j as StringCheck, T as TypeRef, k as ValidationOption, r as resolveAdapter } from './index-B0mS84Jj.cjs';
+import { U as UserConfig, R as ResolvedConfig, a as RouteDescriptor, S as SchemaNode, b as RenderContext, c as SchemaModule, d as RenderedModule, e as ResolvedFormsConfig, V as ValidationAdapter, C as CodegenExtension, E as ExtensionContext } from './index-_qRai4M3.cjs';
+export { A as AdapterUsage, f as ContractDescriptor, g as ContractSource, h as ControllerRef, N as NumberCheck, i as ScopeConfig, j as StringCheck, T as TypeRef, k as ValidationOption, r as resolveAdapter } from './index-_qRai4M3.cjs';
 import { ClassDeclaration, SourceFile, Project } from 'ts-morph';
 
 declare function defineConfig(c: UserConfig): UserConfig;
@@ -98,6 +98,31 @@ interface TsTypeContext {
 }
 declare function renderTsType(node: SchemaNode, ctx: TsTypeContext): string;
 
+/** Schema const name → hoisted TS type-alias name (`ColumnFilterSchema` → `ColumnFilter`). */
+declare function typeNameFor(schemaName: string): string;
+/** Valid JS identifier → bare key, else quoted. */
+declare function toObjectKey(name: string): string;
+interface ChainModuleRendererOptions {
+    /** The adapter's node renderer (used for both the root and each hoisted named schema). */
+    render(node: SchemaNode, ctx: RenderContext): string;
+    /**
+     * Const type annotation for a recursive schema, e.g. `z.ZodType<ColumnFilter>`
+     * or `v.GenericSchema<ColumnFilter>`, emitted as `const <name>: <annotation> = ...`
+     * to break the implicit-any self-reference cycle.
+     */
+    recursiveAnnotation(typeName: string): string;
+}
+/**
+ * Builds the `renderModule` for a method-chain / pipe-style adapter (zod, valibot):
+ * render the root and every hoisted named schema, and for each recursive schema emit
+ * a structural `type` alias plus a const annotation. The only thing these adapters
+ * differ on is the annotation text, supplied via {@link ChainModuleRendererOptions.recursiveAnnotation};
+ * everything else (the alias-name derivation, the recursive-set handling, the
+ * `renderTsType` lowering) is identical. arktype does not use this — its module
+ * rendering degrades mutually-recursive cycles and emits no type aliases.
+ */
+declare function createChainModuleRenderer(opts: ChainModuleRendererOptions): (mod: SchemaModule) => RenderedModule;
+
 /**
  * Pure-AST translation of class-validator-decorated DTO classes into the neutral
  * {@link SchemaModule} IR. Reads decorator names + literal args via ts-morph — it
@@ -264,6 +289,6 @@ interface FastDiscoveryOptions {
 }
 declare function discoverContractsFast(opts: FastDiscoveryOptions): Promise<RouteDescriptor[]>;
 
-declare const VERSION = "0.5.0";
+declare const VERSION = "0.5.2";
 
-export { CodegenError, ConfigError, type FastDiscoveryOptions, type JsonSchema, type MocksEmitOptions, type OpenApiDocument, type OpenApiEmitOptions, type OpenApiInfo, ResolvedConfig, RouteDescriptor, SchemaModule, SchemaNode, type TsTypeContext, UserConfig, VERSION, ValidationAdapter, type Watcher, acquireLock, buildMocksFile, buildOpenApiSpec, defineConfig, discoverContractsFast, emitApi, emitForms, emitMocks, emitOpenApi, emitRoutes, extractSchemaFromDto, generate, loadConfig, renderTsType, resolveConfig, schemaModuleToJsonSchema, schemaNodeToJsonSchema, watch };
+export { type ChainModuleRendererOptions, CodegenError, ConfigError, type FastDiscoveryOptions, type JsonSchema, type MocksEmitOptions, type OpenApiDocument, type OpenApiEmitOptions, type OpenApiInfo, RenderContext, RenderedModule, ResolvedConfig, RouteDescriptor, SchemaModule, SchemaNode, type TsTypeContext, UserConfig, VERSION, ValidationAdapter, type Watcher, acquireLock, buildMocksFile, buildOpenApiSpec, createChainModuleRenderer, defineConfig, discoverContractsFast, emitApi, emitForms, emitMocks, emitOpenApi, emitRoutes, extractSchemaFromDto, generate, loadConfig, renderTsType, resolveConfig, schemaModuleToJsonSchema, schemaNodeToJsonSchema, toObjectKey, typeNameFor, watch };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { U as UserConfig, R as ResolvedConfig, a as RouteDescriptor, S as SchemaNode, b as SchemaModule, c as ResolvedFormsConfig, V as ValidationAdapter, C as CodegenExtension, E as ExtensionContext } from './index-B0mS84Jj.js';
-export { A as AdapterUsage, d as ContractDescriptor, e as ContractSource, f as ControllerRef, N as NumberCheck, g as RenderContext, h as RenderedModule, i as ScopeConfig, j as StringCheck, T as TypeRef, k as ValidationOption, r as resolveAdapter } from './index-B0mS84Jj.js';
+import { U as UserConfig, R as ResolvedConfig, a as RouteDescriptor, S as SchemaNode, b as RenderContext, c as SchemaModule, d as RenderedModule, e as ResolvedFormsConfig, V as ValidationAdapter, C as CodegenExtension, E as ExtensionContext } from './index-_qRai4M3.js';
+export { A as AdapterUsage, f as ContractDescriptor, g as ContractSource, h as ControllerRef, N as NumberCheck, i as ScopeConfig, j as StringCheck, T as TypeRef, k as ValidationOption, r as resolveAdapter } from './index-_qRai4M3.js';
 import { ClassDeclaration, SourceFile, Project } from 'ts-morph';
 
 declare function defineConfig(c: UserConfig): UserConfig;
@@ -98,6 +98,31 @@ interface TsTypeContext {
 }
 declare function renderTsType(node: SchemaNode, ctx: TsTypeContext): string;
 
+/** Schema const name → hoisted TS type-alias name (`ColumnFilterSchema` → `ColumnFilter`). */
+declare function typeNameFor(schemaName: string): string;
+/** Valid JS identifier → bare key, else quoted. */
+declare function toObjectKey(name: string): string;
+interface ChainModuleRendererOptions {
+    /** The adapter's node renderer (used for both the root and each hoisted named schema). */
+    render(node: SchemaNode, ctx: RenderContext): string;
+    /**
+     * Const type annotation for a recursive schema, e.g. `z.ZodType<ColumnFilter>`
+     * or `v.GenericSchema<ColumnFilter>`, emitted as `const <name>: <annotation> = ...`
+     * to break the implicit-any self-reference cycle.
+     */
+    recursiveAnnotation(typeName: string): string;
+}
+/**
+ * Builds the `renderModule` for a method-chain / pipe-style adapter (zod, valibot):
+ * render the root and every hoisted named schema, and for each recursive schema emit
+ * a structural `type` alias plus a const annotation. The only thing these adapters
+ * differ on is the annotation text, supplied via {@link ChainModuleRendererOptions.recursiveAnnotation};
+ * everything else (the alias-name derivation, the recursive-set handling, the
+ * `renderTsType` lowering) is identical. arktype does not use this — its module
+ * rendering degrades mutually-recursive cycles and emits no type aliases.
+ */
+declare function createChainModuleRenderer(opts: ChainModuleRendererOptions): (mod: SchemaModule) => RenderedModule;
+
 /**
  * Pure-AST translation of class-validator-decorated DTO classes into the neutral
  * {@link SchemaModule} IR. Reads decorator names + literal args via ts-morph — it
@@ -264,6 +289,6 @@ interface FastDiscoveryOptions {
 }
 declare function discoverContractsFast(opts: FastDiscoveryOptions): Promise<RouteDescriptor[]>;
 
-declare const VERSION = "0.5.0";
+declare const VERSION = "0.5.2";
 
-export { CodegenError, ConfigError, type FastDiscoveryOptions, type JsonSchema, type MocksEmitOptions, type OpenApiDocument, type OpenApiEmitOptions, type OpenApiInfo, ResolvedConfig, RouteDescriptor, SchemaModule, SchemaNode, type TsTypeContext, UserConfig, VERSION, ValidationAdapter, type Watcher, acquireLock, buildMocksFile, buildOpenApiSpec, defineConfig, discoverContractsFast, emitApi, emitForms, emitMocks, emitOpenApi, emitRoutes, extractSchemaFromDto, generate, loadConfig, renderTsType, resolveConfig, schemaModuleToJsonSchema, schemaNodeToJsonSchema, watch };
+export { type ChainModuleRendererOptions, CodegenError, ConfigError, type FastDiscoveryOptions, type JsonSchema, type MocksEmitOptions, type OpenApiDocument, type OpenApiEmitOptions, type OpenApiInfo, RenderContext, RenderedModule, ResolvedConfig, RouteDescriptor, SchemaModule, SchemaNode, type TsTypeContext, UserConfig, VERSION, ValidationAdapter, type Watcher, acquireLock, buildMocksFile, buildOpenApiSpec, createChainModuleRenderer, defineConfig, discoverContractsFast, emitApi, emitForms, emitMocks, emitOpenApi, emitRoutes, extractSchemaFromDto, generate, loadConfig, renderTsType, resolveConfig, schemaModuleToJsonSchema, schemaNodeToJsonSchema, toObjectKey, typeNameFor, watch };

package/dist/index.js

@@ -1159,18 +1159,27 @@ function refRootIdentifier(refName) {
 function hasSource(src) {
   return !!(src.schema || src.zodText || src.zodRef);
 }
+function escapeRegExp(s) {
+  return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+var wordBoundaryRegexCache = /* @__PURE__ */ new Map();
+function wordBoundaryRegex(token) {
+  let re = wordBoundaryRegexCache.get(token);
+  if (re === void 0) {
+    re = new RegExp(`\\b${escapeRegExp(token)}\\b`, "g");
+    wordBoundaryRegexCache.set(token, re);
+  }
+  return re;
+}
 function applyRenames(text, renames) {
   if (!renames || renames.size === 0) return text;
   let out = text;
   for (const [from, to] of renames) {
     if (from === to) continue;
-    out = out.replace(new RegExp(`\\b${escapeRegExp(from)}\\b`, "g"), to);
+    out = out.replace(wordBoundaryRegex(from), to);
   }
   return out;
 }
-function escapeRegExp(s) {
-  return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
 function isSelfReferential(name, text) {
   return new RegExp(`\\b${escapeRegExp(name)}\\b`).test(text);
 }
@@ -1182,7 +1191,23 @@ function planNestedSchemas(entries) {
     const local = Object.entries(entry.nestedSchemas);
     if (local.length === 0) continue;
     const rename = /* @__PURE__ */ new Map();
-    for (const [name] of local) rename.set(name, name);
+    const renameValues = /* @__PURE__ */ new Set();
+    const setRename = (key, value) => {
+      const prev = rename.get(key);
+      rename.set(key, value);
+      if (prev !== void 0 && prev !== value) {
+        let stillUsed = false;
+        for (const v of rename.values()) {
+          if (v === prev) {
+            stillUsed = true;
+            break;
+          }
+        }
+        if (!stillUsed) renameValues.delete(prev);
+      }
+      renameValues.add(value);
+    };
+    for (const [name] of local) setRename(name, name);
     const textFor = (name) => {
       const raw = entry.nestedSchemas?.[name] ?? "";
       return applyRenames(raw, rename);
@@ -1200,11 +1225,11 @@ function planNestedSchemas(entries) {
         if (existing === text) continue;
         let i = 2;
         let candidate = `${name}_${i}`;
-        while (globalSchemas.has(candidate) && globalSchemas.get(candidate) !== textFor(name) || [...rename.values()].includes(candidate)) {
+        while (globalSchemas.has(candidate) && globalSchemas.get(candidate) !== textFor(name) || renameValues.has(candidate)) {
           i += 1;
           candidate = `${name}_${i}`;
         }
-        rename.set(name, candidate);
+        setRename(name, candidate);
         changed = true;
       }
     }
@@ -2502,6 +2527,7 @@ function extractSchemaFromDto(classDecl, sourceFile, project) {
     warnings: [],
     warnedDecorators: /* @__PURE__ */ new Set(),
     emittedClasses: /* @__PURE__ */ new Map(),
+    usedSchemaNames: /* @__PURE__ */ new Set(),
     visiting: /* @__PURE__ */ new Set(),
     recursiveSchemas: /* @__PURE__ */ new Set(),
     depth: 0,
@@ -2529,37 +2555,28 @@ function buildProperty(prop, classFile, ctx) {
   const typeNode = prop.getTypeNode();
   const typeText = typeNode?.getText() ?? "unknown";
   const isArrayType = !!typeNode && Node3.isArrayTypeNode(typeNode);
+  const asField = (child) => applyPresence(
+    has("IsArray") || isArrayType ? { kind: "array", element: child } : child,
+    decorators
+  );
   const discriminator = resolveDiscriminator(dec("Type"));
   if (discriminator) {
     const options = discriminator.subTypes.map(
       (name) => buildNestedReference(name, classFile, ctx)
     );
-    const unionNode = {
-      kind: "union",
-      options,
-      discriminator: discriminator.property
-    };
-    const wrapArray = has("IsArray") || isArrayType;
-    const node2 = wrapArray ? { kind: "array", element: unionNode } : unionNode;
-    return applyPresence(node2, decorators);
+    return asField({ kind: "union", options, discriminator: discriminator.property });
   }
   const propTypeParam = singularClassName(typeText);
   if (propTypeParam && ctx.typeBindings.has(propTypeParam)) {
     const bound = ctx.typeBindings.get(propTypeParam);
-    const childNode = buildNestedReference(bound, classFile, ctx);
-    const wrapArray = has("IsArray") || isArrayType;
-    const node2 = wrapArray ? { kind: "array", element: childNode } : childNode;
-    return applyPresence(node2, decorators);
+    return asField(buildNestedReference(bound, classFile, ctx));
   }
   const typeRefName = resolveTypeFactoryName(dec("Type"));
   if (has("ValidateNested") || typeRefName) {
     const typeArgs = genericTypeArgNames(typeNode);
     const childName = typeRefName ?? singularClassName(typeText);
     if (childName) {
-      const childNode = buildNestedReference(childName, classFile, ctx, typeArgs);
-      const wrapArray = has("IsArray") || isArrayType;
-      const node2 = wrapArray ? { kind: "array", element: childNode } : childNode;
-      return applyPresence(node2, decorators);
+      return asField(buildNestedReference(childName, classFile, ctx, typeArgs));
     }
   }
   let base = baseFromType(typeText, isArrayType);
@@ -2687,6 +2704,7 @@ function buildNestedReference(className, fromFile, ctx, typeArgs = []) {
   if (ctx.visiting.has(cacheKey)) {
     const reserved = ctx.emittedClasses.get(cacheKey) ?? aliasFor(schemaBase, ctx);
     ctx.emittedClasses.set(cacheKey, reserved);
+    ctx.usedSchemaNames.add(reserved);
     ctx.recursiveSchemas.add(reserved);
     if (!ctx.warnedDecorators.has(`recursive:${reserved}`)) {
       ctx.warnedDecorators.add(`recursive:${reserved}`);
@@ -2720,6 +2738,7 @@ function buildNestedReference(className, fromFile, ctx, typeArgs = []) {
   });
   for (const [k, v] of newBindings) ctx.typeBindings.set(k, v);
   ctx.emittedClasses.set(cacheKey, schemaName);
+  ctx.usedSchemaNames.add(schemaName);
   ctx.visiting.add(cacheKey);
   ctx.depth += 1;
   const childNode = buildObject(resolved.decl, resolved.file, ctx);
@@ -2727,15 +2746,14 @@ function buildNestedReference(className, fromFile, ctx, typeArgs = []) {
   ctx.visiting.delete(cacheKey);
   for (const [k] of newBindings) ctx.typeBindings.delete(k);
   ctx.named.set(schemaName, childNode);
+  ctx.usedSchemaNames.add(schemaName);
   return { kind: "ref", name: schemaName };
 }
 function aliasFor(className, ctx) {
   const baseName = `${className}Schema`;
   let candidate = baseName;
   let i = 1;
-  const used = new Set(ctx.named.keys());
-  for (const v of ctx.emittedClasses.values()) used.add(v);
-  while (used.has(candidate)) {
+  while (ctx.usedSchemaNames.has(candidate)) {
     candidate = `${baseName}_${i}`;
     i += 1;
   }
@@ -4467,8 +4485,42 @@ function renderTsType(node, ctx) {
   }
 }
 
+// src/adapters/chain-module.ts
+function typeNameFor(schemaName) {
+  return schemaName.replace(/Schema(_\d+)?$/, "$1");
+}
+function toObjectKey2(name) {
+  return /^[A-Za-z_$][A-Za-z0-9_$]*$/.test(name) ? name : JSON.stringify(name);
+}
+function createChainModuleRenderer(opts) {
+  const { render, recursiveAnnotation } = opts;
+  return (mod) => {
+    const ctx = { named: mod.named };
+    const recursive = mod.recursive ?? /* @__PURE__ */ new Set();
+    const tctx = { named: mod.named, recursive, typeNameFor };
+    const namedNestedSchemas = /* @__PURE__ */ new Map();
+    const namedTypeAliases = /* @__PURE__ */ new Map();
+    const namedAnnotations = /* @__PURE__ */ new Map();
+    for (const [name, node] of mod.named) {
+      namedNestedSchemas.set(name, render(node, ctx));
+      if (recursive.has(name)) {
+        const typeName = typeNameFor(name);
+        namedTypeAliases.set(name, `type ${typeName} = ${renderTsType(node, tctx)}`);
+        namedAnnotations.set(name, recursiveAnnotation(typeName));
+      }
+    }
+    return {
+      schemaText: render(mod.root, ctx),
+      namedNestedSchemas,
+      namedTypeAliases,
+      namedAnnotations,
+      warnings: mod.warnings
+    };
+  };
+}
+
 // src/index.ts
-var VERSION = "0.5.0";
+var VERSION = "0.5.2";
 export {
   CodegenError,
   ConfigError,
@@ -4476,6 +4528,7 @@ export {
   acquireLock,
   buildMocksFile,
   buildOpenApiSpec,
+  createChainModuleRenderer,
   defineConfig,
   discoverContractsFast,
   emitApi,
@@ -4491,6 +4544,8 @@ export {
   resolveConfig,
   schemaModuleToJsonSchema,
   schemaNodeToJsonSchema,
+  toObjectKey2 as toObjectKey,
+  typeNameFor,
   watch
 };
 //# sourceMappingURL=index.js.map