@ahoo-wang/fetcher-generator 2.12.0 → 2.12.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (12) hide show
  1. package/dist/cli.cjs +1 -1
  2. package/dist/cli.js +1 -1
  3. package/dist/index.cjs +15 -9
  4. package/dist/index.cjs.map +1 -1
  5. package/dist/index.js +264 -255
  6. package/dist/index.js.map +1 -1
  7. package/dist/model/typeGenerator.d.ts +1 -2
  8. package/dist/model/typeGenerator.d.ts.map +1 -1
  9. package/dist/utils/schemas.d.ts.map +1 -1
  10. package/dist/utils/sourceFiles.d.ts +3 -1
  11. package/dist/utils/sourceFiles.d.ts.map +1 -1
  12. package/package.json +1 -1
package/dist/model/typeGenerator.d.ts CHANGED
@@ -15,6 +15,7 @@ export declare class TypeGenerator implements Generator {
15
15
  private resolveAdditionalProperties;
16
16
  private resolvePropertyDefinitions;
17
17
  private resolveObjectType;
18
+ private resolveMapValueType;
18
19
  resolveType(schema: Schema | Reference): string;
19
20
  private processEnum;
20
21
  private addPropertyToInterface;
@@ -22,8 +23,6 @@ export declare class TypeGenerator implements Generator {
22
23
  private processArray;
23
24
  private processComposition;
24
25
  private processIntersection;
25
- private resolveMapValueType;
26
- private processMap;
27
26
  private processTypeAlias;
28
27
  }
29
28
  //# sourceMappingURL=typeGenerator.d.ts.map
package/dist/model/typeGenerator.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"typeGenerator.d.ts","sourceRoot":"","sources":["../../src/model/typeGenerator.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,SAAS,EAA6B,MAAM,aAAa,CAAC;AACnE,OAAO,EAAuC,UAAU,EAAE,MAAM,UAAU,CAAC;AAC3E,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAOQ,SAAS,EAEvB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C,qBAAa,aAAc,YAAW,SAAS;IAEjC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAAa,OAAO,CAAC,QAAQ,CAAC,UAAU;IAAc,OAAO,CAAC,QAAQ,CAAC,SAAS;IAAa,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAhI,SAAS,EAAE,SAAS,EAAmB,UAAU,EAAE,UAAU,EAAmB,SAAS,EAAE,SAAS,EAAmB,SAAS,EAAE,MAAM;IAIrK,QAAQ,IAAI,IAAI;IAOhB,OAAO,CAAC,OAAO;IAuBf,OAAO,CAAC,gBAAgB;IAWxB,OAAO,CAAC,2BAA2B;IAanC,OAAO,CAAC,0BAA0B;IAUlC,OAAO,CAAC,iBAAiB;IAoBzB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM;IA+B/C,OAAO,CAAC,WAAW;IAenB,OAAO,CAAC,sBAAsB;IAoB9B,OAAO,CAAC,gBAAgB;IAiCxB,OAAO,CAAC,YAAY;IAWpB,OAAO,CAAC,kBAAkB;IAU1B,OAAO,CAAC,mBAAmB;IAyB3B,OAAO,CAAC,mBAAmB;IAO3B,OAAO,CAAC,UAAU;IAWlB,OAAO,CAAC,gBAAgB;CAUzB"}
1
+ {"version":3,"file":"typeGenerator.d.ts","sourceRoot":"","sources":["../../src/model/typeGenerator.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,SAAS,EAA6B,MAAM,aAAa,CAAC;AACnE,OAAO,EAAuC,UAAU,EAAE,MAAM,UAAU,CAAC;AAC3E,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAeL,SAAS,EAOV,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C,qBAAa,aAAc,YAAW,SAAS;IAE3C,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAHT,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,MAAM;IAIpC,QAAQ,IAAI,IAAI;IAOhB,OAAO,CAAC,OAAO;IAoBf,OAAO,CAAC,gBAAgB;IAWxB,OAAO,CAAC,2BAA2B;IAkBnC,OAAO,CAAC,0BAA0B;IAoBlC,OAAO,CAAC,iBAAiB;IAmBzB,OAAO,CAAC,mBAAmB;IAW3B,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM;IAmC/C,OAAO,CAAC,WAAW;IAanB,OAAO,CAAC,sBAAsB;IAoB9B,OAAO,CAAC,gBAAgB;IA2BxB,OAAO,CAAC,YAAY;IASpB,OAAO,CAAC,kBAAkB;IAU1B,OAAO,CAAC,mBAAmB;IA2B3B,OAAO,CAAC,gBAAgB;CAOzB"}
package/dist/utils/schemas.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"schemas.d.ts","sourceRoot":"","sources":["../../src/utils/schemas.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAW3E;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,UAAU,GAAG,UAAU,EAAE,GAAG,OAAO,CAKpE;AAED,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG;IAAE,IAAI,EAAE,GAAG,EAAE,CAAA;CAAE,CAAC;AAElD;;;;GAIG;AACH,wBAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,IAAI,UAAU,CAE3D;AAED,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAA;CAAE,CAAC;AAEvG,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,IAAI,YAAY,CAE/D;AAED,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,CAAC;AAEhF;;;;GAIG;AACH,wBAAgB,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,IAAI,WAAW,CAE7D;AAED,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG;IAAE,KAAK,EAAE,GAAG,EAAE,CAAA;CAAE,CAAC;AAEpD;;;;GAIG;AACH,wBAAgB,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,IAAI,WAAW,CAE7D;AAED,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG;IAAE,KAAK,EAAE,GAAG,EAAE,CAAA;CAAE,CAAC;AAEpD;;;;GAIG;AACH,wBAAgB,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,IAAI,WAAW,CAE7D;AAED,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,CAAC;IAAE,KAAK,EAAE,GAAG,EAAE,CAAA;CAAE,GAAG;IAAE,KAAK,EAAE,GAAG,EAAE,CAAA;CAAE,CAAC,CAAC;AAEzE;;;;GAIG;AACH,wBAAgB,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,IAAI,WAAW,CAE7D;AAED,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG;IAAE,KAAK,EAAE,GAAG,EAAE,CAAA;CAAE,CAAC;AAEpD;;;;GAIG;AACH,wBAAgB,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,IAAI,WAAW,CAE7D;AAED,MAAM,MAAM,iBAAiB,GAAG,WAAW,GAAG,WAAW,GAAG,WAAW,CAAC;AAExE;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,IAAI,iBAAiB,CAEzE;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAKhD;AAED,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,oBAAoB,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAAA;CAAE,CAAC;AAExG,wBAAgB,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,IAAI,SAAS,CAEzD;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAQrD;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,UAAU,GAAG,UAAU,EAAE,GAAG,MAAM,CAiB5E"}
1
+ {"version":3,"file":"schemas.d.ts","sourceRoot":"","sources":["../../src/utils/schemas.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAW3E;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,UAAU,GAAG,UAAU,EAAE,GAAG,OAAO,CAKpE;AAED,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG;IAAE,IAAI,EAAE,GAAG,EAAE,CAAA;CAAE,CAAC;AAElD;;;;GAIG;AACH,wBAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,IAAI,UAAU,CAE3D;AAED,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAA;CAAE,CAAC;AAEvG,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,IAAI,YAAY,CAE/D;AAED,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,CAAC;AAEhF;;;;GAIG;AACH,wBAAgB,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,IAAI,WAAW,CAE7D;AAED,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG;IAAE,KAAK,EAAE,GAAG,EAAE,CAAA;CAAE,CAAC;AAEpD;;;;GAIG;AACH,wBAAgB,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,IAAI,WAAW,CAE7D;AAED,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG;IAAE,KAAK,EAAE,GAAG,EAAE,CAAA;CAAE,CAAC;AAEpD;;;;GAIG;AACH,wBAAgB,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,IAAI,WAAW,CAE7D;AAED,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,CAAC;IAAE,KAAK,EAAE,GAAG,EAAE,CAAA;CAAE,GAAG;IAAE,KAAK,EAAE,GAAG,EAAE,CAAA;CAAE,CAAC,CAAC;AAEzE;;;;GAIG;AACH,wBAAgB,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,IAAI,WAAW,CAE7D;AAED,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG;IAAE,KAAK,EAAE,GAAG,EAAE,CAAA;CAAE,CAAC;AAEpD;;;;GAIG;AACH,wBAAgB,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,IAAI,WAAW,CAE7D;AAED,MAAM,MAAM,iBAAiB,GAAG,WAAW,GAAG,WAAW,GAAG,WAAW,CAAC;AAExE;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,IAAI,iBAAiB,CAEzE;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAKhD;AAED,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG;IAC/B,IAAI,EAAE,QAAQ,CAAC;IACf,oBAAoB,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAAA;CACnD,CAAC;AAEF,wBAAgB,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,IAAI,SAAS,CAEzD;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAQrD;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,UAAU,GAAG,UAAU,EAAE,GAAG,MAAM,CAiB5E"}
package/dist/utils/sourceFiles.d.ts CHANGED
@@ -41,15 +41,17 @@ export declare function addImportModelInfo(currentModel: ModelInfo, sourceFile:
41
41
  * Generates a JSDoc comment string from a title and description.
42
42
  * @returns The formatted JSDoc string or undefined if both title and description are empty
43
43
  */
44
- export declare function jsDoc(descriptions: (string | undefined)[]): string | undefined;
44
+ export declare function jsDoc(descriptions: (string | undefined)[], separator?: string): string | undefined;
45
45
  /**
46
46
  * Adds a JSDoc comment to a node with the provided title and description.
47
47
  */
48
48
  export declare function addJSDoc(node: JSDocableNode, descriptions: (string | undefined)[]): void;
49
+ export declare function schemaJSDoc(schema: Schema, key?: string): (string | undefined)[];
49
50
  /**
50
51
  * Adds a JSDoc comment to a node based on the schema's title and description.
51
52
  * @param node - The node to add the JSDoc comment to
52
53
  * @param schema - The schema containing title and description
54
+ * @param key - The key associated with the schema
53
55
  */
54
56
  export declare function addSchemaJSDoc(node: JSDocableNode, schema: Schema, key?: string): void;
55
57
  //# sourceMappingURL=sourceFiles.d.ts.map
package/dist/utils/sourceFiles.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"sourceFiles.d.ts","sourceRoot":"","sources":["../../src/utils/sourceFiles.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAOpD;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,SAAS,GAAG,MAAM,CAE7D;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,GACf,UAAU,CASZ;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,CACvB,UAAU,EAAE,UAAU,EACtB,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,EAAE,QAsBvB;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,SAAS,QAkBxB;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,YAAY,EAAE,SAAS,EACvB,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,SAAS,QAMpB;AAED;;;GAGG;AACH,wBAAgB,KAAK,CACnB,YAAY,EAAE,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,GACnC,MAAM,GAAG,SAAS,CAQpB;AAED;;GAEG;AACH,wBAAgB,QAAQ,CACtB,IAAI,EAAE,aAAa,EACnB,YAAY,EAAE,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,QAOrC;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,QAkB/E"}
1
+ {"version":3,"file":"sourceFiles.d.ts","sourceRoot":"","sources":["../../src/utils/sourceFiles.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAOpD;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,SAAS,GAAG,MAAM,CAE7D;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,GACf,UAAU,CASZ;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,CACvB,UAAU,EAAE,UAAU,EACtB,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,EAAE,QAsBvB;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,SAAS,QAkBxB;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,YAAY,EAAE,SAAS,EACvB,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,SAAS,QAMpB;AAED;;;GAGG;AACH,wBAAgB,KAAK,CACnB,YAAY,EAAE,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,EACpC,SAAS,SAAO,GACf,MAAM,GAAG,SAAS,CAQpB;AAED;;GAEG;AACH,wBAAgB,QAAQ,CACtB,IAAI,EAAE,aAAa,EACnB,YAAY,EAAE,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,QAOrC;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,0BAkBvD;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,QAG/E"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ahoo-wang/fetcher-generator",
3
- "version": "2.12.0",
3
+ "version": "2.12.1",
4
4
  "description": "A powerful TypeScript code generation tool that automatically generates type-safe API client code based on OpenAPI specifications. It is designed for general use cases and is also deeply optimized for the [Wow](https://github.com/Ahoo-Wang/Wow) Domain-Driven Design framework, providing native support for the CQRS architectural pattern.",
5
5
  "keywords": [
6
6
  "fetch",