@dudousxd/nestjs-codegen 0.5.1 → 0.6.0

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);
@@ -2301,7 +2304,6 @@ function resolveImportedType(name, sourceFile, project) {
     if (!namedImport) continue;
     const moduleSpecifier = importDecl.getModuleSpecifierValue();
     const candidates = resolveModuleSpecifier(moduleSpecifier, sourceFile, project);
-    if (candidates.length === 0) continue;
     for (const candidate of candidates) {
       let importedFile = project.getSourceFile(candidate);
       if (!importedFile) {
@@ -2316,9 +2318,25 @@ function resolveImportedType(name, sourceFile, project) {
       const viaReExport = resolveReExportedType(name, importedFile, project, /* @__PURE__ */ new Set());
       if (viaReExport) return viaReExport;
     }
+    if (candidates.length === 0) {
+      const viaCompiler = resolveBareSpecifierType(name, importDecl, project);
+      if (viaCompiler) return viaCompiler;
+    }
   }
   return resolveReExportedType(name, sourceFile, project, /* @__PURE__ */ new Set());
 }
+function resolveBareSpecifierType(name, importDecl, project) {
+  let target;
+  try {
+    target = importDecl.getModuleSpecifierSourceFile();
+  } catch {
+    return null;
+  }
+  if (!target) return null;
+  const direct = findTypeInFile(name, target);
+  if (direct) return direct;
+  return resolveReExportedType(name, target, project, /* @__PURE__ */ new Set());
+}
 function resolveReExportedType(name, file, project, seen) {
   const filePath = file.getFilePath();
   if (seen.has(filePath)) return null;
@@ -2602,37 +2620,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);
@@ -4536,8 +4545,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.1";
+var VERSION = "0.6.0";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   CodegenError,
@@ -4546,6 +4589,7 @@ var VERSION = "0.5.1";
   acquireLock,
   buildMocksFile,
   buildOpenApiSpec,
+  createChainModuleRenderer,
   defineConfig,
   discoverContractsFast,
   emitApi,
@@ -4561,6 +4605,8 @@ var VERSION = "0.5.1";
   resolveConfig,
   schemaModuleToJsonSchema,
   schemaNodeToJsonSchema,
+  toObjectKey,
+  typeNameFor,
   watch
 });
 //# sourceMappingURL=index.cjs.map