@sdkgen/typescript-generator 0.0.0-dev.20210924125744 → 1.6.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 (9) hide show
  1. package/dist/spec/helpers.spec.js +19 -19
  2. package/dist/src/browser-client.js +7 -7
  3. package/dist/src/helpers.d.ts +3 -3
  4. package/dist/src/helpers.js +9 -9
  5. package/dist/src/interfaces.js +2 -2
  6. package/dist/src/node-client.js +7 -7
  7. package/dist/src/node-server.js +15 -7
  8. package/dist/tsconfig.tsbuildinfo +1341 -1
  9. package/package.json +8 -9
package/dist/spec/helpers.spec.js CHANGED
@@ -35,7 +35,7 @@ describe("helpers.ts", () => {
35
35
  new parser.Field("optionalStrArray", new parser.OptionalType(new parser.ArrayType(new parser.StringPrimitiveType()))),
36
36
  ], []);
37
37
  structType.name = "awesomeInterface";
38
- expect((0, helpers_1.generateTypescriptInterface)(structType, false)).toBe(`export interface awesomeInterface {
38
+ expect(helpers_1.generateTypescriptInterface(structType)).toBe(`export interface awesomeInterface {
39
39
  int: number
40
40
  bigint: bigint
41
41
  date: Date
@@ -50,74 +50,74 @@ describe("helpers.ts", () => {
50
50
  });
51
51
  test("generateTypescriptTypeName: IntPrimitiveType", () => {
52
52
  const type = new parser.IntPrimitiveType();
53
- expect((0, helpers_1.generateTypescriptTypeName)(type, false)).toBe("number");
53
+ expect(helpers_1.generateTypescriptTypeName(type)).toBe("number");
54
54
  });
55
55
  test("generateTypescriptTypeName: UIntPrimitiveType", () => {
56
56
  const type = new parser.UIntPrimitiveType();
57
- expect((0, helpers_1.generateTypescriptTypeName)(type, false)).toBe("number");
57
+ expect(helpers_1.generateTypescriptTypeName(type)).toBe("number");
58
58
  });
59
59
  test("generateTypescriptTypeName: MoneyPrimitiveType", () => {
60
60
  const type = new parser.MoneyPrimitiveType();
61
- expect((0, helpers_1.generateTypescriptTypeName)(type, false)).toBe("number");
61
+ expect(helpers_1.generateTypescriptTypeName(type)).toBe("number");
62
62
  });
63
63
  test("generateTypescriptTypeName: FloatPrimitiveType", () => {
64
64
  const type = new parser.FloatPrimitiveType();
65
- expect((0, helpers_1.generateTypescriptTypeName)(type, false)).toBe("number");
65
+ expect(helpers_1.generateTypescriptTypeName(type)).toBe("number");
66
66
  });
67
67
  test("generateTypescriptTypeName: DateTimePrimitiveType", () => {
68
68
  const type = new parser.DateTimePrimitiveType();
69
- expect((0, helpers_1.generateTypescriptTypeName)(type, false)).toBe("Date");
69
+ expect(helpers_1.generateTypescriptTypeName(type)).toBe("Date");
70
70
  });
71
71
  test("generateTypescriptTypeName: StringPrimitiveType", () => {
72
72
  const type = new parser.StringPrimitiveType();
73
- expect((0, helpers_1.generateTypescriptTypeName)(type, false)).toBe("string");
73
+ expect(helpers_1.generateTypescriptTypeName(type)).toBe("string");
74
74
  });
75
75
  test("generateTypescriptTypeName: CpfPrimitiveType", () => {
76
76
  const type = new parser.CpfPrimitiveType();
77
- expect((0, helpers_1.generateTypescriptTypeName)(type, false)).toBe("string");
77
+ expect(helpers_1.generateTypescriptTypeName(type)).toBe("string");
78
78
  });
79
79
  test("generateTypescriptTypeName: CnpjPrimitiveType", () => {
80
80
  const type = new parser.CnpjPrimitiveType();
81
- expect((0, helpers_1.generateTypescriptTypeName)(type, false)).toBe("string");
81
+ expect(helpers_1.generateTypescriptTypeName(type)).toBe("string");
82
82
  });
83
83
  test("generateTypescriptTypeName: EmailPrimitiveType", () => {
84
84
  const type = new parser.EmailPrimitiveType();
85
- expect((0, helpers_1.generateTypescriptTypeName)(type, false)).toBe("string");
85
+ expect(helpers_1.generateTypescriptTypeName(type)).toBe("string");
86
86
  });
87
87
  test("generateTypescriptTypeName: HtmlPrimitiveType", () => {
88
88
  const type = new parser.HtmlPrimitiveType();
89
- expect((0, helpers_1.generateTypescriptTypeName)(type, false)).toBe("string");
89
+ expect(helpers_1.generateTypescriptTypeName(type)).toBe("string");
90
90
  });
91
91
  test("generateTypescriptTypeName: UrlPrimitiveType", () => {
92
92
  const type = new parser.UrlPrimitiveType();
93
- expect((0, helpers_1.generateTypescriptTypeName)(type, false)).toBe("string");
93
+ expect(helpers_1.generateTypescriptTypeName(type)).toBe("string");
94
94
  });
95
95
  test("generateTypescriptTypeName: HexPrimitiveType", () => {
96
96
  const type = new parser.HexPrimitiveType();
97
- expect((0, helpers_1.generateTypescriptTypeName)(type, false)).toBe("string");
97
+ expect(helpers_1.generateTypescriptTypeName(type)).toBe("string");
98
98
  });
99
99
  test("generateTypescriptTypeName: Base64PrimitiveType", () => {
100
100
  const type = new parser.Base64PrimitiveType();
101
- expect((0, helpers_1.generateTypescriptTypeName)(type, false)).toBe("string");
101
+ expect(helpers_1.generateTypescriptTypeName(type)).toBe("string");
102
102
  });
103
103
  test("generateTypescriptTypeName: XmlPrimitiveType", () => {
104
104
  const type = new parser.XmlPrimitiveType();
105
- expect((0, helpers_1.generateTypescriptTypeName)(type, false)).toBe("string");
105
+ expect(helpers_1.generateTypescriptTypeName(type)).toBe("string");
106
106
  });
107
107
  test("generateTypescriptTypeName: StructType", () => {
108
108
  const structType = new parser.StructType([new parser.Field("int", new parser.IntPrimitiveType()), new parser.Field("bigint", new parser.BigIntPrimitiveType())], []);
109
109
  structType.name = "simpleInterface";
110
- expect((0, helpers_1.generateTypescriptTypeName)(structType, false)).toBe(structType.name);
110
+ expect(helpers_1.generateTypescriptTypeName(structType)).toBe(structType.name);
111
111
  });
112
112
  test("generateTypescriptTypeName: EnumType", () => {
113
113
  const enumType = new parser.EnumType([new parser.EnumValue("value1")]);
114
114
  enumType.name = "simpleEnum";
115
- expect((0, helpers_1.generateTypescriptTypeName)(enumType, false)).toBe(enumType.name);
115
+ expect(helpers_1.generateTypescriptTypeName(enumType)).toBe(enumType.name);
116
116
  });
117
117
  test("generateTypescriptTypeName: TypeReference", () => {
118
118
  const enumType = new parser.TypeReference("typeRef");
119
119
  enumType.type = new parser.HexPrimitiveType();
120
- expect((0, helpers_1.generateTypescriptTypeName)(enumType, false)).toBe("string");
120
+ expect(helpers_1.generateTypescriptTypeName(enumType)).toBe("string");
121
121
  });
122
122
  test("generateTypescriptTypeName: unknown PrimitiveType error", () => {
123
123
  class UnknownType extends parser.Type {
@@ -127,6 +127,6 @@ describe("helpers.ts", () => {
127
127
  }
128
128
  }
129
129
  const newUnknownType = new UnknownType();
130
- expect(() => (0, helpers_1.generateTypescriptTypeName)(newUnknownType, false)).toThrowError(`BUG: generateTypescriptTypeName with ${newUnknownType.name}`);
130
+ expect(() => helpers_1.generateTypescriptTypeName(newUnknownType)).toThrowError(`BUG: generateTypescriptTypeName with ${newUnknownType.name}`);
131
131
  });
132
132
  });
package/dist/src/browser-client.js CHANGED
@@ -11,15 +11,15 @@ import { SdkgenError${hasErrorWithData ? ", SdkgenErrorWithData" : ""}, SdkgenHt
11
11
 
12
12
  `;
13
13
  for (const type of ast.enumTypes) {
14
- code += (0, helpers_1.generateTypescriptEnum)(type);
14
+ code += helpers_1.generateTypescriptEnum(type);
15
15
  code += "\n";
16
16
  }
17
17
  for (const type of ast.structTypes) {
18
- code += (0, helpers_1.generateTypescriptInterface)(type, true);
18
+ code += helpers_1.generateTypescriptInterface(type);
19
19
  code += "\n";
20
20
  }
21
21
  for (const error of ast.errors) {
22
- code += (0, helpers_1.generateTypescriptErrorClass)(error, true);
22
+ code += helpers_1.generateTypescriptErrorClass(error);
23
23
  code += "\n";
24
24
  }
25
25
  code += `export class ApiClient extends SdkgenHttpClient {
@@ -29,13 +29,13 @@ import { SdkgenError${hasErrorWithData ? ", SdkgenErrorWithData" : ""}, SdkgenHt
29
29
  ${ast.operations
30
30
  .filter(op => op.annotations.every(ann => !(ann instanceof parser_1.HiddenAnnotation)))
31
31
  .map(op => `
32
- ${op.name}(args${op.args.length === 0 ? "?" : ""}: {${op.args
33
- .map(arg => `${arg.name}${arg.type.name.endsWith("?") ? "?" : ""}: ${(0, helpers_1.generateTypescriptTypeName)(arg.type, true)}`)
34
- .join(", ")}}): Promise<${(0, helpers_1.generateTypescriptTypeName)(op.returnType, true)}> { return this.makeRequest("${op.name}", args || {}); }`)
32
+ ${op.prettyName}(args${op.args.length === 0 ? "?" : ""}: {${op.args
33
+ .map(arg => `${arg.name}${arg.type.name.endsWith("?") ? "?" : ""}: ${helpers_1.generateTypescriptTypeName(arg.type)}`)
34
+ .join(", ")}}): Promise<${helpers_1.generateTypescriptTypeName(op.returnType)}> { return this.makeRequest("${op.prettyName}", args || {}); }`)
35
35
  .join("")}
36
36
  }\n\n`;
37
37
  code += `const errClasses = {\n${ast.errors.map(err => ` ${err.name}`).join(",\n")}\n};\n\n`;
38
- code += `const astJson = ${JSON.stringify((0, parser_1.astToJson)(ast), null, 4).replace(/"(?<key>\w+)":/gu, "$<key>:")} as const;\n`;
38
+ code += `const astJson = ${JSON.stringify(parser_1.astToJson(ast), null, 4).replace(/"(?<key>\w+)":/gu, "$<key>:")} as const;\n`;
39
39
  return code;
40
40
  }
41
41
  exports.generateBrowserClientSource = generateBrowserClientSource;
package/dist/src/helpers.d.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import type { ErrorNode, Type } from "@sdkgen/parser";
2
2
  import { EnumType, StructType } from "@sdkgen/parser";
3
- export declare function generateTypescriptTypeName(type: Type, isBrowser: boolean): string;
4
- export declare function generateTypescriptInterface(type: StructType, isBrowser: boolean): string;
3
+ export declare function generateTypescriptTypeName(type: Type): string;
4
+ export declare function generateTypescriptInterface(type: StructType): string;
5
5
  export declare function generateTypescriptEnum(type: EnumType): string;
6
- export declare function generateTypescriptErrorClass(error: ErrorNode, isBrowser: boolean): string;
6
+ export declare function generateTypescriptErrorClass(error: ErrorNode): string;
7
7
  export declare function clearForLogging(path: string, type: Type): string;
package/dist/src/helpers.js CHANGED
@@ -2,7 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.clearForLogging = exports.generateTypescriptErrorClass = exports.generateTypescriptEnum = exports.generateTypescriptInterface = exports.generateTypescriptTypeName = void 0;
4
4
  const parser_1 = require("@sdkgen/parser");
5
- function generateTypescriptTypeName(type, isBrowser) {
5
+ function generateTypescriptTypeName(type) {
6
6
  switch (type.constructor) {
7
7
  case parser_1.IntPrimitiveType:
8
8
  case parser_1.UIntPrimitiveType:
@@ -17,7 +17,7 @@ function generateTypescriptTypeName(type, isBrowser) {
17
17
  case parser_1.BoolPrimitiveType:
18
18
  return "boolean";
19
19
  case parser_1.BytesPrimitiveType:
20
- return isBrowser ? "ArrayBuffer" : "Buffer";
20
+ return "Buffer";
21
21
  case parser_1.StringPrimitiveType:
22
22
  case parser_1.CpfPrimitiveType:
23
23
  case parser_1.CnpjPrimitiveType:
@@ -34,10 +34,10 @@ function generateTypescriptTypeName(type, isBrowser) {
34
34
  case parser_1.JsonPrimitiveType:
35
35
  return "any";
36
36
  case parser_1.OptionalType:
37
- return `${generateTypescriptTypeName(type.base, isBrowser)} | null`;
37
+ return `${generateTypescriptTypeName(type.base)} | null`;
38
38
  case parser_1.ArrayType: {
39
39
  const { base } = type;
40
- const baseGen = generateTypescriptTypeName(base, isBrowser);
40
+ const baseGen = generateTypescriptTypeName(base);
41
41
  if (base instanceof parser_1.OptionalType) {
42
42
  return `(${baseGen})[]`;
43
43
  }
@@ -47,15 +47,15 @@ function generateTypescriptTypeName(type, isBrowser) {
47
47
  case parser_1.EnumType:
48
48
  return type.name;
49
49
  case parser_1.TypeReference:
50
- return generateTypescriptTypeName(type.type, isBrowser);
50
+ return generateTypescriptTypeName(type.type);
51
51
  default:
52
52
  throw new Error(`BUG: generateTypescriptTypeName with ${type.constructor.name}`);
53
53
  }
54
54
  }
55
55
  exports.generateTypescriptTypeName = generateTypescriptTypeName;
56
- function generateTypescriptInterface(type, isBrowser) {
56
+ function generateTypescriptInterface(type) {
57
57
  return `export interface ${type.name} {
58
- ${type.fields.map(field => ` ${field.name}: ${generateTypescriptTypeName(field.type, isBrowser)}`).join("\n")}
58
+ ${type.fields.map(field => ` ${field.name}: ${generateTypescriptTypeName(field.type)}`).join("\n")}
59
59
  }\n`;
60
60
  }
61
61
  exports.generateTypescriptInterface = generateTypescriptInterface;
@@ -63,8 +63,8 @@ function generateTypescriptEnum(type) {
63
63
  return `export type ${type.name} = ${type.values.map(x => `"${x.value}"`).join(" | ")};\n`;
64
64
  }
65
65
  exports.generateTypescriptEnum = generateTypescriptEnum;
66
- function generateTypescriptErrorClass(error, isBrowser) {
67
- return `export class ${error.name} extends ${error.dataType instanceof parser_1.VoidPrimitiveType ? "SdkgenError" : `SdkgenErrorWithData<${generateTypescriptTypeName(error.dataType, isBrowser)}>`} {}\n`;
66
+ function generateTypescriptErrorClass(error) {
67
+ return `export class ${error.name} extends ${error.dataType instanceof parser_1.VoidPrimitiveType ? "SdkgenError" : `SdkgenErrorWithData<${generateTypescriptTypeName(error.dataType)}>`} {}\n`;
68
68
  }
69
69
  exports.generateTypescriptErrorClass = generateTypescriptErrorClass;
70
70
  function clearForLogging(path, type) {
package/dist/src/interfaces.js CHANGED
@@ -5,11 +5,11 @@ const helpers_1 = require("./helpers");
5
5
  function generateTypescriptInterfaces(ast) {
6
6
  let code = "";
7
7
  for (const type of ast.enumTypes) {
8
- code += (0, helpers_1.generateTypescriptEnum)(type);
8
+ code += helpers_1.generateTypescriptEnum(type);
9
9
  }
10
10
  code += "\n";
11
11
  for (const type of ast.structTypes) {
12
- code += (0, helpers_1.generateTypescriptInterface)(type, false);
12
+ code += helpers_1.generateTypescriptInterface(type);
13
13
  code += "\n";
14
14
  }
15
15
  return code;
package/dist/src/node-client.js CHANGED
@@ -14,18 +14,18 @@ export { Fatal } from "@sdkgen/node-runtime";
14
14
 
15
15
  `;
16
16
  for (const type of ast.enumTypes) {
17
- code += (0, helpers_1.generateTypescriptEnum)(type);
17
+ code += helpers_1.generateTypescriptEnum(type);
18
18
  code += "\n";
19
19
  }
20
20
  for (const type of ast.structTypes) {
21
- code += (0, helpers_1.generateTypescriptInterface)(type, false);
21
+ code += helpers_1.generateTypescriptInterface(type);
22
22
  code += "\n";
23
23
  }
24
24
  for (const error of ast.errors) {
25
25
  if (error.name === "Fatal") {
26
26
  continue;
27
27
  }
28
- code += (0, helpers_1.generateTypescriptErrorClass)(error, false);
28
+ code += helpers_1.generateTypescriptErrorClass(error);
29
29
  code += "\n";
30
30
  }
31
31
  code += `export class ApiClient extends SdkgenHttpClient {
@@ -35,13 +35,13 @@ export { Fatal } from "@sdkgen/node-runtime";
35
35
  ${ast.operations
36
36
  .filter(op => op.annotations.every(ann => !(ann instanceof parser_1.HiddenAnnotation)))
37
37
  .map(op => `
38
- ${op.name}(ctx: PartialDeep<Context> | null, args: {${op.args
39
- .map(arg => `${arg.name}${arg.type.name.endsWith("?") ? "?" : ""}: ${(0, helpers_1.generateTypescriptTypeName)(arg.type, false)}`)
40
- .join(", ")}}): Promise<${(0, helpers_1.generateTypescriptTypeName)(op.returnType, false)}> { return this.makeRequest(ctx, "${op.name}", args); }`)
38
+ ${op.prettyName}(ctx: Context | null, args: {${op.args
39
+ .map(arg => `${arg.name}${arg.type.name.endsWith("?") ? "?" : ""}: ${helpers_1.generateTypescriptTypeName(arg.type)}`)
40
+ .join(", ")}}): Promise<${helpers_1.generateTypescriptTypeName(op.returnType)}> { return this.makeRequest(ctx, "${op.prettyName}", args); }`)
41
41
  .join("")}
42
42
  }\n\n`;
43
43
  code += `const errClasses = {\n${ast.errors.map(err => ` ${err.name}`).join(",\n")}\n};\n\n`;
44
- code += `const astJson = ${JSON.stringify((0, parser_1.astToJson)(ast), null, 4).replace(/"(?<key>\w+)":/gu, "$<key>:")} as const;\n`;
44
+ code += `const astJson = ${JSON.stringify(parser_1.astToJson(ast), null, 4).replace(/"(?<key>\w+)":/gu, "$<key>:")} as const;\n`;
45
45
  return code;
46
46
  }
47
47
  exports.generateNodeClientSource = generateNodeClientSource;
package/dist/src/node-server.js CHANGED
@@ -13,30 +13,38 @@ export { Fatal } from "@sdkgen/node-runtime";
13
13
 
14
14
  `;
15
15
  for (const type of ast.enumTypes) {
16
- code += (0, helpers_1.generateTypescriptEnum)(type);
16
+ code += helpers_1.generateTypescriptEnum(type);
17
17
  code += "\n";
18
18
  }
19
19
  for (const type of ast.structTypes) {
20
- code += (0, helpers_1.generateTypescriptInterface)(type, false);
20
+ code += helpers_1.generateTypescriptInterface(type);
21
21
  code += "\n";
22
22
  }
23
23
  for (const error of ast.errors) {
24
24
  if (error.name === "Fatal") {
25
25
  continue;
26
26
  }
27
- code += (0, helpers_1.generateTypescriptErrorClass)(error, false);
27
+ code += helpers_1.generateTypescriptErrorClass(error);
28
28
  code += "\n";
29
29
  }
30
30
  code += `export class ApiConfig<ExtraContextT> extends BaseApiConfig<ExtraContextT> {
31
31
  fn!: {${ast.operations
32
32
  .map(op => `
33
- ${op.name}: (args: {${op.args
34
- .map(arg => `${arg.name}: ${(0, helpers_1.generateTypescriptTypeName)(arg.type, false)}`)
35
- .join(", ")}}) => Promise<${(0, helpers_1.generateTypescriptTypeName)(op.returnType, false)}>`)
33
+ ${op.prettyName}: (ctx: Context & ExtraContextT, args: {${op.args
34
+ .map(arg => `${arg.name}: ${helpers_1.generateTypescriptTypeName(arg.type)}`)
35
+ .join(", ")}}) => Promise<${helpers_1.generateTypescriptTypeName(op.returnType)}>`)
36
36
  .join("")}
37
37
  }
38
38
 
39
- astJson = ${JSON.stringify((0, parser_1.astToJson)(ast), null, 4)
39
+ /** @deprecated api.err shouldn't be used. Import and throw errors directly. */
40
+ err = {${ast.errors
41
+ .filter(err => err.dataType instanceof parser_1.VoidPrimitiveType)
42
+ .map(err => `
43
+ ${err.name}(message: string = "") { throw new ${err.name}(message); }`)
44
+ .join(",")}
45
+ }
46
+
47
+ astJson = ${JSON.stringify(parser_1.astToJson(ast), null, 4)
40
48
  .replace(/"(?<key>\w+)":/gu, "$<key>:")
41
49
  .replace(/\n/gu, "\n ")} as const
42
50
  }