ajsc 1.0.9 → 1.0.11

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 (14) hide show
  1. package/dist/Typebox.test.js +12 -0
  2. package/dist/Typebox.test.js.map +1 -1
  3. package/dist/TypescriptConverter.test.js +8 -2
  4. package/dist/TypescriptConverter.test.js.map +1 -1
  5. package/dist/TypescriptProcedureConverter.d.ts +2 -2
  6. package/dist/TypescriptProcedureConverter.js +22 -12
  7. package/dist/TypescriptProcedureConverter.js.map +1 -1
  8. package/dist/TypescriptProceduresConverter.test.js +18 -2
  9. package/dist/TypescriptProceduresConverter.test.js.map +1 -1
  10. package/package.json +1 -1
  11. package/src/Typebox.test.ts +18 -0
  12. package/src/TypescriptConverter.test.ts +16 -5
  13. package/src/TypescriptProcedureConverter.ts +29 -15
  14. package/src/TypescriptProceduresConverter.test.ts +21 -2
package/dist/Typebox.test.js CHANGED
@@ -46,5 +46,17 @@ describe("Typebox to IRNode Test", () => {
46
46
  },
47
47
  });
48
48
  });
49
+ it("should convert intersections", () => {
50
+ expect(new JSONSchemaConverter(Type.Intersect([Type.String(), Type.Number()])).irNode).toMatchObject({
51
+ type: "intersection",
52
+ options: [{ type: "string" }, { type: "number" }],
53
+ });
54
+ });
55
+ it('should convert arrays', () => {
56
+ expect(new JSONSchemaConverter(Type.Array(Type.String())).irNode).toMatchObject({
57
+ type: "array",
58
+ items: { type: "string" },
59
+ });
60
+ });
49
61
  });
50
62
  //# sourceMappingURL=Typebox.test.js.map
package/dist/Typebox.test.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Typebox.test.js","sourceRoot":"","sources":["../src/Typebox.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Typebox.test.js","sourceRoot":"","sources":["../src/Typebox.test.ts"],"names":[],"mappings":"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"}
package/dist/TypescriptConverter.test.js CHANGED
@@ -33,8 +33,14 @@ describe("TypeScriptLanguagePlugin", () => {
33
33
  it("should convert arrays", () => {
34
34
  expect(new TypescriptConverter({
35
35
  type: "array",
36
- items: { type: "string" },
37
- }).code).toMatch(`Array<string>`);
36
+ items: {
37
+ type: "object",
38
+ properties: { name: { type: "string" } },
39
+ required: ["name"],
40
+ },
41
+ }, {
42
+ inlineTypes: true,
43
+ }).code.replace(/\s/g, "")).toEqual("Array<{name:string;}>".replace(/\s/g, ""));
38
44
  });
