shapedef 1.0.4 → 1.0.6
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/cjs/shape-utils.d.ts +2 -1
- package/dist/cjs/shape-utils.d.ts.map +1 -1
- package/dist/cjs/shape-utils.js +47 -1
- package/dist/cjs/shape-utils.js.map +1 -1
- package/dist/cjs/translations/typescript.d.ts.map +1 -1
- package/dist/cjs/translations/typescript.js +6 -1
- package/dist/cjs/translations/typescript.js.map +1 -1
- package/dist/esm/shape-utils.d.ts +2 -1
- package/dist/esm/shape-utils.d.ts.map +1 -1
- package/dist/esm/shape-utils.js +47 -1
- package/dist/esm/shape-utils.js.map +1 -1
- package/dist/esm/translations/typescript.d.ts.map +1 -1
- package/dist/esm/translations/typescript.js +6 -1
- package/dist/esm/translations/typescript.js.map +1 -1
- package/package.json +1 -1
- package/src/shape-utils.test.ts +90 -0
- package/src/shape-utils.ts +6 -1
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { Shape } from "./shape";
|
|
1
|
+
import { Shape, ShapeRef } from "./shape";
|
|
2
2
|
export declare const shapeCompare: (a: Shape, b: Shape) => boolean;
|
|
3
3
|
export declare const simplifyShape: (shape: Shape) => Shape;
|
|
4
|
+
export declare const getShapeDeps: (shape: Shape) => ShapeRef[];
|
|
4
5
|
//# sourceMappingURL=shape-utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shape-utils.d.ts","sourceRoot":"","sources":["../../src/shape-utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"shape-utils.d.ts","sourceRoot":"","sources":["../../src/shape-utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAU,MAAM,SAAS,CAAC;AAElD,eAAO,MAAM,YAAY,GAAI,GAAG,KAAK,EAAE,GAAG,KAAK,KAAG,OACT,CAAC;AAE1C,eAAO,MAAM,aAAa,GAAI,OAAO,KAAK,KAAG,KAuC5C,CAAC;AAEF,eAAO,MAAM,YAAY,GAAI,OAAO,KAAK,KAAG,QAAQ,EA8CnD,CAAC"}
|
package/dist/cjs/shape-utils.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.simplifyShape = exports.shapeCompare = void 0;
|
|
3
|
+
exports.getShapeDeps = exports.simplifyShape = exports.shapeCompare = void 0;
|
|
4
|
+
const shape_1 = require("./shape");
|
|
4
5
|
const shapeCompare = (a, b) => JSON.stringify(a) === JSON.stringify(b);
|
|
5
6
|
exports.shapeCompare = shapeCompare;
|
|
6
7
|
const simplifyShape = (shape) => {
|
|
@@ -40,4 +41,49 @@ const simplifyShape = (shape) => {
|
|
|
40
41
|
}
|
|
41
42
|
};
|
|
42
43
|
exports.simplifyShape = simplifyShape;
|
|
44
|
+
const getShapeDeps = (shape) => {
|
|
45
|
+
const deps = new Map();
|
|
46
|
+
if (shape.anno.foreign?.shapeName) {
|
|
47
|
+
const ref = shape_1.shapes.ref(shape.anno.foreign.shapeName);
|
|
48
|
+
deps.set(ref.name, ref);
|
|
49
|
+
}
|
|
50
|
+
switch (shape.type) {
|
|
51
|
+
case "ref":
|
|
52
|
+
{
|
|
53
|
+
deps.set(shape.name, shape);
|
|
54
|
+
if (shape.hint) {
|
|
55
|
+
(0, exports.getShapeDeps)(shape.hint).forEach((x) => deps.set(x.name, x));
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
break;
|
|
59
|
+
case "mapping":
|
|
60
|
+
{
|
|
61
|
+
for (const inner of Object.values(shape.rec)) {
|
|
62
|
+
(0, exports.getShapeDeps)(inner).forEach((x) => deps.set(x.name, x));
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
break;
|
|
66
|
+
case "array":
|
|
67
|
+
{
|
|
68
|
+
(0, exports.getShapeDeps)(shape.item).forEach((x) => deps.set(x.name, x));
|
|
69
|
+
}
|
|
70
|
+
break;
|
|
71
|
+
case "union":
|
|
72
|
+
{
|
|
73
|
+
for (const inner of shape.ofs) {
|
|
74
|
+
(0, exports.getShapeDeps)(inner).forEach((x) => deps.set(x.name, x));
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
break;
|
|
78
|
+
case "tuple":
|
|
79
|
+
{
|
|
80
|
+
for (const inner of shape.tup) {
|
|
81
|
+
(0, exports.getShapeDeps)(inner).forEach((x) => deps.set(x.name, x));
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
break;
|
|
85
|
+
}
|
|
86
|
+
return Array.from(deps.values());
|
|
87
|
+
};
|
|
88
|
+
exports.getShapeDeps = getShapeDeps;
|
|
43
89
|
//# sourceMappingURL=shape-utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shape-utils.js","sourceRoot":"","sources":["../../src/shape-utils.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"shape-utils.js","sourceRoot":"","sources":["../../src/shape-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typescript.d.ts","sourceRoot":"","sources":["../../../src/translations/typescript.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"typescript.d.ts","sourceRoot":"","sources":["../../../src/translations/typescript.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAyIhD,eAAO,MAAM,UAAU,EAAE,eAAe,CAAC,MAAM,CAE9C,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAC/B,YAAY,eAAe,EAC3B,UAAS;IACP,WAAW,CAAC,EAAE,MAAM,CAAC;CACjB,WAsBP,CAAC"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.typescriptCollection = exports.typescript = void 0;
|
|
4
4
|
const padding_1 = require("../common/padding");
|
|
5
5
|
const shape_1 = require("../shape");
|
|
6
|
+
const shape_utils_1 = require("../shape-utils");
|
|
6
7
|
const incDepth = (ctx) => ({ ...ctx, depth: ctx.depth + 1 });
|
|
7
8
|
const maybeTypeAlias = (shape, ctx, out) => {
|
|
8
9
|
if (ctx.depth > 0)
|
|
@@ -122,7 +123,11 @@ const typescript = (shape) => {
|
|
|
122
123
|
exports.typescript = typescript;
|
|
123
124
|
const typescriptCollection = (collection, options = {}) => {
|
|
124
125
|
const { summaryName = "Schema" } = options;
|
|
125
|
-
const items = Array.from(collection.values())
|
|
126
|
+
const items = Array.from(collection.values()).toSorted((a, b) => {
|
|
127
|
+
const depsA = (0, shape_utils_1.getShapeDeps)(a);
|
|
128
|
+
const depsB = (0, shape_utils_1.getShapeDeps)(b);
|
|
129
|
+
return depsA.length - depsB.length;
|
|
130
|
+
});
|
|
126
131
|
const rec = shape_1.shapes.mapping(Object.fromEntries(items.map((s) => [s.anno.name || "?", shape_1.shapes.ref(s.anno.name || "?")])));
|
|
127
132
|
const tsContent = [
|
|
128
133
|
items.map((s) => (0, exports.typescript)(s)).join("\n"),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typescript.js","sourceRoot":"","sources":["../../../src/translations/typescript.ts"],"names":[],"mappings":";;;AAAA,+CAA0C;AAC1C,oCAAyC;
|
|
1
|
+
{"version":3,"file":"typescript.js","sourceRoot":"","sources":["../../../src/translations/typescript.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { Shape } from "./shape";
|
|
1
|
+
import { Shape, ShapeRef } from "./shape";
|
|
2
2
|
export declare const shapeCompare: (a: Shape, b: Shape) => boolean;
|
|
3
3
|
export declare const simplifyShape: (shape: Shape) => Shape;
|
|
4
|
+
export declare const getShapeDeps: (shape: Shape) => ShapeRef[];
|
|
4
5
|
//# sourceMappingURL=shape-utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shape-utils.d.ts","sourceRoot":"","sources":["../../src/shape-utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"shape-utils.d.ts","sourceRoot":"","sources":["../../src/shape-utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAU,MAAM,SAAS,CAAC;AAElD,eAAO,MAAM,YAAY,GAAI,GAAG,KAAK,EAAE,GAAG,KAAK,KAAG,OACT,CAAC;AAE1C,eAAO,MAAM,aAAa,GAAI,OAAO,KAAK,KAAG,KAuC5C,CAAC;AAEF,eAAO,MAAM,YAAY,GAAI,OAAO,KAAK,KAAG,QAAQ,EA8CnD,CAAC"}
|
package/dist/esm/shape-utils.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.simplifyShape = exports.shapeCompare = void 0;
|
|
3
|
+
exports.getShapeDeps = exports.simplifyShape = exports.shapeCompare = void 0;
|
|
4
|
+
const shape_1 = require("./shape");
|
|
4
5
|
const shapeCompare = (a, b) => JSON.stringify(a) === JSON.stringify(b);
|
|
5
6
|
exports.shapeCompare = shapeCompare;
|
|
6
7
|
const simplifyShape = (shape) => {
|
|
@@ -40,4 +41,49 @@ const simplifyShape = (shape) => {
|
|
|
40
41
|
}
|
|
41
42
|
};
|
|
42
43
|
exports.simplifyShape = simplifyShape;
|
|
44
|
+
const getShapeDeps = (shape) => {
|
|
45
|
+
const deps = new Map();
|
|
46
|
+
if (shape.anno.foreign?.shapeName) {
|
|
47
|
+
const ref = shape_1.shapes.ref(shape.anno.foreign.shapeName);
|
|
48
|
+
deps.set(ref.name, ref);
|
|
49
|
+
}
|
|
50
|
+
switch (shape.type) {
|
|
51
|
+
case "ref":
|
|
52
|
+
{
|
|
53
|
+
deps.set(shape.name, shape);
|
|
54
|
+
if (shape.hint) {
|
|
55
|
+
(0, exports.getShapeDeps)(shape.hint).forEach((x) => deps.set(x.name, x));
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
break;
|
|
59
|
+
case "mapping":
|
|
60
|
+
{
|
|
61
|
+
for (const inner of Object.values(shape.rec)) {
|
|
62
|
+
(0, exports.getShapeDeps)(inner).forEach((x) => deps.set(x.name, x));
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
break;
|
|
66
|
+
case "array":
|
|
67
|
+
{
|
|
68
|
+
(0, exports.getShapeDeps)(shape.item).forEach((x) => deps.set(x.name, x));
|
|
69
|
+
}
|
|
70
|
+
break;
|
|
71
|
+
case "union":
|
|
72
|
+
{
|
|
73
|
+
for (const inner of shape.ofs) {
|
|
74
|
+
(0, exports.getShapeDeps)(inner).forEach((x) => deps.set(x.name, x));
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
break;
|
|
78
|
+
case "tuple":
|
|
79
|
+
{
|
|
80
|
+
for (const inner of shape.tup) {
|
|
81
|
+
(0, exports.getShapeDeps)(inner).forEach((x) => deps.set(x.name, x));
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
break;
|
|
85
|
+
}
|
|
86
|
+
return Array.from(deps.values());
|
|
87
|
+
};
|
|
88
|
+
exports.getShapeDeps = getShapeDeps;
|
|
43
89
|
//# sourceMappingURL=shape-utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shape-utils.js","sourceRoot":"","sources":["../../src/shape-utils.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"shape-utils.js","sourceRoot":"","sources":["../../src/shape-utils.ts"],"names":[],"mappings":";;;AACA,mCAAkD;AAE3C,MAAM,YAAY,GAAG,CAAC,CAAQ,EAAE,CAAQ,EAAW,EAAE,CAC1D,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AAD7B,QAAA,YAAY,gBACiB;AAEnC,MAAM,aAAa,GAAG,CAAC,KAAY,EAAS,EAAE;IACnD,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;QACnB,KAAK,OAAO,CAAC,CAAC,CAAC;YACb,MAAM,MAAM,GAAG,IAAI,GAAG,CACpB,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAChD,CAAC;YACF,IAAI,MAAM,CAAC,IAAI,KAAK,CAAC;gBACnB,OAAO;oBACL,GAAG,KAAK;oBACR,GAAG,EAAE,CAAC,IAAA,qBAAa,EAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAE,CAAC,CAAC;iBACpC,CAAC;YACJ,OAAO;gBACL,GAAG,KAAK;gBACR,GAAG,EAAE,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,qBAAa,EAAC,CAAC,CAAC,CAAC,CAAC;aACjD,CAAC;QACJ,CAAC;QACD,KAAK,OAAO,CAAC,CAAC,CAAC;YACb,OAAO;gBACL,GAAG,KAAK;gBACR,IAAI,EAAE,IAAA,qBAAa,EAAC,KAAK,CAAC,IAAI,CAAC;aAChC,CAAC;QACJ,CAAC;QACD,KAAK,OAAO,CAAC,CAAC,CAAC;YACb,OAAO;gBACL,GAAG,KAAK;gBACR,GAAG,EAAE,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,qBAAa,EAAC,CAAC,CAAC,CAAC,CAAmB;aACnE,CAAC;QACJ,CAAC;QACD,KAAK,SAAS,CAAC,CAAC,CAAC;YACf,OAAO;gBACL,GAAG,KAAK;gBACR,GAAG,EAAE,MAAM,CAAC,WAAW,CACrB,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,IAAA,qBAAa,EAAC,CAAC,CAAC,CAAC,CAAC,CACjE;aACF,CAAC;QACJ,CAAC;QACD;YACE,OAAO,KAAK,CAAC;IACjB,CAAC;AACH,CAAC,CAAC;AAvCW,QAAA,aAAa,iBAuCxB;AAEK,MAAM,YAAY,GAAG,CAAC,KAAY,EAAc,EAAE;IACvD,MAAM,IAAI,GAA0B,IAAI,GAAG,EAAE,CAAC;IAE9C,IAAI,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,EAAE,CAAC;QAClC,MAAM,GAAG,GAAG,cAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACrD,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC1B,CAAC;IAED,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;QACnB,KAAK,KAAK;YACR,CAAC;gBACC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBAC5B,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;oBACf,IAAA,oBAAY,EAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;gBAC/D,CAAC;YACH,CAAC;YACD,MAAM;QACR,KAAK,SAAS;YACZ,CAAC;gBACC,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;oBAC7C,IAAA,oBAAY,EAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;gBAC1D,CAAC;YACH,CAAC;YACD,MAAM;QACR,KAAK,OAAO;YACV,CAAC;gBACC,IAAA,oBAAY,EAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YAC/D,CAAC;YACD,MAAM;QACR,KAAK,OAAO;YACV,CAAC;gBACC,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,GAAG,EAAE,CAAC;oBAC9B,IAAA,oBAAY,EAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;gBAC1D,CAAC;YACH,CAAC;YACD,MAAM;QACR,KAAK,OAAO;YACV,CAAC;gBACC,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,GAAG,EAAE,CAAC;oBAC9B,IAAA,oBAAY,EAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;gBAC1D,CAAC;YACH,CAAC;YACD,MAAM;IACV,CAAC;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;AACnC,CAAC,CAAC;AA9CW,QAAA,YAAY,gBA8CvB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typescript.d.ts","sourceRoot":"","sources":["../../../src/translations/typescript.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"typescript.d.ts","sourceRoot":"","sources":["../../../src/translations/typescript.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAyIhD,eAAO,MAAM,UAAU,EAAE,eAAe,CAAC,MAAM,CAE9C,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAC/B,YAAY,eAAe,EAC3B,UAAS;IACP,WAAW,CAAC,EAAE,MAAM,CAAC;CACjB,WAsBP,CAAC"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.typescriptCollection = exports.typescript = void 0;
|
|
4
4
|
const padding_1 = require("../common/padding");
|
|
5
5
|
const shape_1 = require("../shape");
|
|
6
|
+
const shape_utils_1 = require("../shape-utils");
|
|
6
7
|
const incDepth = (ctx) => ({ ...ctx, depth: ctx.depth + 1 });
|
|
7
8
|
const maybeTypeAlias = (shape, ctx, out) => {
|
|
8
9
|
if (ctx.depth > 0)
|
|
@@ -122,7 +123,11 @@ const typescript = (shape) => {
|
|
|
122
123
|
exports.typescript = typescript;
|
|
123
124
|
const typescriptCollection = (collection, options = {}) => {
|
|
124
125
|
const { summaryName = "Schema" } = options;
|
|
125
|
-
const items = Array.from(collection.values())
|
|
126
|
+
const items = Array.from(collection.values()).toSorted((a, b) => {
|
|
127
|
+
const depsA = (0, shape_utils_1.getShapeDeps)(a);
|
|
128
|
+
const depsB = (0, shape_utils_1.getShapeDeps)(b);
|
|
129
|
+
return depsA.length - depsB.length;
|
|
130
|
+
});
|
|
126
131
|
const rec = shape_1.shapes.mapping(Object.fromEntries(items.map((s) => [s.anno.name || "?", shape_1.shapes.ref(s.anno.name || "?")])));
|
|
127
132
|
const tsContent = [
|
|
128
133
|
items.map((s) => (0, exports.typescript)(s)).join("\n"),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typescript.js","sourceRoot":"","sources":["../../../src/translations/typescript.ts"],"names":[],"mappings":";;;AAAA,+CAA0C;AAC1C,oCAAyC;
|
|
1
|
+
{"version":3,"file":"typescript.js","sourceRoot":"","sources":["../../../src/translations/typescript.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -0,0 +1,90 @@
|
|
|
1
|
+
import { describe, expect } from "vitest";
|
|
2
|
+
import { annotate, shapes } from "./shape";
|
|
3
|
+
import { getShapeDeps } from "./shape-utils";
|
|
4
|
+
|
|
5
|
+
const names = (deps: ReturnType<typeof getShapeDeps>) =>
|
|
6
|
+
deps.map((d) => d.name);
|
|
7
|
+
|
|
8
|
+
describe("getShapeDeps", (it) => {
|
|
9
|
+
it("returns no deps for leaf shapes", () => {
|
|
10
|
+
expect(getShapeDeps(shapes.str())).toEqual([]);
|
|
11
|
+
expect(getShapeDeps(shapes.int())).toEqual([]);
|
|
12
|
+
expect(getShapeDeps(shapes.bool())).toEqual([]);
|
|
13
|
+
expect(getShapeDeps(shapes.nil())).toEqual([]);
|
|
14
|
+
expect(getShapeDeps(shapes.unknown())).toEqual([]);
|
|
15
|
+
expect(getShapeDeps(shapes.literalStr("x"))).toEqual([]);
|
|
16
|
+
expect(getShapeDeps(shapes.literalInt(1))).toEqual([]);
|
|
17
|
+
expect(getShapeDeps(shapes.vector(3))).toEqual([]);
|
|
18
|
+
});
|
|
19
|
+
|
|
20
|
+
it("returns the ref itself as a dep", () => {
|
|
21
|
+
expect(names(getShapeDeps(shapes.ref("Foo")))).toEqual(["Foo"]);
|
|
22
|
+
});
|
|
23
|
+
|
|
24
|
+
it("includes refs inside a ref hint", () => {
|
|
25
|
+
const shape = shapes.ref("Foo", shapes.mapping({ id: shapes.ref("Bar") }));
|
|
26
|
+
expect(names(getShapeDeps(shape as any))).toEqual(["Foo", "Bar"]);
|
|
27
|
+
});
|
|
28
|
+
|
|
29
|
+
it("recurses into array item", () => {
|
|
30
|
+
expect(names(getShapeDeps(shapes.array(shapes.ref("Foo"))))).toEqual([
|
|
31
|
+
"Foo",
|
|
32
|
+
]);
|
|
33
|
+
});
|
|
34
|
+
|
|
35
|
+
it("recurses into mapping fields", () => {
|
|
36
|
+
const shape = shapes.mapping({
|
|
37
|
+
a: shapes.ref("Foo"),
|
|
38
|
+
b: shapes.ref("Bar"),
|
|
39
|
+
c: shapes.str(),
|
|
40
|
+
});
|
|
41
|
+
expect(names(getShapeDeps(shape))).toEqual(["Foo", "Bar"]);
|
|
42
|
+
});
|
|
43
|
+
|
|
44
|
+
it("recurses into tuple items", () => {
|
|
45
|
+
const shape = shapes.tuple(
|
|
46
|
+
shapes.ref("Foo"),
|
|
47
|
+
shapes.str(),
|
|
48
|
+
shapes.ref("Bar"),
|
|
49
|
+
);
|
|
50
|
+
expect(names(getShapeDeps(shape))).toEqual(["Foo", "Bar"]);
|
|
51
|
+
});
|
|
52
|
+
|
|
53
|
+
it("recurses into union members", () => {
|
|
54
|
+
const shape = shapes.union(
|
|
55
|
+
shapes.ref("Foo"),
|
|
56
|
+
shapes.str(),
|
|
57
|
+
shapes.ref("Bar"),
|
|
58
|
+
);
|
|
59
|
+
expect(names(getShapeDeps(shape))).toEqual(["Foo", "Bar"]);
|
|
60
|
+
});
|
|
61
|
+
|
|
62
|
+
it("deduplicates refs with the same name", () => {
|
|
63
|
+
const shape = shapes.mapping({
|
|
64
|
+
a: shapes.ref("Foo"),
|
|
65
|
+
b: shapes.ref("Foo"),
|
|
66
|
+
});
|
|
67
|
+
expect(names(getShapeDeps(shape))).toEqual(["Foo"]);
|
|
68
|
+
});
|
|
69
|
+
|
|
70
|
+
it("collects anno.foreign as a dep", () => {
|
|
71
|
+
const shape = annotate.foreign(shapes.int(), "User", "id");
|
|
72
|
+
expect(names(getShapeDeps(shape))).toEqual(["User"]);
|
|
73
|
+
});
|
|
74
|
+
|
|
75
|
+
it("collects anno.foreign from nested mapping fields", () => {
|
|
76
|
+
const shape = shapes.mapping({
|
|
77
|
+
userId: annotate.foreign(shapes.int(), "User", "id"),
|
|
78
|
+
postId: annotate.foreign(shapes.int(), "Post", "id"),
|
|
79
|
+
});
|
|
80
|
+
expect(names(getShapeDeps(shape))).toEqual(["User", "Post"]);
|
|
81
|
+
});
|
|
82
|
+
|
|
83
|
+
it("combines ref and anno.foreign deps", () => {
|
|
84
|
+
const shape = shapes.mapping({
|
|
85
|
+
type: shapes.ref("Kind"),
|
|
86
|
+
ownerId: annotate.foreign(shapes.int(), "Owner", "id"),
|
|
87
|
+
});
|
|
88
|
+
expect(names(getShapeDeps(shape))).toEqual(["Kind", "Owner"]);
|
|
89
|
+
});
|
|
90
|
+
});
|
package/src/shape-utils.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { TupleOf } from "./common";
|
|
2
|
-
import { Shape, ShapeRef } from "./shape";
|
|
2
|
+
import { Shape, ShapeRef, shapes } from "./shape";
|
|
3
3
|
|
|
4
4
|
export const shapeCompare = (a: Shape, b: Shape): boolean =>
|
|
5
5
|
JSON.stringify(a) === JSON.stringify(b);
|
|
@@ -48,6 +48,11 @@ export const simplifyShape = (shape: Shape): Shape => {
|
|
|
48
48
|
export const getShapeDeps = (shape: Shape): ShapeRef[] => {
|
|
49
49
|
const deps: Map<string, ShapeRef> = new Map();
|
|
50
50
|
|
|
51
|
+
if (shape.anno.foreign?.shapeName) {
|
|
52
|
+
const ref = shapes.ref(shape.anno.foreign.shapeName);
|
|
53
|
+
deps.set(ref.name, ref);
|
|
54
|
+
}
|
|
55
|
+
|
|
51
56
|
switch (shape.type) {
|
|
52
57
|
case "ref":
|
|
53
58
|
{
|