@dudousxd/nestjs-codegen 0.5.0 → 0.5.2

package/dist/extension/index.d.cts

@@ -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-B0mS84Jj.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-_qRai4M3.cjs';
 import 'ts-morph';

package/dist/extension/index.d.ts

@@ -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-B0mS84Jj.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-_qRai4M3.js';
 import 'ts-morph';

package/dist/{index-B0mS84Jj.d.cts → index-_qRai4M3.d.cts}

@@ -631,4 +631,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 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 };
+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 RenderContext as b, type SchemaModule as c, type RenderedModule as d, type ResolvedFormsConfig as e, type ContractDescriptor as f, type ContractSource as g, type ControllerRef 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-B0mS84Jj.d.ts → index-_qRai4M3.d.ts}

@@ -631,4 +631,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 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 };
+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 RenderContext as b, type SchemaModule as c, type RenderedModule as d, type ResolvedFormsConfig as e, type ContractDescriptor as f, type ContractSource as g, type ControllerRef 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

@@ -36,6 +36,7 @@ __export(src_exports, {
   acquireLock: () => acquireLock,
   buildMocksFile: () => buildMocksFile,
   buildOpenApiSpec: () => buildOpenApiSpec,
+  createChainModuleRenderer: () => createChainModuleRenderer,
   defineConfig: () => defineConfig,
   discoverContractsFast: () => discoverContractsFast,
   emitApi: () => emitApi,
@@ -51,6 +52,8 @@ __export(src_exports, {
   resolveConfig: () => resolveConfig,
   schemaModuleToJsonSchema: () => schemaModuleToJsonSchema,
   schemaNodeToJsonSchema: () => schemaNodeToJsonSchema,
+  toObjectKey: () => toObjectKey2,
+  typeNameFor: () => typeNameFor,
   watch: () => watch
 });
 module.exports = __toCommonJS(src_exports);
@@ -1216,18 +1219,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);
 }
@@ -1239,7 +1251,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);
@@ -1257,11 +1285,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;
       }
     }
@@ -2549,6 +2577,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,
@@ -2576,37 +2605,28 @@ function buildProperty(prop, classFile, ctx) {
   const typeNode = prop.getTypeNode();
   const typeText = typeNode?.getText() ?? "unknown";
   const isArrayType = !!typeNode && import_ts_morph4.Node.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);
@@ -2734,6 +2754,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}`);
@@ -2767,6 +2788,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);
@@ -2774,15 +2796,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;
   }
@@ -4509,8 +4530,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";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   CodegenError,
@@ -4519,6 +4574,7 @@ var VERSION = "0.5.0";
   acquireLock,
   buildMocksFile,
   buildOpenApiSpec,
+  createChainModuleRenderer,
   defineConfig,
   discoverContractsFast,
   emitApi,
@@ -4534,6 +4590,8 @@ var VERSION = "0.5.0";
   resolveConfig,
   schemaModuleToJsonSchema,
   schemaNodeToJsonSchema,
+  toObjectKey,
+  typeNameFor,
   watch
 });
 //# sourceMappingURL=index.cjs.map