@dudousxd/nestjs-codegen 0.5.0 → 0.5.1

package/dist/index.d.cts

@@ -264,6 +264,6 @@ interface FastDiscoveryOptions {
 }
 declare function discoverContractsFast(opts: FastDiscoveryOptions): Promise<RouteDescriptor[]>;
 
-declare const VERSION = "0.5.0";
+declare const VERSION = "0.5.1";
 
 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 };

package/dist/index.d.ts

@@ -264,6 +264,6 @@ interface FastDiscoveryOptions {
 }
 declare function discoverContractsFast(opts: FastDiscoveryOptions): Promise<RouteDescriptor[]>;
 
-declare const VERSION = "0.5.0";
+declare const VERSION = "0.5.1";
 
 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 };

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,
@@ -2687,6 +2713,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 +2747,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 +2755,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;
   }
@@ -4468,7 +4495,7 @@ function renderTsType(node, ctx) {
 }
 
 // src/index.ts
-var VERSION = "0.5.0";
+var VERSION = "0.5.1";
 export {
   CodegenError,
   ConfigError,