39
45
  it("should convert objects", () => {
40
46
  expect(new TypescriptConverter({
package/dist/TypescriptConverter.test.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"TypescriptConverter.test.js","sourceRoot":"","sources":["../src/TypescriptConverter.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"TypescriptConverter.test.js","sourceRoot":"","sources":["../src/TypescriptConverter.test.ts"],"names":[],"mappings":"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"}
package/dist/TypescriptProcedureConverter.d.ts CHANGED
@@ -12,8 +12,8 @@ export declare class TypescriptProcedureConverter extends TypescriptBaseConverte
12
12
  private refTypes;
13
13
  readonly code: string;
14
14
  constructor(scopeName: string, rpcJsonSchemas: {
15
- args: JSONSchema7Definition;
16
- data: JSONSchema7Definition;
15
+ args: JSONSchema7Definition | undefined;
16
+ data: JSONSchema7Definition | undefined;
17
17
  });
18
18
  private getUniqueRefTypeName;
19
19
  protected getReferencedType(ir: IRNode): string | undefined;
package/dist/TypescriptProcedureConverter.js CHANGED
@@ -13,24 +13,32 @@ export class TypescriptProcedureConverter extends TypescriptBaseConverter {
13
13
  super();
14
14
  this.refTypes = [];
15
15
  this.ir = {
16
- args: new JSONSchemaConverter(rpcJsonSchemas.args),
17
- data: new JSONSchemaConverter(rpcJsonSchemas.data),
16
+ args: rpcJsonSchemas.args
17
+ ? new JSONSchemaConverter(rpcJsonSchemas.args)
18
+ : undefined,
19
+ data: rpcJsonSchemas.data
20
+ ? new JSONSchemaConverter(rpcJsonSchemas.data)
21
+ : undefined,
18
22
  };
19
- const argsCode = this.generateType(this.ir.args.irNode, {
20
- getReferencedType: this.getReferencedType.bind(this),
21
- });
22
- const dataCode = this.generateType(this.ir.data.irNode, {
23
- getReferencedType: this.getReferencedType.bind(this),
24
- });
23
+ const argsCode = this.ir.args
24
+ ? this.generateType(this.ir.args.irNode, {
25
+ getReferencedType: this.getReferencedType.bind(this),
26
+ })
27
+ : undefined;
28
+ const dataCode = this.ir.data
29
+ ? this.generateType(this.ir.data.irNode, {
30
+ getReferencedType: this.getReferencedType.bind(this),
31
+ })
32
+ : undefined;
25
33
  // use 'type' instead of 'interface' for the generated types because we can get `{} & {}` or `Record<string,string>`
26
34
  this.code = `export namespace ${scopeName} {
27
35
  ${this.refTypes
28
36
  .map(([sig, name, { code }]) => `export type ${name} = ${code}`)
29
37
  .join("\n")}
30
38
 
31
- export type Args = ${argsCode}
39
+ export type Args = ${argsCode ? argsCode : "unknown"}
32
40
 
33
- export type Data = ${dataCode}
41
+ export type Data = ${dataCode ? dataCode : "unknown"}
34
42
  }`;
35
43
  }
36
44
  getUniqueRefTypeName(signature, nodePath) {
@@ -52,8 +60,10 @@ export class TypescriptProcedureConverter extends TypescriptBaseConverter {
52
60
  ];
53
61
  if (isArrayItem) {
54
62
  postFixes.unshift("Item");
55
- // remove pluralization from the last segment
56
- path[path.length - 1] = path[path.length - 1].replace(/s$/, "");
63
+ // remove pluralization from the last segment if applicable
64
+ if (path[path.length - 1]) {
65
+ path[path.length - 1] = path[path.length - 1].replace(/s$/, "");
66
+ }
57
67
  }
58
68
  else {
59
69
  postFixes.unshift("");
package/dist/TypescriptProcedureConverter.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"TypescriptProcedureConverter.js","sourceRoot":"","sources":["../src/TypescriptProcedureConverter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"TypescriptProcedureConverter.js","sourceRoot":"","sources":["../src/TypescriptProcedureConverter.ts"],"names":[],"mappings":"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"}
package/dist/TypescriptProceduresConverter.test.js CHANGED
@@ -17,7 +17,9 @@ describe("TypescriptProceduresPlugin", () => {
17
17
  args: {
18
18
  type: "array",
19
19
  items: {
20
- type: "string",
20
+ type: "object",
21
+ properties: { id: { type: "string" } },
22
+ required: ["id"],
21
23
  },
22
24
  },
23
25
  data: {
@@ -28,11 +30,25 @@ describe("TypescriptProceduresPlugin", () => {
28
30
  },
29
31
  });
30
32
  expect(converter.code.replace(/\s/g, "")).toMatch(`export namespace MyScope {
31
- export type Args = Array<string>
33
+ export type Item = { id: string; }
34
+
35
+ export type Args = Array<Item>
32
36
 
33
37
  export type Data = Array<number>
34
38
  }`.replace(/\s/g, ""));
35
39
  });
40
+ it('sets handles undefined args/data types', () => {
41
+ const converter = new TypescriptProcedureConverter("MyScope", {
42
+ args: undefined,
43
+ data: undefined,
44
+ });
45
+ console.log('converter', converter.code);
46
+ expect(converter.code.replace(/\s/g, "")).toMatch(`export namespace MyScope {
47
+ export type Args = unknown
48
+
49
+ export type Data = unknown
50
+ }`.replace(/\s/g, ""));
51
+ });
36
52
  it("complex json-schema", () => {
37
53
  const argsAndData = {
38
54
  type: "object",
package/dist/TypescriptProceduresConverter.test.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"TypescriptProceduresConverter.test.js","sourceRoot":"","sources":["../src/TypescriptProceduresConverter.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"TypescriptProceduresConverter.test.js","sourceRoot":"","sources":["../src/TypescriptProceduresConverter.test.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ajsc",
3
- "version": "1.0.9",
3
+ "version": "1.0.11",
4
4
  "description": "Another Json-Schema Converter",
5
5
  "type": "module",
6
6
  "main": "./dist/index.js",
package/src/Typebox.test.ts CHANGED
@@ -72,4 +72,22 @@ describe("Typebox to IRNode Test", () => {
72
72
  },
73
73
  });
74
74
  });
75
+
76
+ it("should convert intersections", () => {
77
+ expect(
78
+ new JSONSchemaConverter(
79
+ Type.Intersect([Type.String(), Type.Number()]),
80
+ ).irNode,
81
+ ).toMatchObject({
82
+ type: "intersection",
83
+ options: [{ type: "string" }, { type: "number" }],
84
+ });
85
+ })
86
+
87
+ it('should convert arrays', () => {
88
+ expect(new JSONSchemaConverter(Type.Array(Type.String())).irNode).toMatchObject({
89
+ type: "array",
90
+ items: { type: "string" },
91
+ });
92
+ })
75
93
  });
package/src/TypescriptConverter.test.ts CHANGED
@@ -1,5 +1,7 @@
1
1
  import { describe, it, expect } from "vitest";
2
2
  import { TypescriptConverter } from "./TypescriptConverter.js";
3
+ import { JSONSchemaConverter } from "./JSONSchemaConverter.js";
4
+ import { Type } from "@sinclair/typebox";
3
5
 
4
6
  describe("TypeScriptLanguagePlugin", () => {
5
7
  it("should convert strings", () => {
@@ -51,11 +53,20 @@ describe("TypeScriptLanguagePlugin", () => {
51
53
 
52
54
  it("should convert arrays", () => {
53
55
  expect(
54
- new TypescriptConverter({
55
- type: "array",
56
- items: { type: "string" },
57
- }).code,
58
- ).toMatch(`Array<string>`);
56
+ new TypescriptConverter(
57
+ {
58
+ type: "array",
59
+ items: {
60
+ type: "object",
61
+ properties: { name: { type: "string" } },
62
+ required: ["name"],
63
+ },
64
+ },
65
+ {
66
+ inlineTypes: true,
67
+ },
68
+ ).code.replace(/\s/g, ""),
69
+ ).toEqual("Array<{name:string;}>".replace(/\s/g, ""));
59
70
  });
60
71
 
61
72
  it("should convert objects", () => {
package/src/TypescriptProcedureConverter.ts CHANGED
@@ -16,7 +16,10 @@ import { toPascalCase } from "./utils/to-pascal-case.js";
16
16
  * that is created for each IR node.
17
17
  */
18
18
  export class TypescriptProcedureConverter extends TypescriptBaseConverter {
19
- private ir: { args: JSONSchemaConverter; data: JSONSchemaConverter };
19
+ private ir: {
20
+ args: JSONSchemaConverter | undefined;
21
+ data: JSONSchemaConverter | undefined;
22
+ };
20
23
  private refTypes: RefTypes = [];
21
24
 
22
25
  readonly code: string;
@@ -24,24 +27,32 @@ export class TypescriptProcedureConverter extends TypescriptBaseConverter {
24
27
  constructor(
25
28
  scopeName: string,
26
29
  rpcJsonSchemas: {
27
- args: JSONSchema7Definition;
28
- data: JSONSchema7Definition;
30
+ args: JSONSchema7Definition | undefined;
31
+ data: JSONSchema7Definition | undefined;
29
32
  },
30
33
  ) {
31
34
  super();
32
35
 
33
36
  this.ir = {
34
- args: new JSONSchemaConverter(rpcJsonSchemas.args),
35
- data: new JSONSchemaConverter(rpcJsonSchemas.data),
37
+ args: rpcJsonSchemas.args
38
+ ? new JSONSchemaConverter(rpcJsonSchemas.args)
39
+ : undefined,
40
+ data: rpcJsonSchemas.data
41
+ ? new JSONSchemaConverter(rpcJsonSchemas.data)
42
+ : undefined,
36
43
  };
37
44
 
38
- const argsCode = this.generateType(this.ir.args.irNode, {
39
- getReferencedType: this.getReferencedType.bind(this),
40
- });
45
+ const argsCode = this.ir.args
46
+ ? this.generateType(this.ir.args.irNode, {
47
+ getReferencedType: this.getReferencedType.bind(this),
48
+ })
49
+ : undefined;
41
50
 
42
- const dataCode = this.generateType(this.ir.data.irNode, {
43
- getReferencedType: this.getReferencedType.bind(this),
44
- });
51
+ const dataCode = this.ir.data
52
+ ? this.generateType(this.ir.data.irNode, {
53
+ getReferencedType: this.getReferencedType.bind(this),
54
+ })
55
+ : undefined;
45
56
 
46
57
  // use 'type' instead of 'interface' for the generated types because we can get `{} & {}` or `Record<string,string>`
47
58
  this.code = `export namespace ${scopeName} {
@@ -49,9 +60,9 @@ export class TypescriptProcedureConverter extends TypescriptBaseConverter {
49
60
  .map(([sig, name, { code }]) => `export type ${name} = ${code}`)
50
61
  .join("\n")}
51
62
 
52
- export type Args = ${argsCode}
63
+ export type Args = ${argsCode ? argsCode : "unknown"}
53
64
 
54
- export type Data = ${dataCode}
65
+ export type Data = ${dataCode ? dataCode : "unknown"}
55
66
  }`;
56
67
  }
57
68
 
@@ -80,8 +91,11 @@ export class TypescriptProcedureConverter extends TypescriptBaseConverter {
80
91
 
81
92
  if (isArrayItem) {
82
93
  postFixes.unshift("Item");
83
- // remove pluralization from the last segment
84
- path[path.length - 1] = path[path.length - 1].replace(/s$/, "");
94
+
95
+ // remove pluralization from the last segment if applicable
96
+ if (path[path.length - 1]) {
97
+ path[path.length - 1] = path[path.length - 1].replace(/s$/, "");
98
+ }
85
99
  } else {
86
100
  postFixes.unshift("");
87
101
  }
package/src/TypescriptProceduresConverter.test.ts CHANGED
@@ -23,7 +23,9 @@ describe("TypescriptProceduresPlugin", () => {
23
23
  args: {
24
24
  type: "array",
25
25
  items: {
26
- type: "string",
26
+ type: "object",
27
+ properties: { id: { type: "string" } },
28
+ required: ["id"],
27
29
  },
28
30
  },
29
31
  data: {
@@ -36,13 +38,30 @@ describe("TypescriptProceduresPlugin", () => {
36
38
 
37
39
  expect(converter.code.replace(/\s/g, "")).toMatch(
38
40
  `export namespace MyScope {
39
- export type Args = Array<string>
41
+ export type Item = { id: string; }
42
+
43
+ export type Args = Array<Item>
40
44
 
41
45
  export type Data = Array<number>
42
46
  }`.replace(/\s/g, ""),
43
47
  );
44
48
  });
45
49
 
50
+ it('sets handles undefined args/data types', () => {
51
+ const converter = new TypescriptProcedureConverter("MyScope", {
52
+ args: undefined,
53
+ data: undefined,
54
+ });
55
+ console.log('converter', converter.code)
56
+ expect(converter.code.replace(/\s/g, "")).toMatch(
57
+ `export namespace MyScope {
58
+ export type Args = unknown
59
+
60
+ export type Data = unknown
61
+ }`.replace(/\s/g, ""),
62
+ );
63
+ })
64
+
46
65
  it("complex json-schema", () => {
47
66
  const argsAndData: JSONSchema7Definition = {
48
67
  type: "object",