@technicity/openapi-sdk-generator 5.12.2 → 5.14.0

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 (4) hide show
  1. package/dist/generate-remix.js +34 -5
  2. package/dist/generate-remix.js.map +1 -1
  3. package/package.json +1 -1
  4. package/src/generate-remix.ts +63 -27
package/dist/generate-remix.js CHANGED
@@ -35,9 +35,9 @@ const json_schema_to_typescript_1 = require("json-schema-to-typescript");
35
35
  const path_to_regexp_1 = require("path-to-regexp");
36
36
  const openapi_schema_to_json_schema_1 = __importDefault(require("@openapi-contrib/openapi-schema-to-json-schema"));
37
37
  const json_schema_traverse_1 = __importDefault(require("json-schema-traverse"));
38
- const pascal_case_1 = require("pascal-case");
39
38
  const prettier = __importStar(require("prettier"));
40
39
  const del_1 = __importDefault(require("del"));
40
+ const lodash_1 = require("lodash");
41
41
  async function generate(input) {
42
42
  const { api, outdir, generateOrThrow, excludeFetchImport } = input;
43
43
  if (api.paths == null || Object.keys(api.paths).length === 0) {
@@ -112,16 +112,18 @@ function getCode({ results, baseUrl, generateOrThrow, env, excludeFetchImport, }
112
112
  FormData,`}
113
113
  RetryAgent,
114
114
  Agent,
115
+ RetryHandler,
115
116
  } from "undici";`}
116
117
 
117
118
  export type Interceptors = { req?: (req: Request) => Promise<Request>, res?: (req: Request, res: Response) => Promise<Response> };
118
119
 
119
- type SdkOpts = { baseUrl: string };
120
+ type SdkOpts = { baseUrl: string; etryOptions?: RetryHandler.RetryOptions };
120
121
 
121
122
  export class Sdk {
122
123
  #httpClient: HttpClient;
123
124
  #baseUrl: string;
124
125
  #addOperationIdHeader?: boolean;
126
+ #retryOptions?: RetryHandler.RetryOptions;
125
127
 
126
128
  static create(opts${baseUrl === void 0 ? "" : "?"}: SdkOpts) {
127
129
  return new this({ ${baseUrl === void 0 ? "" : `baseUrl: "${baseUrl}",`} ...opts, httpClient: HttpClient.create() });
@@ -181,6 +183,7 @@ function getCode({ results, baseUrl, generateOrThrow, env, excludeFetchImport, }
181
183
  this.#httpClient = opts.httpClient;
182
184
  this.#baseUrl = opts.baseUrl;
183
185
  this.#addOperationIdHeader = opts.addOperationIdHeader;
186
+ this.#retryOptions = opts.retryOptions;
184
187
  }
185
188
 
186
189
  set baseUrl(v: string) {
@@ -275,6 +278,7 @@ function getCode({ results, baseUrl, generateOrThrow, env, excludeFetchImport, }
275
278
  ? `(reqOpts as any).dispatcher = new RetryAgent(new Agent(), {
276
279
  maxRetries: 6,
277
280
  methods: ["GET", "HEAD", "OPTIONS"],
281
+ ...this.#retryOptions,
278
282
  });`
279
283
  : ""}
280
284
 
@@ -401,6 +405,7 @@ function getCode({ results, baseUrl, generateOrThrow, env, excludeFetchImport, }
401
405
  ? `(reqOpts as any).dispatcher = new RetryAgent(new Agent(), {
402
406
  maxRetries: 6,
403
407
  methods: ["GET", "HEAD", "OPTIONS"],
408
+ ...this.#retryOptions,
404
409
  });`
405
410
  : ""}
406
411
 
@@ -488,7 +493,7 @@ async function getMethodCode(input) {
488
493
  const queryParams = (parameters ?? []).filter((x) => x.in === "query");
489
494
  const headers = (parameters ?? []).filter((x) => x.in === "header");
490
495
  const { contentType: requestBodyContentType, schema: requestBodySchema } = getRequestBodyInfo(requestBody, operationId) ?? {};
491
- const requestBodySchemaName = `ReqData${(0, pascal_case_1.pascalCase)(operationId)}`;
496
+ const requestBodySchemaName = `ReqData${generateName(operationId)}`;
492
497
  if (requestBodySchema?.title) {
493
498
  requestBodySchema.title = requestBodySchemaName;
494
499
  }
@@ -506,7 +511,7 @@ async function getMethodCode(input) {
506
511
  if (schema === void 0 && produces?.[0] === "application/json") {
507
512
  schema = response?.schema;
508
513
  }
509
- const name = `ResBody${status}${(0, pascal_case_1.pascalCase)(operationId)}`;
514
+ const name = `ResBody${status}${generateName(operationId)}`;
510
515
  const type = await getTsInterface(schema, name);
511
516
  resBodyTypes.push({ name, status, type });
512
517
  }
@@ -626,7 +631,7 @@ async function getMethodCode(input) {
626
631
  `;
627
632
  const reqBodySchemas = `${requestBodySchema == null
628
633
  ? ""
629
- : `export const schemaReqData${(0, pascal_case_1.pascalCase)(operationId)} = ${JSON.stringify(requestBodySchema)}`}`;
634
+ : `export const schemaReqData${generateName(operationId)} = ${JSON.stringify(requestBodySchema)}`}`;
630
635
  return {
631
636
  methodCode,
632
637
  restCode,
@@ -798,4 +803,28 @@ function getBaseUrl(api) {
798
803
  }
799
804
  return undefined;
800
805
  }
806
+ function generateName(name) {
807
+ return toSafeString(name);
808
+ }
809
+ // json-schema-to-typescript/src/utils.ts
810
+ function toSafeString(string) {
811
+ // identifiers in javaScript/ts:
812
+ // First character: a-zA-Z | _ | $
813
+ // Rest: a-zA-Z | _ | $ | 0-9
814
+ return (0, lodash_1.upperFirst)(
815
+ // remove accents, umlauts, ... by their basic latin letters
816
+ (0, lodash_1.deburr)(string)
817
+ // replace chars which are not valid for typescript identifiers with whitespace
818
+ .replace(/(^\s*[^a-zA-Z_$])|([^a-zA-Z_$\d])/g, " ")
819
+ // uppercase leading underscores followed by lowercase
820
+ .replace(/^_[a-z]/g, (match) => match.toUpperCase())
821
+ // remove non-leading underscores followed by lowercase (convert snake_case)
822
+ .replace(/_[a-z]/g, (match) => match.substr(1, match.length).toUpperCase())
823
+ // uppercase letters after digits, dollars
824
+ .replace(/([\d$]+[a-zA-Z])/g, (match) => match.toUpperCase())
825
+ // uppercase first letter after whitespace
826
+ .replace(/\s+([a-zA-Z])/g, (match) => (0, lodash_1.trim)(match.toUpperCase()))
827
+ // remove remaining whitespace
828
+ .replace(/\s/g, ""));
829
+ }
801
830
  //# sourceMappingURL=generate-remix.js.map
package/dist/generate-remix.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generate-remix.js","sourceRoot":"","sources":["../src/generate-remix.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generate-remix.js","sourceRoot":"","sources":["../src/generate-remix.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@technicity/openapi-sdk-generator",
3
- "version": "5.12.2",
3
+ "version": "5.14.0",
4
4
  "license": "MIT",
5
5
  "main": "./dist/index.js",
6
6
  "bin": {
package/src/generate-remix.ts CHANGED
@@ -7,9 +7,9 @@ import { compile } from "json-schema-to-typescript";
7
7
  import { compile as compilePath } from "path-to-regexp";
8
8
  import toJsonSchema from "@openapi-contrib/openapi-schema-to-json-schema";
9
9
  import traverse from "json-schema-traverse";
10
- import { pascalCase } from "pascal-case";
11
10
  import * as prettier from "prettier";
12
11
  import del from "del";
12
+ import { deburr, trim, upperFirst } from "lodash";
13
13
 
14
14
  type TEnv = "browser" | "node";
15
15
  type TResult = {
@@ -43,13 +43,13 @@ export async function generate(input: {
43
43
 
44
44
  // Sort
45
45
  api.paths = Object.fromEntries(
46
- Object.entries(api.paths).sort((a, b) => a[0].localeCompare(b[0]))
46
+ Object.entries(api.paths).sort((a, b) => a[0].localeCompare(b[0])),
47
47
  );
48
48
 
49
49
  for (let p of Object.keys(api.paths)) {
50
50
  // Sort
51
51
  let v1 = Object.fromEntries(
52
- Object.entries(api.paths[p]).sort((a, b) => a[0].localeCompare(b[0]))
52
+ Object.entries(api.paths[p]).sort((a, b) => a[0].localeCompare(b[0])),
53
53
  );
54
54
  for (let [method, v2] of Object.entries(v1 ?? {})) {
55
55
  const operationId = getOperationId(v2);
@@ -84,13 +84,13 @@ export async function generate(input: {
84
84
  generateOrThrow,
85
85
  env: "node",
86
86
  excludeFetchImport,
87
- })
87
+ }),
88
88
  );
89
89
 
90
90
  if (input.generateBrowser) {
91
91
  await fs.writeFile(
92
92
  path.join(outdir, `Sdk.browser.ts`),
93
- getCode({ results, baseUrl, generateOrThrow, env: "browser" })
93
+ getCode({ results, baseUrl, generateOrThrow, env: "browser" }),
94
94
  );
95
95
  }
96
96
 
@@ -101,13 +101,13 @@ export async function generate(input: {
101
101
  path.join(outdir, `schemas.ts`),
102
102
  prettier.format(reqBodySchemas.join("\n\n"), {
103
103
  parser: "typescript",
104
- })
104
+ }),
105
105
  );
106
106
  }
107
107
 
108
108
  await fs.writeFile(
109
109
  path.join(outdir, "api.json"),
110
- JSON.stringify(input.doc, null, 2)
110
+ JSON.stringify(input.doc, null, 2),
111
111
  );
112
112
  }
113
113
 
@@ -146,17 +146,19 @@ function getCode({
146
146
  }
147
147
  RetryAgent,
148
148
  Agent,
149
+ RetryHandler,
149
150
  } from "undici";`
150
151
  }
151
152
 
152
153
  export type Interceptors = { req?: (req: Request) => Promise<Request>, res?: (req: Request, res: Response) => Promise<Response> };
153
154
 
154
- type SdkOpts = { baseUrl: string };
155
+ type SdkOpts = { baseUrl: string; etryOptions?: RetryHandler.RetryOptions };
155
156
 
156
157
  export class Sdk {
157
158
  #httpClient: HttpClient;
158
159
  #baseUrl: string;
159
160
  #addOperationIdHeader?: boolean;
161
+ #retryOptions?: RetryHandler.RetryOptions;
160
162
 
161
163
  static create(opts${baseUrl === void 0 ? "" : "?"}: SdkOpts) {
162
164
  return new this({ ${
@@ -220,6 +222,7 @@ function getCode({
220
222
  this.#httpClient = opts.httpClient;
221
223
  this.#baseUrl = opts.baseUrl;
222
224
  this.#addOperationIdHeader = opts.addOperationIdHeader;
225
+ this.#retryOptions = opts.retryOptions;
223
226
  }
224
227
 
225
228
  set baseUrl(v: string) {
@@ -315,6 +318,7 @@ function getCode({
315
318
  ? `(reqOpts as any).dispatcher = new RetryAgent(new Agent(), {
316
319
  maxRetries: 6,
317
320
  methods: ["GET", "HEAD", "OPTIONS"],
321
+ ...this.#retryOptions,
318
322
  });`
319
323
  : ""
320
324
  }
@@ -444,6 +448,7 @@ function getCode({
444
448
  ? `(reqOpts as any).dispatcher = new RetryAgent(new Agent(), {
445
449
  maxRetries: 6,
446
450
  methods: ["GET", "HEAD", "OPTIONS"],
451
+ ...this.#retryOptions,
447
452
  });`
448
453
  : ""
449
454
  }
@@ -518,7 +523,7 @@ function getCode({
518
523
  : x.resBodyTypes
519
524
  .map((x) => `{ status: ${x.status}; body: ${x.name} }`)
520
525
  .join(" | ")
521
- }`
526
+ }`,
522
527
  )
523
528
  .join(";")}
524
529
  }
@@ -534,7 +539,7 @@ function getCode({
534
539
 
535
540
  ${getHttpClientCode(env)}
536
541
  `,
537
- { parser: "typescript" }
542
+ { parser: "typescript" },
538
543
  );
539
544
  }
540
545
 
@@ -564,7 +569,7 @@ async function getMethodCode(input: {
564
569
  const { contentType: requestBodyContentType, schema: requestBodySchema } =
565
570
  getRequestBodyInfo(requestBody, operationId) ?? {};
566
571
 
567
- const requestBodySchemaName = `ReqData${pascalCase(operationId)}`;
572
+ const requestBodySchemaName = `ReqData${generateName(operationId)}`;
568
573
  if (requestBodySchema?.title) {
569
574
  requestBodySchema.title = requestBodySchemaName;
570
575
  }
@@ -581,7 +586,7 @@ async function getMethodCode(input: {
581
586
  if (schema === void 0 && produces?.[0] === "application/json") {
582
587
  schema = (response as any)?.schema;
583
588
  }
584
- const name = `ResBody${status}${pascalCase(operationId)}`;
589
+ const name = `ResBody${status}${generateName(operationId)}`;
585
590
  const type = await getTsInterface(schema, name);
586
591
  resBodyTypes.push({ name, status, type });
587
592
  }
@@ -604,7 +609,7 @@ async function getMethodCode(input: {
604
609
  ? "?"
605
610
  : ""
606
611
  }: ${await getInlineTypeScriptType(
607
- queryParams.length === 0 ? { type: "object" } : queryParamsSchema
612
+ queryParams.length === 0 ? { type: "object" } : queryParamsSchema,
608
613
  )};`}${
609
614
  requestBody == null
610
615
  ? ""
@@ -631,7 +636,7 @@ async function getMethodCode(input: {
631
636
  (x) =>
632
637
  `{ ok: ${parseInt(x.status) <= 299}; status: ${x.status}; body: ${
633
638
  x.name
634
- }, res: Response }`
639
+ }, res: Response }`,
635
640
  )
636
641
  .join(" | ")}>`
637
642
  } {
@@ -642,7 +647,7 @@ async function getMethodCode(input: {
642
647
  if (input.params["${x.name}"] == null) {
643
648
  throw new Error("Missing \`params[\\"${x.name}\\"]\`");
644
649
  }
645
- `
650
+ `,
646
651
  )
647
652
  .join("\n")}
648
653
 
@@ -653,12 +658,12 @@ async function getMethodCode(input: {
653
658
  .replace(/}/g, "")
654
659
  .split("/")
655
660
  .map((x) => (x.startsWith(":") ? x.replace(/-/g, "_") : x))
656
- .join("/")
661
+ .join("/"),
657
662
  )(
658
663
  pathParams.reduce((acc: { [k: string]: string }, v) => {
659
664
  acc[v.name.replace(/-/g, "_")] = `\${input.params["${v.name}"]}`;
660
665
  return acc;
661
- }, {})
666
+ }, {}),
662
667
  )}\`,
663
668
  operationId: "${operationId}",
664
669
  _interceptors: input.interceptors,${
@@ -677,7 +682,7 @@ async function getMethodCode(input: {
677
682
 
678
683
  if (generateOrThrow) {
679
684
  const filteredResBodyTypes = resBodyTypes.filter(
680
- (x) => parseInt(x.status) <= 299
685
+ (x) => parseInt(x.status) <= 299,
681
686
  );
682
687
  methodCode += `\nasync ${operationId}OrThrow(input: {
683
688
  ${
@@ -691,7 +696,7 @@ async function getMethodCode(input: {
691
696
  ? "?"
692
697
  : ""
693
698
  }: ${await getInlineTypeScriptType(
694
- queryParams.length === 0 ? { type: "object" } : queryParamsSchema
699
+ queryParams.length === 0 ? { type: "object" } : queryParamsSchema,
695
700
  )};`}${
696
701
  requestBody == null
697
702
  ? ""
@@ -716,7 +721,8 @@ async function getMethodCode(input: {
716
721
  : `Promise<
717
722
  ${filteredResBodyTypes
718
723
  .map(
719
- (x) => `{ ok: true; status: ${x.status}; body: ${x.name}, res: Response }`
724
+ (x) =>
725
+ `{ ok: true; status: ${x.status}; body: ${x.name}, res: Response }`,
720
726
  )
721
727
  .join(" | ")}>`
722
728
  } {
@@ -727,7 +733,7 @@ async function getMethodCode(input: {
727
733
  if (input.params["${x.name}"] == null) {
728
734
  throw new Error("Missing \`params[\\"${x.name}\\"]\`");
729
735
  }
730
- `
736
+ `,
731
737
  )
732
738
  .join("\n")}
733
739
 
@@ -738,12 +744,12 @@ async function getMethodCode(input: {
738
744
  .replace(/}/g, "")
739
745
  .split("/")
740
746
  .map((x) => (x.startsWith(":") ? x.replace(/-/g, "_") : x))
741
- .join("/")
747
+ .join("/"),
742
748
  )(
743
749
  pathParams.reduce((acc: { [k: string]: string }, v) => {
744
750
  acc[v.name.replace(/-/g, "_")] = `\${input.params["${v.name}"]}`;
745
751
  return acc;
746
- }, {})
752
+ }, {}),
747
753
  )}\`,
748
754
  operationId: "${operationId}",
749
755
  _interceptors: input.interceptors,${
@@ -774,8 +780,8 @@ async function getMethodCode(input: {
774
780
  const reqBodySchemas = `${
775
781
  requestBodySchema == null
776
782
  ? ""
777
- : `export const schemaReqData${pascalCase(
778
- operationId
783
+ : `export const schemaReqData${generateName(
784
+ operationId,
779
785
  )} = ${JSON.stringify(requestBodySchema)}`
780
786
  }`;
781
787
 
@@ -791,7 +797,7 @@ async function getMethodCode(input: {
791
797
 
792
798
  function getParamsSchema(
793
799
  params: OpenAPIV2.ParameterObject | OpenAPIV3_1.ParameterObject[],
794
- additionalProperties = false
800
+ additionalProperties = false,
795
801
  ) {
796
802
  const properties = params.reduce((acc: { [k: string]: any }, v) => {
797
803
  acc[v.name] = v.schema ?? { type: v.type };
@@ -948,7 +954,7 @@ function getHttpClientCode(env: TEnv) {
948
954
  }
949
955
  }
950
956
  `,
951
- { parser: "typescript" }
957
+ { parser: "typescript" },
952
958
  );
953
959
  }
954
960
 
@@ -971,3 +977,33 @@ function getBaseUrl(api: OpenAPI.Document<{}>) {
971
977
  }
972
978
  return undefined;
973
979
  }
980
+
981
+ function generateName(name: string) {
982
+ return toSafeString(name);
983
+ }
984
+
985
+ // json-schema-to-typescript/src/utils.ts
986
+ function toSafeString(string: string) {
987
+ // identifiers in javaScript/ts:
988
+ // First character: a-zA-Z | _ | $
989
+ // Rest: a-zA-Z | _ | $ | 0-9
990
+
991
+ return upperFirst(
992
+ // remove accents, umlauts, ... by their basic latin letters
993
+ deburr(string)
994
+ // replace chars which are not valid for typescript identifiers with whitespace
995
+ .replace(/(^\s*[^a-zA-Z_$])|([^a-zA-Z_$\d])/g, " ")
996
+ // uppercase leading underscores followed by lowercase
997
+ .replace(/^_[a-z]/g, (match) => match.toUpperCase())
998
+ // remove non-leading underscores followed by lowercase (convert snake_case)
999
+ .replace(/_[a-z]/g, (match) =>
1000
+ match.substr(1, match.length).toUpperCase(),
1001
+ )
1002
+ // uppercase letters after digits, dollars
1003
+ .replace(/([\d$]+[a-zA-Z])/g, (match) => match.toUpperCase())
1004
+ // uppercase first letter after whitespace
1005
+ .replace(/\s+([a-zA-Z])/g, (match) => trim(match.toUpperCase()))
1006
+ // remove remaining whitespace
1007
+ .replace(/\s/g, ""),
1008
+ );
1009
+ }