@takeshape/schema 8.285.0 → 8.286.1
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/content-schema-transform.d.ts +2 -1
- package/dist/content-schema-transform.d.ts.map +1 -1
- package/dist/content-schema-transform.js +5 -0
- package/dist/interfaces.d.ts +3 -1
- package/dist/interfaces.d.ts.map +1 -1
- package/dist/interfaces.js +25 -0
- package/dist/schema-util.d.ts +2 -1
- package/dist/schema-util.d.ts.map +1 -1
- package/dist/schema-util.js +13 -0
- package/es/content-schema-transform.js +5 -0
- package/es/interfaces.js +22 -1
- package/es/schema-util.js +10 -0
- package/package.json +4 -4
|
@@ -24,11 +24,12 @@ export interface ContentTransformParams {
|
|
|
24
24
|
keyTransform?: KeyTransform;
|
|
25
25
|
sourceKeyTransform?: SourceKeyTransform;
|
|
26
26
|
passThrough?: boolean;
|
|
27
|
+
allowNullObjects?: boolean;
|
|
27
28
|
}
|
|
28
29
|
export declare function preferKey(name: string, schema: PropertySchema): string;
|
|
29
30
|
export declare function preferSourceKey(name: string, schema: PropertySchema): string[];
|
|
30
31
|
export declare function findTransforms(pluginMap: PropertyTransformMap | undefined, schema: PropertySchema, name: string, shape?: Shape): PropertyTransform | undefined;
|
|
31
|
-
export declare function getContentTransform({ transforms, accumulators, keyTransform, sourceKeyTransform, passThrough, projectSchema }: ContentTransformParams): ContentTransform;
|
|
32
|
+
export declare function getContentTransform({ transforms, accumulators, keyTransform, sourceKeyTransform, passThrough, allowNullObjects, projectSchema }: ContentTransformParams): ContentTransform;
|
|
32
33
|
export interface PropertyInfo {
|
|
33
34
|
schema: PropertySchema;
|
|
34
35
|
key: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"content-schema-transform.d.ts","sourceRoot":"","sources":["../../src/content-schema-transform.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,aAAa,EAAE,cAAc,EAAE,KAAK,EAAC,MAAM,kBAAkB,CAAC;AAW3E,oBAAY,UAAU,GAAG,GAAG,GAAG,QAAQ,GAAG,OAAO,GAAG,QAAQ,GAAG,QAAQ,GAAG,SAAS,GAAG,SAAS,CAAC;AAEhG,wBAAgB,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,cAAc,EAAE,MAAM,CAAC,GAAG,UAAU,CAqBxE;AAED,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE3C;AAMD,oBAAY,gBAAgB,GAAG,CAAC,MAAM,EAAE,cAAc,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC;AAEhG,oBAAY,kBAAkB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,KAAK,MAAM,GAAG,MAAM,EAAE,CAAC;AAE7F,oBAAY,YAAY,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,SAAS,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC;AAEhG,MAAM,WAAW,iBAAiB;IAChC,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,MAAM,CAAC,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC;IACrE,OAAO,CACL,KAAK,EAAE,OAAO,EACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,KAAK,GAAG,SAAS,EACxB,IAAI,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,GACtE,OAAO,CAAC;CACZ;AAED,MAAM,WAAW,WAAW,CAAC,CAAC,GAAG,OAAO;IACtC,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACvE,UAAU,IAAI,CAAC,CAAC;CACjB;AAED,oBAAY,oBAAoB,GAAG;KAAE,GAAG,IAAI,UAAU,CAAC,CAAC,EAAE,iBAAiB,EAAE;CAAC,CAAC;AAE/E,MAAM,WAAW,sBAAsB;IACrC,UAAU,CAAC,EAAE,oBAAoB,CAAC;IAClC,YAAY,CAAC,EAAE,WAAW,EAAE,CAAC;IAC7B,aAAa,EAAE,aAAa,CAAC;IAC7B,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,WAAW,CAAC,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"content-schema-transform.d.ts","sourceRoot":"","sources":["../../src/content-schema-transform.ts"],"names":[],"mappings":"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"}
|
|
@@ -86,6 +86,7 @@ function getContentTransform({
|
|
|
86
86
|
keyTransform = preferKey,
|
|
87
87
|
sourceKeyTransform = preferSourceKey,
|
|
88
88
|
passThrough = true,
|
|
89
|
+
allowNullObjects = false,
|
|
89
90
|
projectSchema
|
|
90
91
|
}) {
|
|
91
92
|
const prepare = (schema, obj, name = '') => {
|
|
@@ -157,6 +158,10 @@ function getContentTransform({
|
|
|
157
158
|
if (obj === undefined) {
|
|
158
159
|
prepare(itemSchema, obj, name);
|
|
159
160
|
}
|
|
161
|
+
}
|
|
162
|
+
|
|
163
|
+
if (allowNullObjects && (0, _utils.isObjectSchema)(schema) && obj === null) {
|
|
164
|
+
return null;
|
|
160
165
|
} // Allow properties that have not been transformed
|
|
161
166
|
|
|
162
167
|
|
package/dist/interfaces.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { PropertySchema, Shape, ShapeMap } from './project-schema';
|
|
1
|
+
import type { OneOfSchema, ProjectSchema, PropertySchema, Shape, ShapeMap } from './project-schema';
|
|
2
2
|
import type { ServicesShapesContext } from './refs';
|
|
3
3
|
export declare function isInterfaceShape(shape?: Shape): boolean;
|
|
4
4
|
export declare type ImplementationShapeMap = Record<string, Set<Shape>>;
|
|
@@ -7,4 +7,6 @@ export declare function isInterfaceRef(context: ServicesShapesContext, propertyS
|
|
|
7
7
|
export declare function getImplementationShapeMap(shapeMap: ShapeMap): ImplementationShapeMap;
|
|
8
8
|
export declare function getImplementationShapeNameMap(shapeMap: ShapeMap): ImplementationShapeNameMap;
|
|
9
9
|
export declare function pruneUnusedInterfaces(shapeMap: ShapeMap): ShapeMap;
|
|
10
|
+
export declare function getImplementingShapes(shapeMap: ShapeMap, interfaceName: string): Shape[];
|
|
11
|
+
export declare function interfaceToUnion(context: Pick<ProjectSchema, 'shapes' | 'services'>, interfaceName: string): OneOfSchema;
|
|
10
12
|
//# sourceMappingURL=interfaces.d.ts.map
|
package/dist/interfaces.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../src/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,cAAc,EAAE,KAAK,EAAE,QAAQ,EAAC,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../src/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,WAAW,EAAE,aAAa,EAAE,cAAc,EAAE,KAAK,EAAE,QAAQ,EAAC,MAAM,kBAAkB,CAAC;AAClG,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,QAAQ,CAAC;AAIlD,wBAAgB,gBAAgB,CAAC,KAAK,CAAC,EAAE,KAAK,GAAG,OAAO,CAEvD;AAED,oBAAY,sBAAsB,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;AAChE,oBAAY,0BAA0B,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;AAErE,wBAAgB,cAAc,CAAC,OAAO,EAAE,qBAAqB,EAAE,cAAc,EAAE,cAAc,GAAG,OAAO,CAGtG;AAqBD,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,QAAQ,GAAG,sBAAsB,CAEpF;AAED,wBAAgB,6BAA6B,CAAC,QAAQ,EAAE,QAAQ,GAAG,0BAA0B,CAE5F;AAED,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,QAAQ,GAAG,QAAQ,CAYlE;AAED,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,GAAG,KAAK,EAAE,CASxF;AAED,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,IAAI,CAAC,aAAa,EAAE,QAAQ,GAAG,UAAU,CAAC,EACnD,aAAa,EAAE,MAAM,GACpB,WAAW,CAKb"}
|
package/dist/interfaces.js
CHANGED
|
@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports.getImplementationShapeMap = getImplementationShapeMap;
|
|
7
7
|
exports.getImplementationShapeNameMap = getImplementationShapeNameMap;
|
|
8
|
+
exports.getImplementingShapes = getImplementingShapes;
|
|
9
|
+
exports.interfaceToUnion = interfaceToUnion;
|
|
8
10
|
exports.isInterfaceRef = isInterfaceRef;
|
|
9
11
|
exports.isInterfaceShape = isInterfaceShape;
|
|
10
12
|
exports.pruneUnusedInterfaces = pruneUnusedInterfaces;
|
|
@@ -70,4 +72,27 @@ function pruneUnusedInterfaces(shapeMap) {
|
|
|
70
72
|
|
|
71
73
|
return shape;
|
|
72
74
|
});
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
function getImplementingShapes(shapeMap, interfaceName) {
|
|
78
|
+
const implementingShapes = [];
|
|
79
|
+
|
|
80
|
+
for (const shape of Object.values(shapeMap)) {
|
|
81
|
+
var _shape$interfaces;
|
|
82
|
+
|
|
83
|
+
if ((_shape$interfaces = shape.interfaces) !== null && _shape$interfaces !== void 0 && _shape$interfaces.includes(interfaceName)) {
|
|
84
|
+
implementingShapes.push(shape);
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
return implementingShapes;
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
function interfaceToUnion(context, interfaceName) {
|
|
92
|
+
const shapes = getImplementingShapes(context.shapes, interfaceName);
|
|
93
|
+
return {
|
|
94
|
+
oneOf: shapes.map(shape => ({
|
|
95
|
+
'@ref': (0, _refs.shapeNameToRef)(context, shape.name)
|
|
96
|
+
}))
|
|
97
|
+
};
|
|
73
98
|
}
|
package/dist/schema-util.d.ts
CHANGED
|
@@ -37,7 +37,8 @@ export declare function applyBuiltinPropertiesToShape(projectSchema: ProjectSche
|
|
|
37
37
|
*/
|
|
38
38
|
export declare function getBuiltinsUsed(projectSchema: ProjectSchema): ShapeMap;
|
|
39
39
|
export declare function applyDefaultsToSchema<T extends ProjectSchema>(projectSchema: T): T;
|
|
40
|
-
export declare function getShapeById(projectSchema: ProjectSchema, shapeId: string): Shape | undefined;
|
|
40
|
+
export declare function getShapeById(projectSchema: Pick<ProjectSchema, 'shapes'>, shapeId: string): Shape | undefined;
|
|
41
|
+
export declare function ensureShapeById(projectSchema: ProjectSchema, shapeId: string): Shape;
|
|
41
42
|
export declare function isModelShape(shape: Shape): boolean;
|
|
42
43
|
export declare const isIndexedRemoteShape: import("lodash").CurriedFunction2<Pick<ProjectSchema, "indexedShapes">, Shape, boolean>;
|
|
43
44
|
export declare function getArgsReference(projectSchema: ServicesContext, argsSchema: SchemaWithArgs): Maybe<RefItem>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema-util.d.ts","sourceRoot":"","sources":["../../src/schema-util.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EACV,aAAa,EACb,cAAc,EAEd,KAAK,EACL,QAAQ,EACR,KAAK,EACL,QAAQ,EACR,aAAa,EACb,WAAW,EAGX,WAAW,EAEZ,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EACV,+BAA+B,EAC/B,UAAU,EACV,WAAW,EACX,cAAc,EACd,kBAAkB,EAClB,kBAAkB,EAElB,gBAAgB,EAChB,UAAU,EACV,aAAa,EACd,MAAM,eAAe,CAAC;AAUvB,OAAO,EAAC,KAAK,EAA8B,MAAM,iBAAiB,CAAC;AAenE,OAAO,EASL,OAAO,EAIP,eAAe,EACf,eAAe,EACf,qBAAqB,EAKtB,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"schema-util.d.ts","sourceRoot":"","sources":["../../src/schema-util.ts"],"names":[],"mappings":"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"}
|
package/dist/schema-util.js
CHANGED
|
@@ -12,6 +12,7 @@ exports.createSchemaPropertyList = exports.createSchemaPropertyAccessor = export
|
|
|
12
12
|
exports.createShape = createShape;
|
|
13
13
|
exports.emptySchema = emptySchema;
|
|
14
14
|
exports.ensureQuery = exports.ensureMutation = void 0;
|
|
15
|
+
exports.ensureShapeById = ensureShapeById;
|
|
15
16
|
exports.filterGraphQLServiceMap = filterGraphQLServiceMap;
|
|
16
17
|
exports.findMapping = findMapping;
|
|
17
18
|
exports.findQuery = exports.findMutation = void 0;
|
|
@@ -100,6 +101,8 @@ var _unions = require("./unions");
|
|
|
100
101
|
|
|
101
102
|
var _util2 = require("./util");
|
|
102
103
|
|
|
104
|
+
var _errors = require("@takeshape/errors");
|
|
105
|
+
|
|
103
106
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
104
107
|
|
|
105
108
|
const SERVICE_OBJECT_PATTERN_NAME = 'pattern:service-object';
|
|
@@ -538,6 +541,16 @@ function getShapeById(projectSchema, shapeId) {
|
|
|
538
541
|
return (0, _find.default)(projectSchema.shapes, shape => shape.id === shapeId);
|
|
539
542
|
}
|
|
540
543
|
|
|
544
|
+
function ensureShapeById(projectSchema, shapeId) {
|
|
545
|
+
const shape = getShapeById(projectSchema, shapeId);
|
|
546
|
+
|
|
547
|
+
if (!shape) {
|
|
548
|
+
throw new _errors.NotFoundError(`Shape ${shapeId} Not found`);
|
|
549
|
+
}
|
|
550
|
+
|
|
551
|
+
return shape;
|
|
552
|
+
}
|
|
553
|
+
|
|
541
554
|
function isModelShape(shape) {
|
|
542
555
|
return Boolean(shape.model);
|
|
543
556
|
}
|
|
@@ -59,6 +59,7 @@ export function getContentTransform({
|
|
|
59
59
|
keyTransform = preferKey,
|
|
60
60
|
sourceKeyTransform = preferSourceKey,
|
|
61
61
|
passThrough = true,
|
|
62
|
+
allowNullObjects = false,
|
|
62
63
|
projectSchema
|
|
63
64
|
}) {
|
|
64
65
|
const prepare = (schema, obj, name = '') => {
|
|
@@ -130,6 +131,10 @@ export function getContentTransform({
|
|
|
130
131
|
if (obj === undefined) {
|
|
131
132
|
prepare(itemSchema, obj, name);
|
|
132
133
|
}
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
if (allowNullObjects && isObjectSchema(schema) && obj === null) {
|
|
137
|
+
return null;
|
|
133
138
|
} // Allow properties that have not been transformed
|
|
134
139
|
|
|
135
140
|
|
package/es/interfaces.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { getRef, refItemToShape } from './refs';
|
|
1
|
+
import { getRef, refItemToShape, shapeNameToRef } from './refs';
|
|
2
2
|
import mapValues from 'lodash/mapValues';
|
|
3
3
|
export function isInterfaceShape(shape) {
|
|
4
4
|
return (shape === null || shape === void 0 ? void 0 : shape.type) === 'interface';
|
|
@@ -52,4 +52,25 @@ export function pruneUnusedInterfaces(shapeMap) {
|
|
|
52
52
|
|
|
53
53
|
return shape;
|
|
54
54
|
});
|
|
55
|
+
}
|
|
56
|
+
export function getImplementingShapes(shapeMap, interfaceName) {
|
|
57
|
+
const implementingShapes = [];
|
|
58
|
+
|
|
59
|
+
for (const shape of Object.values(shapeMap)) {
|
|
60
|
+
var _shape$interfaces;
|
|
61
|
+
|
|
62
|
+
if ((_shape$interfaces = shape.interfaces) !== null && _shape$interfaces !== void 0 && _shape$interfaces.includes(interfaceName)) {
|
|
63
|
+
implementingShapes.push(shape);
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
return implementingShapes;
|
|
68
|
+
}
|
|
69
|
+
export function interfaceToUnion(context, interfaceName) {
|
|
70
|
+
const shapes = getImplementingShapes(context.shapes, interfaceName);
|
|
71
|
+
return {
|
|
72
|
+
oneOf: shapes.map(shape => ({
|
|
73
|
+
'@ref': shapeNameToRef(context, shape.name)
|
|
74
|
+
}))
|
|
75
|
+
};
|
|
55
76
|
}
|
package/es/schema-util.js
CHANGED
|
@@ -19,6 +19,7 @@ import isEqual from 'lodash/isEqual';
|
|
|
19
19
|
import isString from 'lodash/isString';
|
|
20
20
|
import { isUnionSchema } from './unions';
|
|
21
21
|
import { mergeFormProperties, mergeSchemaProperties, getArgs } from './util';
|
|
22
|
+
import { NotFoundError } from '@takeshape/errors';
|
|
22
23
|
export const SERVICE_OBJECT_PATTERN_NAME = 'pattern:service-object';
|
|
23
24
|
export function isBuiltinShape(shapeName) {
|
|
24
25
|
return Boolean(builtInShapes[shapeName]);
|
|
@@ -425,6 +426,15 @@ export function applyDefaultsToSchema(projectSchema) {
|
|
|
425
426
|
export function getShapeById(projectSchema, shapeId) {
|
|
426
427
|
return find(projectSchema.shapes, shape => shape.id === shapeId);
|
|
427
428
|
}
|
|
429
|
+
export function ensureShapeById(projectSchema, shapeId) {
|
|
430
|
+
const shape = getShapeById(projectSchema, shapeId);
|
|
431
|
+
|
|
432
|
+
if (!shape) {
|
|
433
|
+
throw new NotFoundError(`Shape ${shapeId} Not found`);
|
|
434
|
+
}
|
|
435
|
+
|
|
436
|
+
return shape;
|
|
437
|
+
}
|
|
428
438
|
export function isModelShape(shape) {
|
|
429
439
|
return Boolean(shape.model);
|
|
430
440
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@takeshape/schema",
|
|
3
|
-
"version": "8.
|
|
3
|
+
"version": "8.286.1",
|
|
4
4
|
"description": "TakeShape Schema",
|
|
5
5
|
"homepage": "https://www.takeshape.io",
|
|
6
6
|
"repository": {
|
|
@@ -30,9 +30,9 @@
|
|
|
30
30
|
"p-reduce": "^2.1.0",
|
|
31
31
|
"semver": "^7.3.2",
|
|
32
32
|
"tiny-invariant": "^1.2.0",
|
|
33
|
-
"@takeshape/
|
|
34
|
-
"@takeshape/util": "8.
|
|
35
|
-
"@takeshape/
|
|
33
|
+
"@takeshape/json-schema": "8.286.1",
|
|
34
|
+
"@takeshape/util": "8.286.1",
|
|
35
|
+
"@takeshape/errors": "8.286.1"
|
|
36
36
|
},
|
|
37
37
|
"devDependencies": {
|
|
38
38
|
"@takeshape/json-schema-to-typescript": "^11.0.0",
|