ajsc 1.0.8 → 1.0.10
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.
- package/dist/JSONSchemaConverter.d.ts +1 -1
- package/dist/JSONSchemaConverter.js +1 -3
- package/dist/JSONSchemaConverter.js.map +1 -1
- package/dist/Typebox.test.d.ts +1 -0
- package/dist/Typebox.test.js +62 -0
- package/dist/Typebox.test.js.map +1 -0
- package/dist/TypescriptConverter.test.js +8 -2
- package/dist/TypescriptConverter.test.js.map +1 -1
- package/dist/TypescriptProcedureConverter.js +6 -4
- package/dist/TypescriptProcedureConverter.js.map +1 -1
- package/dist/TypescriptProceduresConverter.test.js +25 -0
- package/dist/TypescriptProceduresConverter.test.js.map +1 -1
- package/package.json +2 -1
- package/src/JSONSchemaConverter.ts +1 -3
- package/src/Typebox.test.ts +93 -0
- package/src/TypescriptConverter.test.ts +16 -5
- package/src/TypescriptProcedureConverter.ts +8 -4
- package/src/TypescriptProceduresConverter.test.ts +29 -0
|
@@ -26,7 +26,7 @@ export declare class JSONSchemaConverter {
|
|
|
26
26
|
*/
|
|
27
27
|
private convertSchema;
|
|
28
28
|
/**
|
|
29
|
-
* Converts a JSON Schema definition to
|
|
29
|
+
* Converts a JSON Schema definition to an IRNode.
|
|
30
30
|
*/
|
|
31
31
|
convertToIRSchema(schema: JSONSchema7Definition): IRNode;
|
|
32
32
|
private validateSchema;
|
|
@@ -212,8 +212,6 @@ export class JSONSchemaConverter {
|
|
|
212
212
|
case "number":
|
|
213
213
|
case "integer":
|
|
214
214
|
case "boolean":
|
|
215
|
-
// // Typebox has a Type.Undefined which is a type of undefined - we map it to null
|
|
216
|
-
case "undefined":
|
|
217
215
|
case "null": {
|
|
218
216
|
const node = { type: schema.type, path: ctx.path };
|
|
219
217
|
node.constraints = {};
|
|
@@ -238,7 +236,7 @@ export class JSONSchemaConverter {
|
|
|
238
236
|
return { type: "object", properties: {}, path: ctx.path };
|
|
239
237
|
}
|
|
240
238
|
/**
|
|
241
|
-
* Converts a JSON Schema definition to
|
|
239
|
+
* Converts a JSON Schema definition to an IRNode.
|
|
242
240
|
*/
|
|
243
241
|
convertToIRSchema(schema) {
|
|
244
242
|
// reset the root schema
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JSONSchemaConverter.js","sourceRoot":"","sources":["../src/JSONSchemaConverter.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"JSONSchemaConverter.js","sourceRoot":"","sources":["../src/JSONSchemaConverter.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
import { describe, it, expect } from "vitest";
|
|
2
|
+
import { JSONSchemaConverter } from "./JSONSchemaConverter.js";
|
|
3
|
+
import { Type } from "@sinclair/typebox";
|
|
4
|
+
describe("Typebox to IRNode Test", () => {
|
|
5
|
+
it("should convert strings", () => {
|
|
6
|
+
expect(new JSONSchemaConverter(Type.String()).irNode.type).toMatch("string");
|
|
7
|
+
});
|
|
8
|
+
it("should convert numbers", () => {
|
|
9
|
+
expect(new JSONSchemaConverter(Type.Number()).irNode.type).toMatch("number");
|
|
10
|
+
});
|
|
11
|
+
it("should convert booleans", () => {
|
|
12
|
+
expect(new JSONSchemaConverter(Type.Boolean()).irNode.type).toMatch("boolean");
|
|
13
|
+
});
|
|
14
|
+
it("should convert null", () => {
|
|
15
|
+
expect(new JSONSchemaConverter(Type.Null()).irNode.type).toMatch("null");
|
|
16
|
+
});
|
|
17
|
+
it("should convert literals", () => {
|
|
18
|
+
expect(new JSONSchemaConverter(Type.Literal("fixedValue")).irNode).toMatchObject({ type: "literal", constraints: { value: "fixedValue" } });
|
|
19
|
+
});
|
|
20
|
+
it("should convert enums", () => {
|
|
21
|
+
expect(new JSONSchemaConverter(Type.Enum({ Value1: "value1", Value2: "value2", Value3: "value3" })).irNode).toMatchObject({
|
|
22
|
+
type: "union",
|
|
23
|
+
options: [
|
|
24
|
+
{ type: "literal", constraints: { value: "value1" } },
|
|
25
|
+
{ type: "literal", constraints: { value: "value2" } },
|
|
26
|
+
{ type: "literal", constraints: { value: "value3" } },
|
|
27
|
+
],
|
|
28
|
+
});
|
|
29
|
+
});
|
|
30
|
+
it("should convert unions", () => {
|
|
31
|
+
expect(new JSONSchemaConverter(Type.Union([Type.String(), Type.Number()]))
|
|
32
|
+
.irNode).toMatchObject({
|
|
33
|
+
type: "union",
|
|
34
|
+
options: [{ type: "string" }, { type: "number" }],
|
|
35
|
+
});
|
|
36
|
+
});
|
|
37
|
+
it("should convert composite unions", () => {
|
|
38
|
+
expect(new JSONSchemaConverter(Type.Composite([
|
|
39
|
+
Type.Object({ a: Type.String() }),
|
|
40
|
+
Type.Object({ b: Type.Number() }),
|
|
41
|
+
])).irNode).toMatchObject({
|
|
42
|
+
type: "object",
|
|
43
|
+
properties: {
|
|
44
|
+
a: { type: "string", path: "a", required: true },
|
|
45
|
+
b: { type: "number", path: "b", required: true },
|
|
46
|
+
},
|
|
47
|
+
});
|
|
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
|
+
});
|
|
61
|
+
});
|
|
62
|
+
//# sourceMappingURL=Typebox.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Typebox.test.js","sourceRoot":"","sources":["../src/Typebox.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,8 +33,14 @@ describe("TypeScriptLanguagePlugin", () => {
|
|
|
33
33
|
it("should convert arrays", () => {
|
|
34
34
|
expect(new TypescriptConverter({
|
|
35
35
|
type: "array",
|
|
36
|
-
items: {
|
|
37
|
-
|
|
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({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TypescriptConverter.test.js","sourceRoot":"","sources":["../src/TypescriptConverter.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"TypescriptConverter.test.js","sourceRoot":"","sources":["../src/TypescriptConverter.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,10 +16,10 @@ export class TypescriptProcedureConverter extends TypescriptBaseConverter {
|
|
|
16
16
|
args: new JSONSchemaConverter(rpcJsonSchemas.args),
|
|
17
17
|
data: new JSONSchemaConverter(rpcJsonSchemas.data),
|
|
18
18
|
};
|
|
19
|
-
const argsCode = this.
|
|
19
|
+
const argsCode = this.generateType(this.ir.args.irNode, {
|
|
20
20
|
getReferencedType: this.getReferencedType.bind(this),
|
|
21
21
|
});
|
|
22
|
-
const dataCode = this.
|
|
22
|
+
const dataCode = this.generateType(this.ir.data.irNode, {
|
|
23
23
|
getReferencedType: this.getReferencedType.bind(this),
|
|
24
24
|
});
|
|
25
25
|
// use 'type' instead of 'interface' for the generated types because we can get `{} & {}` or `Record<string,string>`
|
|
@@ -52,8 +52,10 @@ export class TypescriptProcedureConverter extends TypescriptBaseConverter {
|
|
|
52
52
|
];
|
|
53
53
|
if (isArrayItem) {
|
|
54
54
|
postFixes.unshift("Item");
|
|
55
|
-
// remove pluralization from the last segment
|
|
56
|
-
|
|
55
|
+
// remove pluralization from the last segment if applicable
|
|
56
|
+
if (path[path.length - 1]) {
|
|
57
|
+
path[path.length - 1] = path[path.length - 1].replace(/s$/, "");
|
|
58
|
+
}
|
|
57
59
|
}
|
|
58
60
|
else {
|
|
59
61
|
postFixes.unshift("");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TypescriptProcedureConverter.js","sourceRoot":"","sources":["../src/TypescriptProcedureConverter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAGL,uBAAuB,GACxB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD;;;;;GAKG;AACH,MAAM,OAAO,4BAA6B,SAAQ,uBAAuB;IAMvE,YACE,SAAiB,EACjB,cAGC;QAED,KAAK,EAAE,CAAC;QAXF,aAAQ,GAAa,EAAE,CAAC;QAa9B,IAAI,CAAC,EAAE,GAAG;YACR,IAAI,EAAE,IAAI,mBAAmB,CAAC,cAAc,CAAC,IAAI,CAAC;YAClD,IAAI,EAAE,IAAI,mBAAmB,CAAC,cAAc,CAAC,IAAI,CAAC;SACnD,CAAC;QAEF,MAAM,QAAQ,GAAG,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"TypescriptProcedureConverter.js","sourceRoot":"","sources":["../src/TypescriptProcedureConverter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAGL,uBAAuB,GACxB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD;;;;;GAKG;AACH,MAAM,OAAO,4BAA6B,SAAQ,uBAAuB;IAMvE,YACE,SAAiB,EACjB,cAGC;QAED,KAAK,EAAE,CAAC;QAXF,aAAQ,GAAa,EAAE,CAAC;QAa9B,IAAI,CAAC,EAAE,GAAG;YACR,IAAI,EAAE,IAAI,mBAAmB,CAAC,cAAc,CAAC,IAAI,CAAC;YAClD,IAAI,EAAE,IAAI,mBAAmB,CAAC,cAAc,CAAC,IAAI,CAAC;SACnD,CAAC;QAEF,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE;YACtD,iBAAiB,EAAE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC;SACrD,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE;YACtD,iBAAiB,EAAE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC;SACrD,CAAC,CAAC;QAEH,oHAAoH;QACpH,IAAI,CAAC,IAAI,GAAG,oBAAoB,SAAS;UACnC,IAAI,CAAC,QAAQ;aACZ,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,IAAI,MAAM,IAAI,EAAE,CAAC;aAC/D,IAAI,CAAC,IAAI,CAAC;;6BAEQ,QAAQ;;6BAER,QAAQ;MAC/B,CAAC;IACL,CAAC;IAEO,oBAAoB,CAC1B,SAAiB,EACjB,QAAgB;QAEhB,MAAM,IAAI,GAAG,SAAS,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAE3C,6CAA6C;QAC7C,MAAM,WAAW,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC;QAE7D,MAAM,SAAS,GAAG;YAChB,MAAM;YACN,SAAS;YACT,QAAQ;YACR,QAAQ;YACR,OAAO;YACP,GAAG;YACH,GAAG;YACH,GAAG;YACH,GAAG;YACH,GAAG;YACH,GAAG;SACJ,CAAC;QAEF,IAAI,WAAW,EAAE,CAAC;YAChB,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAE1B,2DAA2D;YAC3D,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,CAAC;gBAC1B,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAClE,CAAC;QACH,CAAC;aAAM,CAAC;YACN,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACxB,CAAC;QAED,IAAI,sBAAsB,GAAG,CAAC,CAAC;QAC/B,IAAI,IAAI,GAAG,EAAE,CAAC;QACd,IAAI,iBAAiB,GAAG,CAAC,CAAC;QAE1B,OAAO,CAAC,IAAI,EAAE,CAAC;YACb,MAAM,YAAY,GAChB,IAAI,CAAC,KAAK,CAAC,CAAC,sBAAsB,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC9D,SAAS,CAAC,iBAAiB,CAAC,CAAC;YAE/B,MAAM,mBAAmB,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE;gBAC7D,OAAO,GAAG,KAAK,SAAS,IAAI,IAAI,KAAK,YAAY,CAAC;YACpD,CAAC,CAAC,CAAC;YAEH,IAAI,mBAAmB,EAAE,CAAC;gBACxB,OAAO,mBAAmB,CAAC,CAAC,CAAC,CAAC;YAChC,CAAC;YAED,MAAM,eAAe,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,EAAE;gBACvD,OAAO,IAAI,KAAK,YAAY,CAAC;YAC/B,CAAC,CAAC,CAAC;YAEH,IAAI,eAAe,EAAE,CAAC;gBACpB,sBAAsB,EAAE,CAAC;gBAEzB,IAAI,sBAAsB,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;oBAC1C,0EAA0E;oBAC1E,iBAAiB,EAAE,CAAC;oBACpB,sBAAsB,GAAG,CAAC,CAAC;oBAE3B,yDAAyD;oBACzD,IAAI,iBAAiB,KAAK,SAAS,CAAC,MAAM,EAAE,CAAC;wBAC3C,IAAI,GAAG,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC;oBACzD,CAAC;gBACH,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,IAAI,GAAG,YAAY,CAAC;YACtB,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAES,iBAAiB,CAAC,EAAU;QACpC,MAAM,SAAS,GAAG,EAAE,CAAC,SAAS,CAAC;QAE/B,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,MAAM,IAAI,GAAG,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;QAE3D,sEAAsE;QACtE,IACE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,CAAC,EACzE,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,iFAAiF;QACjF,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;YACjB,SAAS;YACT,IAAI;YACJ;gBACE,IAAI,EAAE,EAAE;aACT;SACF,CAAC,CAAC;QAEH,MAAM,IAAI,GAAG,IAAI,CAAC,kBAAkB,CAAC,EAAE,EAAE;YACvC,iBAAiB,EAAE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC;SACrD,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,IAAI,CAChB,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,CACrD,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,IAAI,CAAC;QAElB,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
|
|
@@ -12,6 +12,31 @@ describe("TypescriptProceduresPlugin", () => {
|
|
|
12
12
|
export type Data = { [key:string]: unknown }
|
|
13
13
|
}`.replace(/\s/g, ""));
|
|
14
14
|
});
|
|
15
|
+
it("sets Args/Data as array type", () => {
|
|
16
|
+
const converter = new TypescriptProcedureConverter("MyScope", {
|
|
17
|
+
args: {
|
|
18
|
+
type: "array",
|
|
19
|
+
items: {
|
|
20
|
+
type: "object",
|
|
21
|
+
properties: { id: { type: "string" } },
|
|
22
|
+
required: ["id"],
|
|
23
|
+
},
|
|
24
|
+
},
|
|
25
|
+
data: {
|
|
26
|
+
type: "array",
|
|
27
|
+
items: {
|
|
28
|
+
type: "number",
|
|
29
|
+
},
|
|
30
|
+
},
|
|
31
|
+
});
|
|
32
|
+
expect(converter.code.replace(/\s/g, "")).toMatch(`export namespace MyScope {
|
|
33
|
+
export type Item = { id: string; }
|
|
34
|
+
|
|
35
|
+
export type Args = Array<Item>
|
|
36
|
+
|
|
37
|
+
export type Data = Array<number>
|
|
38
|
+
}`.replace(/\s/g, ""));
|
|
39
|
+
});
|
|
15
40
|
it("complex json-schema", () => {
|
|
16
41
|
const argsAndData = {
|
|
17
42
|
type: "object",
|
|
@@ -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.
|
|
3
|
+
"version": "1.0.10",
|
|
4
4
|
"description": "Another Json-Schema Converter",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.js",
|
|
@@ -46,6 +46,7 @@
|
|
|
46
46
|
},
|
|
47
47
|
"devDependencies": {
|
|
48
48
|
"@types/json-schema": "^7.0.15",
|
|
49
|
+
"@sinclair/typebox": "^0.34.41",
|
|
49
50
|
"prettier": "^3.5.1",
|
|
50
51
|
"typescript": "^5.7.3",
|
|
51
52
|
"vitest": "^3.0.5"
|
|
@@ -279,8 +279,6 @@ export class JSONSchemaConverter {
|
|
|
279
279
|
case "number":
|
|
280
280
|
case "integer":
|
|
281
281
|
case "boolean":
|
|
282
|
-
// // Typebox has a Type.Undefined which is a type of undefined - we map it to null
|
|
283
|
-
case "undefined" as "null":
|
|
284
282
|
case "null": {
|
|
285
283
|
const node: IRNode = { type: schema.type, path: ctx.path };
|
|
286
284
|
node.constraints = {};
|
|
@@ -308,7 +306,7 @@ export class JSONSchemaConverter {
|
|
|
308
306
|
}
|
|
309
307
|
|
|
310
308
|
/**
|
|
311
|
-
* Converts a JSON Schema definition to
|
|
309
|
+
* Converts a JSON Schema definition to an IRNode.
|
|
312
310
|
*/
|
|
313
311
|
public convertToIRSchema(schema: JSONSchema7Definition): IRNode {
|
|
314
312
|
// reset the root schema
|
|
@@ -0,0 +1,93 @@
|
|
|
1
|
+
import { describe, it, expect } from "vitest";
|
|
2
|
+
import { JSONSchemaConverter } from "./JSONSchemaConverter.js";
|
|
3
|
+
import { Type } from "@sinclair/typebox";
|
|
4
|
+
|
|
5
|
+
describe("Typebox to IRNode Test", () => {
|
|
6
|
+
it("should convert strings", () => {
|
|
7
|
+
expect(new JSONSchemaConverter(Type.String()).irNode.type).toMatch(
|
|
8
|
+
"string",
|
|
9
|
+
);
|
|
10
|
+
});
|
|
11
|
+
|
|
12
|
+
it("should convert numbers", () => {
|
|
13
|
+
expect(new JSONSchemaConverter(Type.Number()).irNode.type).toMatch(
|
|
14
|
+
"number",
|
|
15
|
+
);
|
|
16
|
+
});
|
|
17
|
+
|
|
18
|
+
it("should convert booleans", () => {
|
|
19
|
+
expect(new JSONSchemaConverter(Type.Boolean()).irNode.type).toMatch(
|
|
20
|
+
"boolean",
|
|
21
|
+
);
|
|
22
|
+
});
|
|
23
|
+
|
|
24
|
+
it("should convert null", () => {
|
|
25
|
+
expect(new JSONSchemaConverter(Type.Null()).irNode.type).toMatch("null");
|
|
26
|
+
});
|
|
27
|
+
|
|
28
|
+
it("should convert literals", () => {
|
|
29
|
+
expect(
|
|
30
|
+
new JSONSchemaConverter(Type.Literal("fixedValue")).irNode,
|
|
31
|
+
).toMatchObject({ type: "literal", constraints: { value: "fixedValue" } });
|
|
32
|
+
});
|
|
33
|
+
|
|
34
|
+
it("should convert enums", () => {
|
|
35
|
+
expect(
|
|
36
|
+
new JSONSchemaConverter(
|
|
37
|
+
Type.Enum({ Value1: "value1", Value2: "value2", Value3: "value3" }),
|
|
38
|
+
).irNode,
|
|
39
|
+
).toMatchObject({
|
|
40
|
+
type: "union",
|
|
41
|
+
options: [
|
|
42
|
+
{ type: "literal", constraints: { value: "value1" } },
|
|
43
|
+
{ type: "literal", constraints: { value: "value2" } },
|
|
44
|
+
{ type: "literal", constraints: { value: "value3" } },
|
|
45
|
+
],
|
|
46
|
+
});
|
|
47
|
+
});
|
|
48
|
+
|
|
49
|
+
it("should convert unions", () => {
|
|
50
|
+
expect(
|
|
51
|
+
new JSONSchemaConverter(Type.Union([Type.String(), Type.Number()]))
|
|
52
|
+
.irNode,
|
|
53
|
+
).toMatchObject({
|
|
54
|
+
type: "union",
|
|
55
|
+
options: [{ type: "string" }, { type: "number" }],
|
|
56
|
+
});
|
|
57
|
+
});
|
|
58
|
+
|
|
59
|
+
it("should convert composite unions", () => {
|
|
60
|
+
expect(
|
|
61
|
+
new JSONSchemaConverter(
|
|
62
|
+
Type.Composite([
|
|
63
|
+
Type.Object({ a: Type.String() }),
|
|
64
|
+
Type.Object({ b: Type.Number() }),
|
|
65
|
+
]),
|
|
66
|
+
).irNode,
|
|
67
|
+
).toMatchObject({
|
|
68
|
+
type: "object",
|
|
69
|
+
properties: {
|
|
70
|
+
a: { type: "string", path: "a", required: true },
|
|
71
|
+
b: { type: "number", path: "b", required: true },
|
|
72
|
+
},
|
|
73
|
+
});
|
|
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
|
+
})
|
|
93
|
+
});
|
|
@@ -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
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
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", () => {
|
|
@@ -35,10 +35,11 @@ export class TypescriptProcedureConverter extends TypescriptBaseConverter {
|
|
|
35
35
|
data: new JSONSchemaConverter(rpcJsonSchemas.data),
|
|
36
36
|
};
|
|
37
37
|
|
|
38
|
-
const argsCode = this.
|
|
38
|
+
const argsCode = this.generateType(this.ir.args.irNode, {
|
|
39
39
|
getReferencedType: this.getReferencedType.bind(this),
|
|
40
40
|
});
|
|
41
|
-
|
|
41
|
+
|
|
42
|
+
const dataCode = this.generateType(this.ir.data.irNode, {
|
|
42
43
|
getReferencedType: this.getReferencedType.bind(this),
|
|
43
44
|
});
|
|
44
45
|
|
|
@@ -79,8 +80,11 @@ export class TypescriptProcedureConverter extends TypescriptBaseConverter {
|
|
|
79
80
|
|
|
80
81
|
if (isArrayItem) {
|
|
81
82
|
postFixes.unshift("Item");
|
|
82
|
-
|
|
83
|
-
|
|
83
|
+
|
|
84
|
+
// remove pluralization from the last segment if applicable
|
|
85
|
+
if (path[path.length - 1]) {
|
|
86
|
+
path[path.length - 1] = path[path.length - 1].replace(/s$/, "");
|
|
87
|
+
}
|
|
84
88
|
} else {
|
|
85
89
|
postFixes.unshift("");
|
|
86
90
|
}
|
|
@@ -18,6 +18,35 @@ describe("TypescriptProceduresPlugin", () => {
|
|
|
18
18
|
);
|
|
19
19
|
});
|
|
20
20
|
|
|
21
|
+
it("sets Args/Data as array type", () => {
|
|
22
|
+
const converter = new TypescriptProcedureConverter("MyScope", {
|
|
23
|
+
args: {
|
|
24
|
+
type: "array",
|
|
25
|
+
items: {
|
|
26
|
+
type: "object",
|
|
27
|
+
properties: { id: { type: "string" } },
|
|
28
|
+
required: ["id"],
|
|
29
|
+
},
|
|
30
|
+
},
|
|
31
|
+
data: {
|
|
32
|
+
type: "array",
|
|
33
|
+
items: {
|
|
34
|
+
type: "number",
|
|
35
|
+
},
|
|
36
|
+
},
|
|
37
|
+
});
|
|
38
|
+
|
|
39
|
+
expect(converter.code.replace(/\s/g, "")).toMatch(
|
|
40
|
+
`export namespace MyScope {
|
|
41
|
+
export type Item = { id: string; }
|
|
42
|
+
|
|
43
|
+
export type Args = Array<Item>
|
|
44
|
+
|
|
45
|
+
export type Data = Array<number>
|
|
46
|
+
}`.replace(/\s/g, ""),
|
|
47
|
+
);
|
|
48
|
+
});
|
|
49
|
+
|
|
21
50
|
it("complex json-schema", () => {
|
|
22
51
|
const argsAndData: JSONSchema7Definition = {
|
|
23
52
|
type: "object",
|