@onereach/billing-dto 29.8.0 → 29.8.1-beta.9591.0

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@onereach/billing-dto",
-  "version": "29.8.0",
+  "version": "29.8.1-beta.9591.0",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "module": "dist/esm/index.js",
   "types": "dist/types/index.d.ts",
   "dependencies": {
-    "@onereach/billing-shared": "^29.8.0"
+    "@onereach/billing-shared": "^29.8.1-beta.9591.0"
   },
   "devDependencies": {
     "@types/node": "24.7.2",

package/src/generator/index.ts

@@ -98,6 +98,10 @@ export function runGenerate(config: GenerateDtoConfig) {
     return (parts[0] || '').replace(/^.*\./, '').replace(/<.*>/, '').replace(/\[\]/g, '').trim();
   }
 
+  function normalizeGeneratedType(type: string): string {
+    return type.replace(/\bCircularRelation<([^<>]+)>/g, '$1');
+  }
+
   function emitRequiredImports() {
     for (const [mod, names] of requiredImports.entries()) {
       FILE.addImportDeclaration({
@@ -161,13 +165,13 @@ export function runGenerate(config: GenerateDtoConfig) {
     if (properties?.length) {
       properties.forEach(p => {
         const propertyDec = dec.getProperty(p.name as string) as PropertyDeclaration;
-        const typeText = `${p.type ?? propertyDec.getType().getText()}`;
-        const importDec = findInImports(importsDeclarations, `${p.type}` as string);
+        const typeText = normalizeGeneratedType(`${p.type ?? propertyDec.getType().getText()}`);
+        const importDec = findInImports(importsDeclarations, typeText);
 
         if (importDec) {
           if (isExternalImport(importDec)) {
             // external module, ensure import exists in output
-            const simple = cleanTypeIdent(`${p.type}`);
+            const simple = cleanTypeIdent(typeText);
             const named = (importDec.getStructure().namedImports as ImportSpecifierStructure[] | undefined) || [];
             const match = named.find(n => n.name === simple || n.alias === simple);
             const nameToImport = (match?.alias || match?.name || simple) as string;
@@ -176,7 +180,7 @@ export function runGenerate(config: GenerateDtoConfig) {
             const modSrc = importDec.getModuleSpecifierSourceFile() as SourceFile | undefined;
             if (modSrc) {
               // local file (via path alias or relative). Try to add referenced declaration directly.
-              const simple = cleanTypeIdent(`${p.type}`);
+              const simple = cleanTypeIdent(typeText);
               const en = modSrc.getEnum(simple);
               if (en) {
                 addEnum(en.getStructure());
@@ -255,7 +259,9 @@ export function runGenerate(config: GenerateDtoConfig) {
                   const json = `[${m[1]}]`.replace(/'/g, '"');
                   const arr = JSON.parse(json) as string[];
                   return arr.map(s => `'${s}'`).join('|') || 'never';
-                } catch {}
+                } catch {
+                  // Keep the original key expression when it is not a JSON-compatible tuple.
+                }
               }
               return k;
             };