type-flash 1.2.9 → 1.3.1

package/README.md

@@ -188,13 +188,13 @@ export interface ApiResponseDataListItem {
 // user.json
 {
   "id": 1,
-  "name": 'Alice',
-  "email": 'alice@example.com',
+  "name": "Alice",
+  "email": "alice@example.com",
   "profile": {
-    "avatar": 'https://example.com/avatar.jpg',
-    "bio": 'Hello World',
+    "avatar": "https://example.com/avatar.jpg",
+    "bio": "Hello World",
   },
-  "tags": ['admin', 'user', 88],
+  "tags": ["admin", "user", 88],
 };
 ```
 
@@ -215,9 +215,6 @@ type-flash -i user.json -s type
 #### 常用选项示例
 
 ```bash
-# 严格空值模式（保留 null 为独立类型）
-type-flash -i user.json --strict-null
-
 # 添加类型前缀/后缀
 type-flash -i user.json --prefix I --suffix DTO -o user.ts
 
@@ -279,7 +276,6 @@ curl.exe https://api.example.com/users | type-flash -n UserList
 | `--naming-style <s>` | 命名风格: `PascalCase` \| `camelCase` | `PascalCase` |
 | `--sort <order>` | 属性排序: `alpha` \| `definition` | `alpha` |
 | `--no-export` | 不添加 export 关键字 | - |
-| `--strict-null` | 严格空值模式（保留 null 类型） | - |
 | `--no-optional` | 不标记可选属性 | - |
 | `--indent <n>` | 缩进空格数 | `2` |
 | `--prefix <prefix>` | 类型名前缀 | - |
@@ -300,7 +296,6 @@ curl.exe https://api.example.com/users | type-flash -n UserList
 | `namingStyle` | `'PascalCase' \| 'camelCase'` | `'PascalCase'` | 生成的类型名命名风格 |
 | `sortProperties` | `'alpha' \| 'definition'` | `'alpha'` | 属性排序方式，字母序或定义序 |
 | `addExport` | `boolean` | `true` | 是否添加 export 关键字 |
-| `strictNullChecks` | `boolean` | `false` | 是否启用严格空值模式，保留 null 为独立类型 |
 | `markOptional` | `boolean` | `true` | 是否自动标记可选属性 |
 | `indentSize` | `number` | `2` | 缩进空格数 |
 | `lineEnding` | `string` | `'\n'` | 行尾换行符 |
@@ -350,8 +345,8 @@ const code = generate(jsonData, {
 ### Q: 生成的类型名为什么是 UserProfile 而不是 Profile？
 A: type-flash 默认会用父级类型名 + 字段名来生成子类型名，避免重名。如果想自定义类型名，可以使用 `typeNameMap` 配置。
 
-### Q: 为什么数组里的 null 被去掉了？
-A: 默认情况下 `strictNullChecks` 为 `false`，会自动移除 null 类型。如果需要保留 null，可以设置 `strictNullChecks: true`。
+### Q: 为什么数组里的 null 会保留？
+A: 联合类型中的 `null` 会如实保留，例如 `(string | null)[]` 或 `string | null`，与 JSON 数据结构一致。
 
 ### Q: 支持循环引用的 JSON 吗？
 A: 支持。type-flash 会自动检测循环引用并生成合法的 type alias，不会出现栈溢出。

package/bin/type-flash.js

@@ -22,7 +22,6 @@ function parseArgs() {
     namingStyle: 'PascalCase',
     sortProperties: 'alpha',
     addExport: true,
-    strictNullChecks: false,
     markOptional: true,
     indentSize: 2,
     typePrefix: '',
@@ -61,9 +60,6 @@ function parseArgs() {
       case '--no-export':
         options.addExport = false;
         break;
-      case '--strict-null':
-        options.strictNullChecks = true;
-        break;
       case '--no-optional':
         options.markOptional = false;
         break;
@@ -110,7 +106,6 @@ type-flash - JSON 智能生成 TypeScript 类型定义
       --naming-style <s>   命名风格: PascalCase | camelCase (默认: PascalCase)
       --sort <order>       属性排序: alpha | definition (默认: alpha)
       --no-export          不添加 export 语句
-      --strict-null        严格空值模式
       --no-optional        不标记可选属性
       --indent <n>         缩进空格数 (默认: 2)
       --prefix <prefix>    类型名前缀
@@ -136,28 +131,27 @@ function showVersion() {
   }
 }
 
-// 读取标准输入
+// 读取标准输入（仅在管道模式下等待数据，TTY 下立即返回空）
 function readStdin() {
   return new Promise((resolve, reject) => {
+    if (process.stdin.isTTY) {
+      resolve('');
+      return;
+    }
+
     let data = '';
     process.stdin.setEncoding('utf-8');
-    
+    process.stdin.resume();
+
     process.stdin.on('data', chunk => {
       data += chunk;
     });
-    
+
     process.stdin.on('end', () => {
       resolve(data);
     });
-    
+
     process.stdin.on('error', reject);
-    
-    // 如果没有输入，超时返回空
-    setTimeout(() => {
-      if (!data) {
-        resolve('');
-      }
-    }, 100);
   });
 }
 
@@ -234,7 +228,6 @@ async function main() {
       namingStyle: options.namingStyle,
       sortProperties: options.sortProperties,
       addExport: options.addExport,
-      strictNullChecks: options.strictNullChecks,
       markOptional: options.markOptional,
       indentSize: options.indentSize,
       typePrefix: options.typePrefix,

package/dist/index.d.mts

@@ -6,7 +6,7 @@
  */
 interface PrimitiveType {
     kind: 'primitive';
-    type: 'string' | 'number' | 'boolean' | 'any' | 'unknown' | 'never' | 'function';
+    type: 'string' | 'number' | 'boolean' | 'any' | 'unknown' | 'never' | 'Function';
 }
 /**
  * 数组类型
@@ -99,8 +99,6 @@ interface GenerateOptions {
     sortProperties?: SortOrder;
     /** 是否添加 export 语句，默认 true */
     addExport?: boolean;
-    /** 是否严格空值（null 单独类型），默认 false */
-    strictNullChecks?: boolean;
     /** 是否将可选属性标记为 ?，默认 true */
     markOptional?: boolean;
     /** 缩进空格数，默认 2 */
@@ -199,7 +197,7 @@ declare class TypeNamer {
      */
     private getTypeKey;
     /**
-     * 获取简单类型 key（用于属性比较）
+     * 获取简单类型 key（用于属性比较，与 typeToKey 保持一致）
      */
     private getSimpleTypeKey;
     /**
@@ -259,10 +257,6 @@ declare class TypeCollector {
      * 获取结构 key（用于去重）
      */
     private getStructKey;
-    /**
-     * 获取属性类型的简化 key
-     */
-    private getPropTypeKey;
 }
 
 /**
@@ -283,6 +277,10 @@ declare class CodeFormatter {
     /** 所有已命名的类型列表（用于查找引用） */
     private allNamedTypes;
     constructor(options: Required<GenerateOptions>, namer: TypeNamer);
+    /** 当前行尾换行符 */
+    private get eol();
+    /** 将多行文本按配置的行尾符连接 */
+    private joinLines;
     /**
      * 查找类型对应的命名（用于对象类型引用）
      */
@@ -363,19 +361,19 @@ declare function mergeTypes(a: TSTypeNode, b: TSTypeNode): TSTypeNode;
 declare function mergeObjects(a: ObjectType, b: ObjectType): ObjectType;
 /**
  * 推断单个值的类型
- * seen 循环缓存参数，默认新建 WeakSet
+ * seen / objectCache 用于循环引用检测与自引用类型占位
  */
-declare function inferType(value: unknown, seen?: WeakSet<object>): TSTypeNode;
+declare function inferType(value: unknown, seen?: WeakSet<object>, objectCache?: WeakMap<object, ObjectType>): TSTypeNode;
 /**
  * 推断数组类型
  * - 统一提取元素类型
  * - 元素类型不一致时生成联合类型
  */
-declare function inferArrayType(arr: unknown[], seen: WeakSet<object>): ArrayType;
+declare function inferArrayType(arr: unknown[], seen: WeakSet<object>, objectCache?: WeakMap<object, ObjectType>): ArrayType;
 /**
  * 推断对象类型
  */
-declare function inferObjectType(obj: Record<string, unknown>, seen: WeakSet<object>): ObjectType;
+declare function inferObjectType(obj: Record<string, unknown>, seen?: WeakSet<object>, objectCache?: WeakMap<object, ObjectType>): ObjectType;
 /**
  * 判断两个类型是否结构等价
  * 用于类型去重与复用
@@ -383,26 +381,21 @@ declare function inferObjectType(obj: Record<string, unknown>, seen: WeakSet<obj
 declare function isStructurallyEqual(a: TSTypeNode, b: TSTypeNode): boolean;
 
 /**
+
  * type-flash - 增强功能模块
+
  *
+
  * 核心功能：
- * - 泛型提取（如 PageResult<T>）
- * - 空值处理
+
  * - 可选属性处理
- */
 
-/**
- * 空值处理器
  */
-declare class NullHandler {
-    private strict;
-    private seen;
-    constructor(strict?: boolean);
-    process(type: TSTypeNode): TSTypeNode;
-    private processRecursive;
-}
+
 /**
+
  * 可选属性处理器
+
  */
 declare class OptionalHandler {
     private markOptional;
@@ -413,7 +406,9 @@ declare class OptionalHandler {
     private processArrayObjects;
 }
 /**
+
  * 应用所有增强功能
+
  */
 declare function applyEnhancements(jsonData: any, type: TSTypeNode, options: GenerateOptions): TSTypeNode;
 
@@ -443,4 +438,4 @@ declare const _default: {
     generateFromString: typeof generateFromString;
 };
 
-export { type ArrayType, CodeFormatter, type GenerateOptions, type GenericType, type NamingStyle, NullHandler, type ObjectType, OptionalHandler, type OutputStyle, type PrimitiveType, type PropertyDef, type SortOrder, type TSTypeNode, TypeCollector, TypeNamer, type UnionType, applyEnhancements, createUnion, _default as default, generate, generateFromString, inferArrayType, inferObjectType, inferType, isStructurallyEqual, mergeObjects, mergeTypes };
+export { type ArrayType, CodeFormatter, type GenerateOptions, type GenericType, type NamingStyle, type ObjectType, OptionalHandler, type OutputStyle, type PrimitiveType, type PropertyDef, type SortOrder, type TSTypeNode, TypeCollector, TypeNamer, type UnionType, applyEnhancements, createUnion, _default as default, generate, generateFromString, inferArrayType, inferObjectType, inferType, isStructurallyEqual, mergeObjects, mergeTypes };

package/dist/index.d.ts

@@ -6,7 +6,7 @@
  */
 interface PrimitiveType {
     kind: 'primitive';
-    type: 'string' | 'number' | 'boolean' | 'any' | 'unknown' | 'never' | 'function';
+    type: 'string' | 'number' | 'boolean' | 'any' | 'unknown' | 'never' | 'Function';
 }
 /**
  * 数组类型
@@ -99,8 +99,6 @@ interface GenerateOptions {
     sortProperties?: SortOrder;
     /** 是否添加 export 语句，默认 true */
     addExport?: boolean;
-    /** 是否严格空值（null 单独类型），默认 false */
-    strictNullChecks?: boolean;
     /** 是否将可选属性标记为 ?，默认 true */
     markOptional?: boolean;
     /** 缩进空格数，默认 2 */
@@ -199,7 +197,7 @@ declare class TypeNamer {
      */
     private getTypeKey;
     /**
-     * 获取简单类型 key（用于属性比较）
+     * 获取简单类型 key（用于属性比较，与 typeToKey 保持一致）
      */
     private getSimpleTypeKey;
     /**
@@ -259,10 +257,6 @@ declare class TypeCollector {
      * 获取结构 key（用于去重）
      */
     private getStructKey;
-    /**
-     * 获取属性类型的简化 key
-     */
-    private getPropTypeKey;
 }
 
 /**
@@ -283,6 +277,10 @@ declare class CodeFormatter {
     /** 所有已命名的类型列表（用于查找引用） */
     private allNamedTypes;
     constructor(options: Required<GenerateOptions>, namer: TypeNamer);
+    /** 当前行尾换行符 */
+    private get eol();
+    /** 将多行文本按配置的行尾符连接 */
+    private joinLines;
     /**
      * 查找类型对应的命名（用于对象类型引用）
      */
@@ -363,19 +361,19 @@ declare function mergeTypes(a: TSTypeNode, b: TSTypeNode): TSTypeNode;
 declare function mergeObjects(a: ObjectType, b: ObjectType): ObjectType;
 /**
  * 推断单个值的类型
- * seen 循环缓存参数，默认新建 WeakSet
+ * seen / objectCache 用于循环引用检测与自引用类型占位
  */
-declare function inferType(value: unknown, seen?: WeakSet<object>): TSTypeNode;
+declare function inferType(value: unknown, seen?: WeakSet<object>, objectCache?: WeakMap<object, ObjectType>): TSTypeNode;
 /**
  * 推断数组类型
  * - 统一提取元素类型
  * - 元素类型不一致时生成联合类型
  */
-declare function inferArrayType(arr: unknown[], seen: WeakSet<object>): ArrayType;
+declare function inferArrayType(arr: unknown[], seen: WeakSet<object>, objectCache?: WeakMap<object, ObjectType>): ArrayType;
 /**
  * 推断对象类型
  */
-declare function inferObjectType(obj: Record<string, unknown>, seen: WeakSet<object>): ObjectType;
+declare function inferObjectType(obj: Record<string, unknown>, seen?: WeakSet<object>, objectCache?: WeakMap<object, ObjectType>): ObjectType;
 /**
  * 判断两个类型是否结构等价
  * 用于类型去重与复用
@@ -383,26 +381,21 @@ declare function inferObjectType(obj: Record<string, unknown>, seen: WeakSet<obj
 declare function isStructurallyEqual(a: TSTypeNode, b: TSTypeNode): boolean;
 
 /**
+
  * type-flash - 增强功能模块
+
  *
+
  * 核心功能：
- * - 泛型提取（如 PageResult<T>）
- * - 空值处理
+
  * - 可选属性处理
- */
 
-/**
- * 空值处理器
  */
-declare class NullHandler {
-    private strict;
-    private seen;
-    constructor(strict?: boolean);
-    process(type: TSTypeNode): TSTypeNode;
-    private processRecursive;
-}
+
 /**
+
  * 可选属性处理器
+
  */
 declare class OptionalHandler {
     private markOptional;
@@ -413,7 +406,9 @@ declare class OptionalHandler {
     private processArrayObjects;
 }
 /**
+
  * 应用所有增强功能
+
  */
 declare function applyEnhancements(jsonData: any, type: TSTypeNode, options: GenerateOptions): TSTypeNode;
 
@@ -443,4 +438,4 @@ declare const _default: {
     generateFromString: typeof generateFromString;
 };
 
-export { type ArrayType, CodeFormatter, type GenerateOptions, type GenericType, type NamingStyle, NullHandler, type ObjectType, OptionalHandler, type OutputStyle, type PrimitiveType, type PropertyDef, type SortOrder, type TSTypeNode, TypeCollector, TypeNamer, type UnionType, applyEnhancements, createUnion, _default as default, generate, generateFromString, inferArrayType, inferObjectType, inferType, isStructurallyEqual, mergeObjects, mergeTypes };
+export { type ArrayType, CodeFormatter, type GenerateOptions, type GenericType, type NamingStyle, type ObjectType, OptionalHandler, type OutputStyle, type PrimitiveType, type PropertyDef, type SortOrder, type TSTypeNode, TypeCollector, TypeNamer, type UnionType, applyEnhancements, createUnion, _default as default, generate, generateFromString, inferArrayType, inferObjectType, inferType, isStructurallyEqual, mergeObjects, mergeTypes };

package/dist/index.js

@@ -1,12 +1,2 @@
-"use strict";var k=Object.defineProperty;var R=Object.getOwnPropertyDescriptor;var D=Object.getOwnPropertyNames;var U=Object.prototype.hasOwnProperty;var M=(n,e)=>{for(var t in e)k(n,t,{get:e[t],enumerable:!0})},G=(n,e,t,r)=>{if(e&&typeof e=="object"||typeof e=="function")for(let i of D(e))!U.call(n,i)&&i!==t&&k(n,i,{get:()=>e[i],enumerable:!(r=R(e,i))||r.enumerable});return n};var K=n=>G(k({},"__esModule",{value:!0}),n);var z={};M(z,{CodeFormatter:()=>y,NullHandler:()=>T,OptionalHandler:()=>g,TypeCollector:()=>f,TypeNamer:()=>c,applyEnhancements:()=>N,createUnion:()=>b,default:()=>q,generate:()=>O,generateFromString:()=>A,inferArrayType:()=>v,inferObjectType:()=>x,inferType:()=>l,isStructurallyEqual:()=>h,mergeObjects:()=>j,mergeTypes:()=>d});module.exports=K(z);var $={rootName:"Root",outputStyle:"interface",namingStyle:"PascalCase",sortProperties:"alpha",addExport:!0,strictNullChecks:!1,markOptional:!0,indentSize:2,lineEnding:`
-`,typeNameMap:{},typePrefix:"",typeSuffix:""};function m(n){return{kind:"primitive",type:n}}function E(){return{kind:"null"}}function L(){return{kind:"undefined"}}function _(n){return{kind:"array",elementType:n}}function P(n=[]){return{kind:"object",properties:n}}function b(n){let e=[],t=new Set;for(let r of n)if(r.kind==="union")for(let i of r.types){let o=a(i);t.has(o)||(t.add(o),e.push(i))}else{let i=a(r);t.has(i)||(t.add(i),e.push(r))}return e.length===1?e[0]:{kind:"union",types:e}}function a(n){switch(n.kind){case"primitive":return`primitive:${n.type}`;case"null":return"null";case"undefined":return"undefined";case"literal":return`literal:${typeof n.value}:${String(n.value)}`;case"array":return`array:${a(n.elementType)}`;case"object":return`object:${n.properties.map(e=>`${e.name}:${a(e.type)}:${e.optional}`).join(",")}`;case"union":return`union:${n.types.map(a).sort().join("|")}`;case"generic":return`generic:${n.name}:${n.typeArgs.map(a).join(",")}`;default:return"unknown"}}function d(n,e){return a(n)===a(e)?n:n.kind==="object"&&e.kind==="object"?j(n,e):n.kind==="array"&&e.kind==="array"?_(d(n.elementType,e.elementType)):b([n,e])}function j(n,e){let t=new Map;for(let r of n.properties)t.set(r.name,{...r});for(let r of e.properties){let i=t.get(r.name);i?(i.type=d(i.type,r.type),i.optional=i.optional||r.optional):t.set(r.name,{...r,optional:!0})}for(let[r,i]of t)e.properties.some(s=>s.name===r)||(i.optional=!0);return P(Array.from(t.values()))}function l(n,e=new WeakSet){if(n===null)return E();if(n===void 0)return L();if(typeof n=="function")return m("function");if(typeof n=="string")return m("string");if(typeof n=="number")return m("number");if(typeof n=="boolean")return m("boolean");if(Array.isArray(n))return v(n,e);if(typeof n=="object"&&n!==null){let t=n;if(e.has(t))return{kind:"object",properties:[]};e.add(t);let r=x(t,e);return e.delete(t),r}return m("unknown")}function v(n,e){if(n.length===0)return{kind:"array",elementType:{kind:"primitive",type:"any"}};let t=n.map(i=>l(i,e)),r=t[0];for(let i=1;i<t.length;i++)r=d(r,t[i]);return{kind:"array",elementType:r}}function x(n,e){let t=[];for(let[r,i]of Object.entries(n)){let o=l(i,e);t.push({name:r,type:o,optional:!1})}return P(t)}function h(n,e){return a(n)===a(e)}function u(n,e=new WeakMap){if(e.has(n))return e.get(n);let t;switch(n.kind){case"primitive":return t={kind:"primitive",type:n.type},e.set(n,t),t;case"null":return t={kind:"null"},e.set(n,t),t;case"undefined":return t={kind:"undefined"},e.set(n,t),t;case"literal":return t={kind:"literal",value:n.value},e.set(n,t),t;case"array":return t={kind:"array",elementType:{}},e.set(n,t),t.elementType=u(n.elementType,e),t;case"object":return t={kind:"object",properties:[],isRecord:n.isRecord,valueType:n.valueType},e.set(n,t),t.properties=n.properties.map(r=>({name:r.name,optional:r.optional,type:u(r.type,e)})),n.valueType&&(t.valueType=u(n.valueType,e)),t;case"union":return t={kind:"union",types:[]},e.set(n,t),t.types=n.types.map(r=>u(r,e)),t;case"generic":return t={kind:"generic",name:n.name,typeArgs:[]},e.set(n,t),t.typeArgs=n.typeArgs.map(r=>u(r,e)),t;default:return t={kind:"primitive",type:"unknown"},e.set(n,t),t}}var c=class{constructor(e={}){this.namedTypes=new Map;this.nameCounter=new Map;this.processing=new WeakSet;this.circularRefs=new Map;this.namingStyle=e.namingStyle||"PascalCase",this.prefix=e.prefix||"",this.suffix=e.suffix||"",this.customNameMap=e.customNameMap||{}}nameType(e,t={depth:0}){if(e.kind!=="object")return null;let r=this.buildPathKey(t);if(this.customNameMap[r])return this.applyAffixes(this.customNameMap[r]);let i=this.getTypeKey(e);if(this.namedTypes.has(i))return this.namedTypes.get(i);let o=this.generateName(e,t);return o=this.formatName(o),o=this.ensureUniqueName(o),o=this.applyAffixes(o),this.namedTypes.set(i,o),o}generateName(e,t){if(e.kind==="object"){if(t.fieldName){let r=this.toPascalCase(t.fieldName);return t.parentName?`${t.parentName}${r}`:r}return t.parentName?`${t.parentName}Item`:"AnonymousObject"}return"UnknownType"}ensureUniqueName(e){let t=this.nameCounter.get(e)||0;if(t===0)return this.nameCounter.set(e,1),e;let r=`${e}${t+1}`;return this.nameCounter.set(e,t+1),r}applyAffixes(e){let t=e;return this.prefix&&(t=this.toPascalCase(this.prefix)+t),this.suffix&&(t=t+this.toPascalCase(this.suffix)),t}buildPathKey(e){return e.path||""}getTypeKey(e){return e.kind==="object"?`object:${e.properties.map(t=>`${t.name}:${this.getSimpleTypeKey(t.type)}:${t.optional}`).sort().join(",")}`:e.kind}getSimpleTypeKey(e){switch(e.kind){case"primitive":return e.type;case"null":return"null";case"undefined":return"undefined";case"array":return`array<${this.getSimpleTypeKey(e.elementType)}>`;case"object":return"object";case"union":return e.types.map(t=>this.getSimpleTypeKey(t)).sort().join("|");case"generic":return`generic:${e.name}`;default:return"unknown"}}toPascalCase(e){return e?e.replace(/[-_\s]+/g," ").replace(/([a-z])([A-Z])/g,"$1 $2").trim().split(" ").filter(Boolean).map(r=>r.charAt(0).toUpperCase()+r.slice(1).toLowerCase()).join(""):""}toCamelCase(e){let t=this.toPascalCase(e);return t.charAt(0).toLowerCase()+t.slice(1)}formatName(e){return this.namingStyle==="camelCase"?this.toCamelCase(e):this.toPascalCase(e)}isCircular(e){return this.processing.has(e)}markProcessing(e){this.processing.add(e)}unmarkProcessing(e){this.processing.delete(e)}getAllNamedTypes(){return new Map(this.namedTypes)}reset(){this.namedTypes.clear(),this.nameCounter.clear(),this.processing=new WeakSet,this.circularRefs.clear()}},f=class{constructor(e){this.collected=[];this.seenStructs=new Set;this.namer=e}collect(e,t){this.collected=[],this.seenStructs.clear(),this.namer.reset(),this.collectRecursive(e,{fieldName:t,parentName:void 0,path:t,depth:0});let r=this.collected.find(o=>o.name===t),i=this.collected.filter(o=>o.name!==t);return r?[r,...i]:this.collected}collectRecursive(e,t){let r=this.getStructKey(e);if(e.kind==="object"){let i=this.namer.nameType(e,t);if(i&&!this.seenStructs.has(r)){this.seenStructs.add(r),this.collected.push({name:i,type:u(e)});for(let o of e.properties)this.collectRecursive(o.type,{fieldName:o.name,parentName:i,path:t.path?`${t.path}.${o.name}`:o.name,depth:t.depth+1})}return}if(e.kind==="array"){this.collectRecursive(e.elementType,{fieldName:t.fieldName?t.fieldName+"Item":void 0,parentName:t.parentName,path:t.path,depth:t.depth+1});return}if(e.kind==="union"){for(let i of e.types)this.collectRecursive(i,t);return}if(e.kind==="generic"){for(let i of e.typeArgs)this.collectRecursive(i,{...t,depth:t.depth+1});return}}getStructKey(e){return e.kind==="object"?`object:${e.properties.map(t=>`${t.name}:${this.getPropTypeKey(t.type)}:${t.optional}`).sort().join("|")}`:e.kind}getPropTypeKey(e){switch(e.kind){case"primitive":return e.type;case"null":return"null";case"undefined":return"undefined";case"array":return`array:${this.getPropTypeKey(e.elementType)}`;case"object":return"object";case"union":return e.types.map(t=>this.getPropTypeKey(t)).sort().join("|");case"generic":return`generic:${e.name}`;default:return"unknown"}}};var y=class{constructor(e,t){this.allNamedTypes=[];this.options=e,this.namer=t}findTypeName(e){if(e.kind!=="object")return null;for(let t of this.allNamedTypes)if(h(t.type,e))return t.name;return null}formatTypeDef(e){let{name:t,type:r}=e,i=this.options.addExport?"export ":"";return this.formatObjectType(t,r,i)}formatObjectType(e,t,r){let i=" ".repeat(this.options.indentSize),o=this.sortProperties(t.properties),s=[];this.options.outputStyle==="interface"?s.push(`${r}interface ${e} {`):s.push(`${r}type ${e} = {`);for(let p of o){let S=this.formatPropertyName(p.name),w=p.optional?"?":"",C=this.formatType(p.type);s.push(`${i}${S}${w}: ${C};`)}return this.options.outputStyle==="interface"?s.push("}"):s.push("};"),s.join(`
-`)}formatType(e){if(e.kind==="object"){let t=this.findTypeName(e);if(t)return t}switch(e.kind){case"primitive":return e.type;case"null":return"null";case"undefined":return"undefined";case"array":return this.formatArrayType(e);case"object":return this.formatInlineObject(e);case"union":return this.formatUnionType(e.types);case"literal":return this.formatLiteral(e.value);case"generic":return`${e.name}<${e.typeArgs.map(t=>this.formatType(t)).join(", ")}>`;default:return"unknown"}}formatLiteral(e){return typeof e=="string"?`'${e}'`:String(e)}formatArrayType(e){let t=this.formatType(e.elementType);return e.elementType.kind==="union"?`(${t})[]`:`${t}[]`}formatInlineObject(e){let t=" ".repeat(this.options.indentSize),r=this.sortProperties(e.properties);if(r.length===0)return"{}";let i=["{"];for(let o of r){let s=this.formatPropertyName(o.name),p=o.optional?"?":"",S=this.formatType(o.type);i.push(`${t}${s}${p}: ${S};`)}return i.push("}"),i.join(`
-`)}formatUnionType(e){return e.map(t=>this.formatType(t)).join(" | ")}formatPropertyName(e){return/^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(e)?e:`'${e}'`}sortProperties(e){return this.options.sortProperties==="definition"?[...e]:[...e].sort((t,r)=>t.name.localeCompare(r.name))}formatAll(e){return this.allNamedTypes=e,e.map(t=>this.formatTypeDef(t)).join(`
-
-`)}generateOutput(e,t){let r=`/**
- * Generated by type-flash
- * Root type: ${t}
- */`,i=this.formatAll(e);return`${r}
-
-${i}
-`}};var T=class{constructor(e=!1){this.seen=new WeakSet;this.strict=e}process(e){return this.processRecursive(e)}processRecursive(e){if(this.strict)return e;if(e.kind==="union"){let t=e.types.filter(r=>r.kind!=="null");return t.length===0?{kind:"null"}:t.length===1?t[0]:{...e,types:t.map(r=>this.processRecursive(r))}}if(e.kind==="array")return{...e,elementType:this.processRecursive(e.elementType)};if(e.kind==="object"){if(this.seen.has(e))return e;this.seen.add(e);let t={...e,properties:e.properties.map(r=>({...r,type:this.processRecursive(r.type)}))};return this.seen.delete(e),t}return e}},g=class{constructor(e=!0){this.seen=new WeakSet;this.markOptional=e}process(e,t){return this.markOptional?this.processRecursive(e,t):t}processRecursive(e,t){if(t.kind==="array"&&Array.isArray(e)){let r=t.elementType;if(r.kind==="object"){let i=this.processArrayObjects(e,r);return{...t,elementType:i}}return{...t,elementType:this.processRecursive(e,r)}}if(t.kind==="object"&&e&&typeof e=="object"){if(this.seen.has(t))return t;this.seen.add(t);let r=t.properties.map(i=>({...i,type:this.processRecursive(e[i.name],i.type)}));return this.seen.delete(t),{...t,properties:r}}return t.kind==="union"&&Array.isArray(e)?{...t,types:t.types.map(r=>this.processRecursive(e,r))}:t}processArrayObjects(e,t){if(e.length<=1)return t;let r={},i=e.length;for(let o of e)if(o&&typeof o=="object")for(let s of Object.keys(o))r[s]=(r[s]||0)+1;return{...t,properties:t.properties.map(o=>{let p=(r[o.name]||0)<i;return{...o,optional:p}})}}};function N(n,e,t){let r=e;return t.markOptional&&(r=new g(t.markOptional).process(n,r)),r=new T(t.strictNullChecks).process(r),r}function O(n,e={}){let t={...$,...e},r=l(n);r=N(n,r,t);let i=new c({namingStyle:t.namingStyle,prefix:t.typePrefix,suffix:t.typeSuffix,customNameMap:t.typeNameMap}),s=new f(i).collect(r,t.rootName);return new y(t,i).generateOutput(s,t.rootName)}function A(n,e={}){let t=JSON.parse(n);return O(t,e)}var q={generate:O,generateFromString:A};0&&(module.exports={CodeFormatter,NullHandler,OptionalHandler,TypeCollector,TypeNamer,applyEnhancements,createUnion,generate,generateFromString,inferArrayType,inferObjectType,inferType,isStructurallyEqual,mergeObjects,mergeTypes});
+"use strict";var S=Object.defineProperty;var R=Object.getOwnPropertyDescriptor;var C=Object.getOwnPropertyNames;var D=Object.prototype.hasOwnProperty;var M=(r,e)=>{for(var t in e)S(r,t,{get:e[t],enumerable:!0})},U=(r,e,t,n)=>{if(e&&typeof e=="object"||typeof e=="function")for(let i of C(e))!D.call(r,i)&&i!==t&&S(r,i,{get:()=>e[i],enumerable:!(n=R(e,i))||n.enumerable});return r};var E=r=>U(S({},"__esModule",{value:!0}),r);var q={};M(q,{CodeFormatter:()=>m,OptionalHandler:()=>g,TypeCollector:()=>y,TypeNamer:()=>f,applyEnhancements:()=>N,createUnion:()=>k,default:()=>_,generate:()=>O,generateFromString:()=>A,inferArrayType:()=>j,inferObjectType:()=>$,inferType:()=>l,isStructurallyEqual:()=>h,mergeObjects:()=>b,mergeTypes:()=>d});module.exports=E(q);var x={rootName:"Root",outputStyle:"interface",namingStyle:"PascalCase",sortProperties:"alpha",addExport:!0,markOptional:!0,indentSize:2,lineEnding:`
+`,typeNameMap:{},typePrefix:"",typeSuffix:""};function u(r){return{kind:"primitive",type:r}}function G(){return{kind:"null"}}function L(){return{kind:"undefined"}}function W(r){return{kind:"array",elementType:r}}function v(r=[]){return{kind:"object",properties:r}}function k(r){let e=[],t=new Set;for(let n of r)if(n.kind==="union")for(let i of n.types){let o=p(i);t.has(o)||(t.add(o),e.push(i))}else{let i=p(n);t.has(i)||(t.add(i),e.push(n))}return e.length===1?e[0]:{kind:"union",types:e}}function p(r,e=new Set){if(e.has(r))return"circular";switch(r.kind){case"primitive":return`primitive:${r.type}`;case"null":return"null";case"undefined":return"undefined";case"literal":return`literal:${typeof r.value}:${String(r.value)}`;case"array":return`array:${p(r.elementType,e)}`;case"object":{e.add(r);let t=`object:${r.properties.map(n=>`${n.name}:${p(n.type,e)}:${n.optional}`).sort().join(",")}`;return e.delete(r),t}case"union":return`union:${r.types.map(t=>p(t,e)).sort().join("|")}`;case"generic":return`generic:${r.name}:${r.typeArgs.map(t=>p(t,e)).join(",")}`;default:return"unknown"}}function d(r,e){return p(r)===p(e)?r:r.kind==="object"&&e.kind==="object"?b(r,e):r.kind==="array"&&e.kind==="array"?W(d(r.elementType,e.elementType)):k([r,e])}function b(r,e){let t=new Map;for(let n of r.properties)t.set(n.name,{...n});for(let n of e.properties){let i=t.get(n.name);i?(i.type=d(i.type,n.type),i.optional=i.optional||n.optional):t.set(n.name,{...n,optional:!0})}for(let[n,i]of t)e.properties.some(s=>s.name===n)||(i.optional=!0);return v(Array.from(t.values()))}function K(r){if(r instanceof Date||r instanceof RegExp||typeof Buffer!="undefined"&&Buffer.isBuffer(r))return u("string");let e=Object.prototype.toString.call(r);return e==="[object Date]"||e==="[object RegExp]"?u("string"):e==="[object Map]"||e==="[object Set]"||e==="[object WeakMap]"||e==="[object WeakSet]"?u("unknown"):null}function l(r,e=new WeakSet,t=new WeakMap){if(r===null)return G();if(r===void 0)return L();if(typeof r=="function")return u("Function");if(typeof r=="string")return u("string");if(typeof r=="number")return u("number");if(typeof r=="boolean")return u("boolean");if(Array.isArray(r))return j(r,e,t);if(typeof r=="object"&&r!==null){let n=K(r);if(n)return n;let i=r;if(e.has(i)){let a=t.get(i);if(a)return a}e.add(i);let o=v([]);t.set(i,o);let s=[];for(let[a,T]of Object.entries(i))s.push({name:a,type:l(T,e,t),optional:!1});return o.properties=s,e.delete(i),o}return u("unknown")}function j(r,e,t=new WeakMap){if(r.length===0)return{kind:"array",elementType:{kind:"primitive",type:"unknown"}};let n=r.map(o=>l(o,e,t)),i=n[0];for(let o=1;o<n.length;o++)i=d(i,n[o]);return{kind:"array",elementType:i}}function $(r,e=new WeakSet,t=new WeakMap){return l(r,e,t)}function h(r,e){return r===e?!0:p(r)===p(e)}function c(r,e=new WeakMap){if(e.has(r))return e.get(r);let t;switch(r.kind){case"primitive":return t={kind:"primitive",type:r.type},e.set(r,t),t;case"null":return t={kind:"null"},e.set(r,t),t;case"undefined":return t={kind:"undefined"},e.set(r,t),t;case"literal":return t={kind:"literal",value:r.value},e.set(r,t),t;case"array":return t={kind:"array",elementType:{}},e.set(r,t),t.elementType=c(r.elementType,e),t;case"object":return t={kind:"object",properties:[],isRecord:r.isRecord,valueType:r.valueType},e.set(r,t),t.properties=r.properties.map(n=>({name:n.name,optional:n.optional,type:c(n.type,e)})),r.valueType&&(t.valueType=c(r.valueType,e)),t;case"union":return t={kind:"union",types:[]},e.set(r,t),t.types=r.types.map(n=>c(n,e)),t;case"generic":return t={kind:"generic",name:r.name,typeArgs:[]},e.set(r,t),t.typeArgs=r.typeArgs.map(n=>c(n,e)),t;default:return t={kind:"primitive",type:"unknown"},e.set(r,t),t}}var f=class{constructor(e={}){this.namedTypes=new Map;this.nameCounter=new Map;this.processing=new WeakSet;this.circularRefs=new Map;this.namingStyle=e.namingStyle||"PascalCase",this.prefix=e.prefix||"",this.suffix=e.suffix||"",this.customNameMap=e.customNameMap||{}}nameType(e,t={depth:0}){if(e.kind!=="object")return null;let n=this.buildPathKey(t);if(this.customNameMap[n])return this.applyAffixes(this.customNameMap[n]);let i=this.getTypeKey(e);if(this.namedTypes.has(i))return this.namedTypes.get(i);let o=this.generateName(e,t);return o=this.formatName(o),o=this.ensureUniqueName(o),o=this.applyAffixes(o),this.namedTypes.set(i,o),o}generateName(e,t){if(e.kind==="object"){if(t.fieldName){let n=this.toPascalCase(t.fieldName);return t.parentName?`${t.parentName}${n}`:n}return t.parentName?`${t.parentName}Item`:"AnonymousObject"}return"UnknownType"}ensureUniqueName(e){let t=this.nameCounter.get(e)||0;if(t===0)return this.nameCounter.set(e,1),e;let n=`${e}${t+1}`;return this.nameCounter.set(e,t+1),n}applyAffixes(e){let t=e;return this.prefix&&(t=this.toPascalCase(this.prefix)+t),this.suffix&&(t=t+this.toPascalCase(this.suffix)),t}buildPathKey(e){return e.path||""}getTypeKey(e){return p(e)}getSimpleTypeKey(e){return p(e)}toPascalCase(e){return e?e.replace(/[-_\s]+/g," ").replace(/([a-z])([A-Z])/g,"$1 $2").trim().split(" ").filter(Boolean).map(n=>n.charAt(0).toUpperCase()+n.slice(1).toLowerCase()).join(""):""}toCamelCase(e){let t=this.toPascalCase(e);return t.charAt(0).toLowerCase()+t.slice(1)}formatName(e){return this.namingStyle==="camelCase"?this.toCamelCase(e):this.toPascalCase(e)}isCircular(e){return this.processing.has(e)}markProcessing(e){this.processing.add(e)}unmarkProcessing(e){this.processing.delete(e)}getAllNamedTypes(){return new Map(this.namedTypes)}reset(){this.namedTypes.clear(),this.nameCounter.clear(),this.processing=new WeakSet,this.circularRefs.clear()}},y=class{constructor(e){this.collected=[];this.seenStructs=new Set;this.namer=e}collect(e,t){this.collected=[],this.seenStructs.clear(),this.namer.reset(),this.collectRecursive(e,{fieldName:t,parentName:void 0,path:t,depth:0});let n=this.collected.find(o=>o.name===t),i=this.collected.filter(o=>o.name!==t);return n?[n,...i]:this.collected}collectRecursive(e,t){let n=this.getStructKey(e);if(e.kind==="object"){let i=this.namer.nameType(e,t);if(i&&!this.seenStructs.has(n)){this.seenStructs.add(n),this.collected.push({name:i,type:c(e)});for(let o of e.properties)this.collectRecursive(o.type,{fieldName:o.name,parentName:i,path:t.path?`${t.path}.${o.name}`:o.name,depth:t.depth+1})}return}if(e.kind==="array"){this.collectRecursive(e.elementType,{fieldName:t.fieldName?t.fieldName+"Item":void 0,parentName:t.parentName,path:t.path,depth:t.depth+1});return}if(e.kind==="union"){for(let i of e.types)this.collectRecursive(i,t);return}if(e.kind==="generic"){for(let i of e.typeArgs)this.collectRecursive(i,{...t,depth:t.depth+1});return}}getStructKey(e){return p(e)}};var m=class{constructor(e,t){this.allNamedTypes=[];this.options=e,this.namer=t}get eol(){return this.options.lineEnding}joinLines(e){return e.join(this.eol)}findTypeName(e){if(e.kind!=="object")return null;for(let t of this.allNamedTypes)if(t.type===e||h(t.type,e))return t.name;return null}formatTypeDef(e){let{name:t,type:n}=e,i=this.options.addExport?"export ":"";return this.formatObjectType(t,n,i)}formatObjectType(e,t,n){let i=" ".repeat(this.options.indentSize),o=this.sortProperties(t.properties),s=[];this.options.outputStyle==="interface"?s.push(`${n}interface ${e} {`):s.push(`${n}type ${e} = {`);for(let a of o){let T=this.formatPropertyName(a.name),P=a.optional?"?":"",w=this.formatType(a.type);s.push(`${i}${T}${P}: ${w};`)}return this.options.outputStyle==="interface"?s.push("}"):s.push("};"),this.joinLines(s)}formatType(e){if(e.kind==="object"){let t=this.findTypeName(e);if(t)return t}switch(e.kind){case"primitive":return e.type;case"null":return"null";case"undefined":return"undefined";case"array":return this.formatArrayType(e);case"object":return this.formatInlineObject(e);case"union":return this.formatUnionType(e.types);case"literal":return this.formatLiteral(e.value);case"generic":return`${e.name}<${e.typeArgs.map(t=>this.formatType(t)).join(", ")}>`;default:return"unknown"}}formatLiteral(e){return typeof e=="string"?`'${e}'`:String(e)}formatArrayType(e){let t=this.formatType(e.elementType);return e.elementType.kind==="union"?`(${t})[]`:`${t}[]`}formatInlineObject(e){let t=" ".repeat(this.options.indentSize),n=this.sortProperties(e.properties);if(n.length===0)return"{}";let i=["{"];for(let o of n){let s=this.formatPropertyName(o.name),a=o.optional?"?":"",T=this.formatType(o.type);i.push(`${t}${s}${a}: ${T};`)}return i.push("}"),this.joinLines(i)}formatUnionType(e){return e.map(t=>this.formatType(t)).join(" | ")}formatPropertyName(e){return/^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(e)?e:`'${e}'`}sortProperties(e){return this.options.sortProperties==="definition"?[...e]:[...e].sort((t,n)=>t.name.localeCompare(n.name))}formatAll(e){return this.allNamedTypes=e,e.map(t=>this.formatTypeDef(t)).join(`${this.eol}${this.eol}`)}generateOutput(e,t){let n=this.joinLines(["/**"," * Generated by type-flash",` * Root type: ${t}`," */"]),i=this.formatAll(e);return`${n}${this.eol}${this.eol}${i}${this.eol}`}};var g=class{constructor(e=!0){this.seen=new WeakSet;this.markOptional=e}process(e,t){return this.markOptional?this.processRecursive(e,t):t}processRecursive(e,t){if(t.kind==="array"&&Array.isArray(e)){let n=t.elementType;if(n.kind==="object"){let i=this.processArrayObjects(e,n);return{...t,elementType:i}}return{...t,elementType:this.processRecursive(e,n)}}if(t.kind==="object"&&e&&typeof e=="object"){if(this.seen.has(t))return t;this.seen.add(t);let n={...t,properties:t.properties.map(i=>i.type===t?{...i}:{...i,type:this.processRecursive(e[i.name],i.type)})};for(let i of n.properties)i.type===t&&(i.type=n);return this.seen.delete(t),n}return t.kind==="union"&&Array.isArray(e)?{...t,types:t.types.map(n=>this.processRecursive(e,n))}:t}processArrayObjects(e,t){if(e.length<=1)return t;let n={},i=e.length;for(let o of e)if(o&&typeof o=="object")for(let s of Object.keys(o))n[s]=(n[s]||0)+1;return{...t,properties:t.properties.map(o=>{let a=(n[o.name]||0)<i;return{...o,optional:a}})}}};function N(r,e,t){return t.markOptional?new g(t.markOptional).process(r,e):e}function O(r,e={}){let t={...x,...e},n=l(r);n=N(r,n,t);let i=new f({namingStyle:t.namingStyle,prefix:t.typePrefix,suffix:t.typeSuffix,customNameMap:t.typeNameMap}),s=new y(i).collect(n,t.rootName);return new m(t,i).generateOutput(s,t.rootName)}function A(r,e={}){let t=JSON.parse(r);return O(t,e)}var _={generate:O,generateFromString:A};0&&(module.exports={CodeFormatter,OptionalHandler,TypeCollector,TypeNamer,applyEnhancements,createUnion,generate,generateFromString,inferArrayType,inferObjectType,inferType,isStructurallyEqual,mergeObjects,mergeTypes});

package/dist/index.mjs

@@ -1,12 +1,2 @@
-var k={rootName:"Root",outputStyle:"interface",namingStyle:"PascalCase",sortProperties:"alpha",addExport:!0,strictNullChecks:!1,markOptional:!0,indentSize:2,lineEnding:`
-`,typeNameMap:{},typePrefix:"",typeSuffix:""};function l(n){return{kind:"primitive",type:n}}function w(){return{kind:"null"}}function C(){return{kind:"undefined"}}function R(n){return{kind:"array",elementType:n}}function b(n=[]){return{kind:"object",properties:n}}function j(n){let e=[],t=new Set;for(let r of n)if(r.kind==="union")for(let i of r.types){let o=a(i);t.has(o)||(t.add(o),e.push(i))}else{let i=a(r);t.has(i)||(t.add(i),e.push(r))}return e.length===1?e[0]:{kind:"union",types:e}}function a(n){switch(n.kind){case"primitive":return`primitive:${n.type}`;case"null":return"null";case"undefined":return"undefined";case"literal":return`literal:${typeof n.value}:${String(n.value)}`;case"array":return`array:${a(n.elementType)}`;case"object":return`object:${n.properties.map(e=>`${e.name}:${a(e.type)}:${e.optional}`).join(",")}`;case"union":return`union:${n.types.map(a).sort().join("|")}`;case"generic":return`generic:${n.name}:${n.typeArgs.map(a).join(",")}`;default:return"unknown"}}function d(n,e){return a(n)===a(e)?n:n.kind==="object"&&e.kind==="object"?v(n,e):n.kind==="array"&&e.kind==="array"?R(d(n.elementType,e.elementType)):j([n,e])}function v(n,e){let t=new Map;for(let r of n.properties)t.set(r.name,{...r});for(let r of e.properties){let i=t.get(r.name);i?(i.type=d(i.type,r.type),i.optional=i.optional||r.optional):t.set(r.name,{...r,optional:!0})}for(let[r,i]of t)e.properties.some(s=>s.name===r)||(i.optional=!0);return b(Array.from(t.values()))}function c(n,e=new WeakSet){if(n===null)return w();if(n===void 0)return C();if(typeof n=="function")return l("function");if(typeof n=="string")return l("string");if(typeof n=="number")return l("number");if(typeof n=="boolean")return l("boolean");if(Array.isArray(n))return x(n,e);if(typeof n=="object"&&n!==null){let t=n;if(e.has(t))return{kind:"object",properties:[]};e.add(t);let r=O(t,e);return e.delete(t),r}return l("unknown")}function x(n,e){if(n.length===0)return{kind:"array",elementType:{kind:"primitive",type:"any"}};let t=n.map(i=>c(i,e)),r=t[0];for(let i=1;i<t.length;i++)r=d(r,t[i]);return{kind:"array",elementType:r}}function O(n,e){let t=[];for(let[r,i]of Object.entries(n)){let o=c(i,e);t.push({name:r,type:o,optional:!1})}return b(t)}function N(n,e){return a(n)===a(e)}function u(n,e=new WeakMap){if(e.has(n))return e.get(n);let t;switch(n.kind){case"primitive":return t={kind:"primitive",type:n.type},e.set(n,t),t;case"null":return t={kind:"null"},e.set(n,t),t;case"undefined":return t={kind:"undefined"},e.set(n,t),t;case"literal":return t={kind:"literal",value:n.value},e.set(n,t),t;case"array":return t={kind:"array",elementType:{}},e.set(n,t),t.elementType=u(n.elementType,e),t;case"object":return t={kind:"object",properties:[],isRecord:n.isRecord,valueType:n.valueType},e.set(n,t),t.properties=n.properties.map(r=>({name:r.name,optional:r.optional,type:u(r.type,e)})),n.valueType&&(t.valueType=u(n.valueType,e)),t;case"union":return t={kind:"union",types:[]},e.set(n,t),t.types=n.types.map(r=>u(r,e)),t;case"generic":return t={kind:"generic",name:n.name,typeArgs:[]},e.set(n,t),t.typeArgs=n.typeArgs.map(r=>u(r,e)),t;default:return t={kind:"primitive",type:"unknown"},e.set(n,t),t}}var f=class{constructor(e={}){this.namedTypes=new Map;this.nameCounter=new Map;this.processing=new WeakSet;this.circularRefs=new Map;this.namingStyle=e.namingStyle||"PascalCase",this.prefix=e.prefix||"",this.suffix=e.suffix||"",this.customNameMap=e.customNameMap||{}}nameType(e,t={depth:0}){if(e.kind!=="object")return null;let r=this.buildPathKey(t);if(this.customNameMap[r])return this.applyAffixes(this.customNameMap[r]);let i=this.getTypeKey(e);if(this.namedTypes.has(i))return this.namedTypes.get(i);let o=this.generateName(e,t);return o=this.formatName(o),o=this.ensureUniqueName(o),o=this.applyAffixes(o),this.namedTypes.set(i,o),o}generateName(e,t){if(e.kind==="object"){if(t.fieldName){let r=this.toPascalCase(t.fieldName);return t.parentName?`${t.parentName}${r}`:r}return t.parentName?`${t.parentName}Item`:"AnonymousObject"}return"UnknownType"}ensureUniqueName(e){let t=this.nameCounter.get(e)||0;if(t===0)return this.nameCounter.set(e,1),e;let r=`${e}${t+1}`;return this.nameCounter.set(e,t+1),r}applyAffixes(e){let t=e;return this.prefix&&(t=this.toPascalCase(this.prefix)+t),this.suffix&&(t=t+this.toPascalCase(this.suffix)),t}buildPathKey(e){return e.path||""}getTypeKey(e){return e.kind==="object"?`object:${e.properties.map(t=>`${t.name}:${this.getSimpleTypeKey(t.type)}:${t.optional}`).sort().join(",")}`:e.kind}getSimpleTypeKey(e){switch(e.kind){case"primitive":return e.type;case"null":return"null";case"undefined":return"undefined";case"array":return`array<${this.getSimpleTypeKey(e.elementType)}>`;case"object":return"object";case"union":return e.types.map(t=>this.getSimpleTypeKey(t)).sort().join("|");case"generic":return`generic:${e.name}`;default:return"unknown"}}toPascalCase(e){return e?e.replace(/[-_\s]+/g," ").replace(/([a-z])([A-Z])/g,"$1 $2").trim().split(" ").filter(Boolean).map(r=>r.charAt(0).toUpperCase()+r.slice(1).toLowerCase()).join(""):""}toCamelCase(e){let t=this.toPascalCase(e);return t.charAt(0).toLowerCase()+t.slice(1)}formatName(e){return this.namingStyle==="camelCase"?this.toCamelCase(e):this.toPascalCase(e)}isCircular(e){return this.processing.has(e)}markProcessing(e){this.processing.add(e)}unmarkProcessing(e){this.processing.delete(e)}getAllNamedTypes(){return new Map(this.namedTypes)}reset(){this.namedTypes.clear(),this.nameCounter.clear(),this.processing=new WeakSet,this.circularRefs.clear()}},y=class{constructor(e){this.collected=[];this.seenStructs=new Set;this.namer=e}collect(e,t){this.collected=[],this.seenStructs.clear(),this.namer.reset(),this.collectRecursive(e,{fieldName:t,parentName:void 0,path:t,depth:0});let r=this.collected.find(o=>o.name===t),i=this.collected.filter(o=>o.name!==t);return r?[r,...i]:this.collected}collectRecursive(e,t){let r=this.getStructKey(e);if(e.kind==="object"){let i=this.namer.nameType(e,t);if(i&&!this.seenStructs.has(r)){this.seenStructs.add(r),this.collected.push({name:i,type:u(e)});for(let o of e.properties)this.collectRecursive(o.type,{fieldName:o.name,parentName:i,path:t.path?`${t.path}.${o.name}`:o.name,depth:t.depth+1})}return}if(e.kind==="array"){this.collectRecursive(e.elementType,{fieldName:t.fieldName?t.fieldName+"Item":void 0,parentName:t.parentName,path:t.path,depth:t.depth+1});return}if(e.kind==="union"){for(let i of e.types)this.collectRecursive(i,t);return}if(e.kind==="generic"){for(let i of e.typeArgs)this.collectRecursive(i,{...t,depth:t.depth+1});return}}getStructKey(e){return e.kind==="object"?`object:${e.properties.map(t=>`${t.name}:${this.getPropTypeKey(t.type)}:${t.optional}`).sort().join("|")}`:e.kind}getPropTypeKey(e){switch(e.kind){case"primitive":return e.type;case"null":return"null";case"undefined":return"undefined";case"array":return`array:${this.getPropTypeKey(e.elementType)}`;case"object":return"object";case"union":return e.types.map(t=>this.getPropTypeKey(t)).sort().join("|");case"generic":return`generic:${e.name}`;default:return"unknown"}}};var m=class{constructor(e,t){this.allNamedTypes=[];this.options=e,this.namer=t}findTypeName(e){if(e.kind!=="object")return null;for(let t of this.allNamedTypes)if(N(t.type,e))return t.name;return null}formatTypeDef(e){let{name:t,type:r}=e,i=this.options.addExport?"export ":"";return this.formatObjectType(t,r,i)}formatObjectType(e,t,r){let i=" ".repeat(this.options.indentSize),o=this.sortProperties(t.properties),s=[];this.options.outputStyle==="interface"?s.push(`${r}interface ${e} {`):s.push(`${r}type ${e} = {`);for(let p of o){let h=this.formatPropertyName(p.name),P=p.optional?"?":"",A=this.formatType(p.type);s.push(`${i}${h}${P}: ${A};`)}return this.options.outputStyle==="interface"?s.push("}"):s.push("};"),s.join(`
-`)}formatType(e){if(e.kind==="object"){let t=this.findTypeName(e);if(t)return t}switch(e.kind){case"primitive":return e.type;case"null":return"null";case"undefined":return"undefined";case"array":return this.formatArrayType(e);case"object":return this.formatInlineObject(e);case"union":return this.formatUnionType(e.types);case"literal":return this.formatLiteral(e.value);case"generic":return`${e.name}<${e.typeArgs.map(t=>this.formatType(t)).join(", ")}>`;default:return"unknown"}}formatLiteral(e){return typeof e=="string"?`'${e}'`:String(e)}formatArrayType(e){let t=this.formatType(e.elementType);return e.elementType.kind==="union"?`(${t})[]`:`${t}[]`}formatInlineObject(e){let t=" ".repeat(this.options.indentSize),r=this.sortProperties(e.properties);if(r.length===0)return"{}";let i=["{"];for(let o of r){let s=this.formatPropertyName(o.name),p=o.optional?"?":"",h=this.formatType(o.type);i.push(`${t}${s}${p}: ${h};`)}return i.push("}"),i.join(`
-`)}formatUnionType(e){return e.map(t=>this.formatType(t)).join(" | ")}formatPropertyName(e){return/^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(e)?e:`'${e}'`}sortProperties(e){return this.options.sortProperties==="definition"?[...e]:[...e].sort((t,r)=>t.name.localeCompare(r.name))}formatAll(e){return this.allNamedTypes=e,e.map(t=>this.formatTypeDef(t)).join(`
-
-`)}generateOutput(e,t){let r=`/**
- * Generated by type-flash
- * Root type: ${t}
- */`,i=this.formatAll(e);return`${r}
-
-${i}
-`}};var T=class{constructor(e=!1){this.seen=new WeakSet;this.strict=e}process(e){return this.processRecursive(e)}processRecursive(e){if(this.strict)return e;if(e.kind==="union"){let t=e.types.filter(r=>r.kind!=="null");return t.length===0?{kind:"null"}:t.length===1?t[0]:{...e,types:t.map(r=>this.processRecursive(r))}}if(e.kind==="array")return{...e,elementType:this.processRecursive(e.elementType)};if(e.kind==="object"){if(this.seen.has(e))return e;this.seen.add(e);let t={...e,properties:e.properties.map(r=>({...r,type:this.processRecursive(r.type)}))};return this.seen.delete(e),t}return e}},g=class{constructor(e=!0){this.seen=new WeakSet;this.markOptional=e}process(e,t){return this.markOptional?this.processRecursive(e,t):t}processRecursive(e,t){if(t.kind==="array"&&Array.isArray(e)){let r=t.elementType;if(r.kind==="object"){let i=this.processArrayObjects(e,r);return{...t,elementType:i}}return{...t,elementType:this.processRecursive(e,r)}}if(t.kind==="object"&&e&&typeof e=="object"){if(this.seen.has(t))return t;this.seen.add(t);let r=t.properties.map(i=>({...i,type:this.processRecursive(e[i.name],i.type)}));return this.seen.delete(t),{...t,properties:r}}return t.kind==="union"&&Array.isArray(e)?{...t,types:t.types.map(r=>this.processRecursive(e,r))}:t}processArrayObjects(e,t){if(e.length<=1)return t;let r={},i=e.length;for(let o of e)if(o&&typeof o=="object")for(let s of Object.keys(o))r[s]=(r[s]||0)+1;return{...t,properties:t.properties.map(o=>{let p=(r[o.name]||0)<i;return{...o,optional:p}})}}};function S(n,e,t){let r=e;return t.markOptional&&(r=new g(t.markOptional).process(n,r)),r=new T(t.strictNullChecks).process(r),r}function $(n,e={}){let t={...k,...e},r=c(n);r=S(n,r,t);let i=new f({namingStyle:t.namingStyle,prefix:t.typePrefix,suffix:t.typeSuffix,customNameMap:t.typeNameMap}),s=new y(i).collect(r,t.rootName);return new m(t,i).generateOutput(s,t.rootName)}function D(n,e={}){let t=JSON.parse(n);return $(t,e)}var V={generate:$,generateFromString:D};export{m as CodeFormatter,T as NullHandler,g as OptionalHandler,y as TypeCollector,f as TypeNamer,S as applyEnhancements,j as createUnion,V as default,$ as generate,D as generateFromString,x as inferArrayType,O as inferObjectType,c as inferType,N as isStructurallyEqual,v as mergeObjects,d as mergeTypes};
+var S={rootName:"Root",outputStyle:"interface",namingStyle:"PascalCase",sortProperties:"alpha",addExport:!0,markOptional:!0,indentSize:2,lineEnding:`
+`,typeNameMap:{},typePrefix:"",typeSuffix:""};function u(r){return{kind:"primitive",type:r}}function A(){return{kind:"null"}}function P(){return{kind:"undefined"}}function w(r){return{kind:"array",elementType:r}}function k(r=[]){return{kind:"object",properties:r}}function b(r){let e=[],t=new Set;for(let n of r)if(n.kind==="union")for(let i of n.types){let o=p(i);t.has(o)||(t.add(o),e.push(i))}else{let i=p(n);t.has(i)||(t.add(i),e.push(n))}return e.length===1?e[0]:{kind:"union",types:e}}function p(r,e=new Set){if(e.has(r))return"circular";switch(r.kind){case"primitive":return`primitive:${r.type}`;case"null":return"null";case"undefined":return"undefined";case"literal":return`literal:${typeof r.value}:${String(r.value)}`;case"array":return`array:${p(r.elementType,e)}`;case"object":{e.add(r);let t=`object:${r.properties.map(n=>`${n.name}:${p(n.type,e)}:${n.optional}`).sort().join(",")}`;return e.delete(r),t}case"union":return`union:${r.types.map(t=>p(t,e)).sort().join("|")}`;case"generic":return`generic:${r.name}:${r.typeArgs.map(t=>p(t,e)).join(",")}`;default:return"unknown"}}function d(r,e){return p(r)===p(e)?r:r.kind==="object"&&e.kind==="object"?j(r,e):r.kind==="array"&&e.kind==="array"?w(d(r.elementType,e.elementType)):b([r,e])}function j(r,e){let t=new Map;for(let n of r.properties)t.set(n.name,{...n});for(let n of e.properties){let i=t.get(n.name);i?(i.type=d(i.type,n.type),i.optional=i.optional||n.optional):t.set(n.name,{...n,optional:!0})}for(let[n,i]of t)e.properties.some(s=>s.name===n)||(i.optional=!0);return k(Array.from(t.values()))}function R(r){if(r instanceof Date||r instanceof RegExp||typeof Buffer!="undefined"&&Buffer.isBuffer(r))return u("string");let e=Object.prototype.toString.call(r);return e==="[object Date]"||e==="[object RegExp]"?u("string"):e==="[object Map]"||e==="[object Set]"||e==="[object WeakMap]"||e==="[object WeakSet]"?u("unknown"):null}function l(r,e=new WeakSet,t=new WeakMap){if(r===null)return A();if(r===void 0)return P();if(typeof r=="function")return u("Function");if(typeof r=="string")return u("string");if(typeof r=="number")return u("number");if(typeof r=="boolean")return u("boolean");if(Array.isArray(r))return O(r,e,t);if(typeof r=="object"&&r!==null){let n=R(r);if(n)return n;let i=r;if(e.has(i)){let a=t.get(i);if(a)return a}e.add(i);let o=k([]);t.set(i,o);let s=[];for(let[a,f]of Object.entries(i))s.push({name:a,type:l(f,e,t),optional:!1});return o.properties=s,e.delete(i),o}return u("unknown")}function O(r,e,t=new WeakMap){if(r.length===0)return{kind:"array",elementType:{kind:"primitive",type:"unknown"}};let n=r.map(o=>l(o,e,t)),i=n[0];for(let o=1;o<n.length;o++)i=d(i,n[o]);return{kind:"array",elementType:i}}function C(r,e=new WeakSet,t=new WeakMap){return l(r,e,t)}function h(r,e){return r===e?!0:p(r)===p(e)}function c(r,e=new WeakMap){if(e.has(r))return e.get(r);let t;switch(r.kind){case"primitive":return t={kind:"primitive",type:r.type},e.set(r,t),t;case"null":return t={kind:"null"},e.set(r,t),t;case"undefined":return t={kind:"undefined"},e.set(r,t),t;case"literal":return t={kind:"literal",value:r.value},e.set(r,t),t;case"array":return t={kind:"array",elementType:{}},e.set(r,t),t.elementType=c(r.elementType,e),t;case"object":return t={kind:"object",properties:[],isRecord:r.isRecord,valueType:r.valueType},e.set(r,t),t.properties=r.properties.map(n=>({name:n.name,optional:n.optional,type:c(n.type,e)})),r.valueType&&(t.valueType=c(r.valueType,e)),t;case"union":return t={kind:"union",types:[]},e.set(r,t),t.types=r.types.map(n=>c(n,e)),t;case"generic":return t={kind:"generic",name:r.name,typeArgs:[]},e.set(r,t),t.typeArgs=r.typeArgs.map(n=>c(n,e)),t;default:return t={kind:"primitive",type:"unknown"},e.set(r,t),t}}var y=class{constructor(e={}){this.namedTypes=new Map;this.nameCounter=new Map;this.processing=new WeakSet;this.circularRefs=new Map;this.namingStyle=e.namingStyle||"PascalCase",this.prefix=e.prefix||"",this.suffix=e.suffix||"",this.customNameMap=e.customNameMap||{}}nameType(e,t={depth:0}){if(e.kind!=="object")return null;let n=this.buildPathKey(t);if(this.customNameMap[n])return this.applyAffixes(this.customNameMap[n]);let i=this.getTypeKey(e);if(this.namedTypes.has(i))return this.namedTypes.get(i);let o=this.generateName(e,t);return o=this.formatName(o),o=this.ensureUniqueName(o),o=this.applyAffixes(o),this.namedTypes.set(i,o),o}generateName(e,t){if(e.kind==="object"){if(t.fieldName){let n=this.toPascalCase(t.fieldName);return t.parentName?`${t.parentName}${n}`:n}return t.parentName?`${t.parentName}Item`:"AnonymousObject"}return"UnknownType"}ensureUniqueName(e){let t=this.nameCounter.get(e)||0;if(t===0)return this.nameCounter.set(e,1),e;let n=`${e}${t+1}`;return this.nameCounter.set(e,t+1),n}applyAffixes(e){let t=e;return this.prefix&&(t=this.toPascalCase(this.prefix)+t),this.suffix&&(t=t+this.toPascalCase(this.suffix)),t}buildPathKey(e){return e.path||""}getTypeKey(e){return p(e)}getSimpleTypeKey(e){return p(e)}toPascalCase(e){return e?e.replace(/[-_\s]+/g," ").replace(/([a-z])([A-Z])/g,"$1 $2").trim().split(" ").filter(Boolean).map(n=>n.charAt(0).toUpperCase()+n.slice(1).toLowerCase()).join(""):""}toCamelCase(e){let t=this.toPascalCase(e);return t.charAt(0).toLowerCase()+t.slice(1)}formatName(e){return this.namingStyle==="camelCase"?this.toCamelCase(e):this.toPascalCase(e)}isCircular(e){return this.processing.has(e)}markProcessing(e){this.processing.add(e)}unmarkProcessing(e){this.processing.delete(e)}getAllNamedTypes(){return new Map(this.namedTypes)}reset(){this.namedTypes.clear(),this.nameCounter.clear(),this.processing=new WeakSet,this.circularRefs.clear()}},m=class{constructor(e){this.collected=[];this.seenStructs=new Set;this.namer=e}collect(e,t){this.collected=[],this.seenStructs.clear(),this.namer.reset(),this.collectRecursive(e,{fieldName:t,parentName:void 0,path:t,depth:0});let n=this.collected.find(o=>o.name===t),i=this.collected.filter(o=>o.name!==t);return n?[n,...i]:this.collected}collectRecursive(e,t){let n=this.getStructKey(e);if(e.kind==="object"){let i=this.namer.nameType(e,t);if(i&&!this.seenStructs.has(n)){this.seenStructs.add(n),this.collected.push({name:i,type:c(e)});for(let o of e.properties)this.collectRecursive(o.type,{fieldName:o.name,parentName:i,path:t.path?`${t.path}.${o.name}`:o.name,depth:t.depth+1})}return}if(e.kind==="array"){this.collectRecursive(e.elementType,{fieldName:t.fieldName?t.fieldName+"Item":void 0,parentName:t.parentName,path:t.path,depth:t.depth+1});return}if(e.kind==="union"){for(let i of e.types)this.collectRecursive(i,t);return}if(e.kind==="generic"){for(let i of e.typeArgs)this.collectRecursive(i,{...t,depth:t.depth+1});return}}getStructKey(e){return p(e)}};var T=class{constructor(e,t){this.allNamedTypes=[];this.options=e,this.namer=t}get eol(){return this.options.lineEnding}joinLines(e){return e.join(this.eol)}findTypeName(e){if(e.kind!=="object")return null;for(let t of this.allNamedTypes)if(t.type===e||h(t.type,e))return t.name;return null}formatTypeDef(e){let{name:t,type:n}=e,i=this.options.addExport?"export ":"";return this.formatObjectType(t,n,i)}formatObjectType(e,t,n){let i=" ".repeat(this.options.indentSize),o=this.sortProperties(t.properties),s=[];this.options.outputStyle==="interface"?s.push(`${n}interface ${e} {`):s.push(`${n}type ${e} = {`);for(let a of o){let f=this.formatPropertyName(a.name),v=a.optional?"?":"",$=this.formatType(a.type);s.push(`${i}${f}${v}: ${$};`)}return this.options.outputStyle==="interface"?s.push("}"):s.push("};"),this.joinLines(s)}formatType(e){if(e.kind==="object"){let t=this.findTypeName(e);if(t)return t}switch(e.kind){case"primitive":return e.type;case"null":return"null";case"undefined":return"undefined";case"array":return this.formatArrayType(e);case"object":return this.formatInlineObject(e);case"union":return this.formatUnionType(e.types);case"literal":return this.formatLiteral(e.value);case"generic":return`${e.name}<${e.typeArgs.map(t=>this.formatType(t)).join(", ")}>`;default:return"unknown"}}formatLiteral(e){return typeof e=="string"?`'${e}'`:String(e)}formatArrayType(e){let t=this.formatType(e.elementType);return e.elementType.kind==="union"?`(${t})[]`:`${t}[]`}formatInlineObject(e){let t=" ".repeat(this.options.indentSize),n=this.sortProperties(e.properties);if(n.length===0)return"{}";let i=["{"];for(let o of n){let s=this.formatPropertyName(o.name),a=o.optional?"?":"",f=this.formatType(o.type);i.push(`${t}${s}${a}: ${f};`)}return i.push("}"),this.joinLines(i)}formatUnionType(e){return e.map(t=>this.formatType(t)).join(" | ")}formatPropertyName(e){return/^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(e)?e:`'${e}'`}sortProperties(e){return this.options.sortProperties==="definition"?[...e]:[...e].sort((t,n)=>t.name.localeCompare(n.name))}formatAll(e){return this.allNamedTypes=e,e.map(t=>this.formatTypeDef(t)).join(`${this.eol}${this.eol}`)}generateOutput(e,t){let n=this.joinLines(["/**"," * Generated by type-flash",` * Root type: ${t}`," */"]),i=this.formatAll(e);return`${n}${this.eol}${this.eol}${i}${this.eol}`}};var g=class{constructor(e=!0){this.seen=new WeakSet;this.markOptional=e}process(e,t){return this.markOptional?this.processRecursive(e,t):t}processRecursive(e,t){if(t.kind==="array"&&Array.isArray(e)){let n=t.elementType;if(n.kind==="object"){let i=this.processArrayObjects(e,n);return{...t,elementType:i}}return{...t,elementType:this.processRecursive(e,n)}}if(t.kind==="object"&&e&&typeof e=="object"){if(this.seen.has(t))return t;this.seen.add(t);let n={...t,properties:t.properties.map(i=>i.type===t?{...i}:{...i,type:this.processRecursive(e[i.name],i.type)})};for(let i of n.properties)i.type===t&&(i.type=n);return this.seen.delete(t),n}return t.kind==="union"&&Array.isArray(e)?{...t,types:t.types.map(n=>this.processRecursive(e,n))}:t}processArrayObjects(e,t){if(e.length<=1)return t;let n={},i=e.length;for(let o of e)if(o&&typeof o=="object")for(let s of Object.keys(o))n[s]=(n[s]||0)+1;return{...t,properties:t.properties.map(o=>{let a=(n[o.name]||0)<i;return{...o,optional:a}})}}};function N(r,e,t){return t.markOptional?new g(t.markOptional).process(r,e):e}function x(r,e={}){let t={...S,...e},n=l(r);n=N(r,n,t);let i=new y({namingStyle:t.namingStyle,prefix:t.typePrefix,suffix:t.typeSuffix,customNameMap:t.typeNameMap}),s=new m(i).collect(n,t.rootName);return new T(t,i).generateOutput(s,t.rootName)}function D(r,e={}){let t=JSON.parse(r);return x(t,e)}var Z={generate:x,generateFromString:D};export{T as CodeFormatter,g as OptionalHandler,m as TypeCollector,y as TypeNamer,N as applyEnhancements,b as createUnion,Z as default,x as generate,D as generateFromString,O as inferArrayType,C as inferObjectType,l as inferType,h as isStructurallyEqual,j as mergeObjects,d as mergeTypes};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "type-flash",
-  "version": "1.2.9",
+  "version": "1.3.1",
   "description": "极速智能的 TypeScript 类型生成器，支持深度解析对象 / JSON / 接口返回，一行代码搞定，让类型定义一键生成，彻底告别手写类型的繁琐。",
   "main": "dist/index.js",
   "module": "dist/index.mjs",