@takeshape/schema 8.236.1 → 8.239.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.
- package/dist/refs.d.ts +2 -1
- package/dist/refs.d.ts.map +1 -1
- package/dist/refs.js +20 -1
- package/dist/validate.d.ts.map +1 -1
- package/dist/validate.js +10 -8
- package/es/refs.js +18 -2
- package/es/validate.js +10 -8
- package/package.json +4 -4
package/dist/refs.d.ts
CHANGED
|
@@ -184,9 +184,10 @@ export declare function parsePropertyRef(refStr: string): Maybe<PropertyRefItem>
|
|
|
184
184
|
export declare function propertyRefItemToResolverPath(getNamespace: GetNamespace, item: PropertyRefItem): string[];
|
|
185
185
|
export declare function propertyRefItemToArgsPath(getNamespace: GetNamespace, item: PropertyRefItem): string[];
|
|
186
186
|
export declare function propertyRefItemToPath(getNamespace: GetNamespace, item: PropertyRefItem): string[];
|
|
187
|
-
export declare function propertyRefToArgs(projectSchema: ProjectSchema, ref: string): Maybe<Args>;
|
|
187
|
+
export declare function propertyRefToArgs(projectSchema: ProjectSchema, ref: string | PropertyRefItem): Maybe<Args>;
|
|
188
188
|
/**
|
|
189
189
|
* Get a ref to the given shape.
|
|
190
190
|
*/
|
|
191
191
|
export declare function shapeNameToRef(context: ServicesContext, shapeName: string): string;
|
|
192
|
+
export declare function getAllPropertyRefs(projectSchema: ProjectSchema): PropertyRefItem[];
|
|
192
193
|
//# sourceMappingURL=refs.d.ts.map
|
package/dist/refs.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"refs.d.ts","sourceRoot":"","sources":["../../src/refs.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAC,UAAU,EAAE,aAAa,EAAE,gBAAgB,EAAC,MAAM,SAAS,CAAC;AACzE,OAAO,KAAK,EACV,cAAc,EACd,KAAK,EACL,WAAW,EACX,YAAY,EACZ,WAAW,EACX,GAAG,EACH,aAAa,EACb,IAAI,EACL,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"refs.d.ts","sourceRoot":"","sources":["../../src/refs.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAC,UAAU,EAAE,aAAa,EAAE,gBAAgB,EAAC,MAAM,SAAS,CAAC;AACzE,OAAO,KAAK,EACV,cAAc,EACd,KAAK,EACL,WAAW,EACX,YAAY,EACZ,WAAW,EACX,GAAG,EACH,aAAa,EACb,IAAI,EACL,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,iBAAiB,CAAC;AAmB3C,oBAAY,eAAe,GAAG,IAAI,CAAC,gBAAgB,EAAE,UAAU,CAAC,CAAC;AACjE,oBAAY,qBAAqB,GAAG,IAAI,CAAC,gBAAgB,EAAE,UAAU,GAAG,QAAQ,CAAC,CAAC;AAElF;;;;GAIG;AACH,MAAM,WAAW,OAAQ,SAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IACtD,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;CACpB;AAED;;GAEG;AACH,MAAM,WAAW,eAAgB,SAAQ,OAAO;IAC9C,IAAI,EAAE,UAAU,CAAC;CAClB;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,GAAG,IAAI,eAAe,CAEtF;AAGD;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,eAAe,EAAE,MAAM,GAAG;IAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAC,CAO7G;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,eAAe,EAAE,KAAK,EAAE,WAAW,GAAG,iBAAiB,CAqBtG;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAEnF;AAED;;;GAGG;AACH,eAAO,MAAM,UAAU,UAAW,MAAM,WAEvC,CAAC;AAEF,wBAAgB,6BAA6B,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAE1F;AAUD,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAQrF;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,aAAa,YAOjF;AAED;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAQ/F;AAED;;GAEG;AACH,wBAAgB,8BAA8B,CAAC,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,GAAG,EAAE,GAAG,OAAO,EAAE,CAE5G;AAED;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,qBAAqB,EAAE,aAAa,EAAE,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,CAExG;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAKlD;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAalG;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAE/F;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAwB1G;AAED;;;GAGG;AACH,wBAAgB,MAAM,CAAC,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,CAWzF;AAED,wBAAgB,cAAc,CAC5B,OAAO,EAAE,eAAe,EACxB,SAAS,EAAE,aAAa,EACxB,UAAU,GAAE,UAAe,GAC1B,KAAK,CAAC,eAAe,CAAC,CAUxB;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAE7D;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,eAAe,EACxB,SAAS,EAAE,aAAa,EACxB,UAAU,GAAE,UAAe,GAC1B,KAAK,CAAC,eAAe,CAAC,CAUxB;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAEvD;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAG3D;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,EAAE,CAE7D;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,qBAAqB,EAAE,OAAO,EAAE,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,CAG7F;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,qBAAqB,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,KAAK,EAAE,CAEnG;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,qBAAqB,EAC9B,OAAO,EAAE,OAAO,GACf,KAAK,CAAC;IAAC,KAAK,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,MAAM,EAAE,CAAA;CAAC,CAAC,CAIvC;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,qBAAqB,EAAE,OAAO,EAAE,OAAO,GAAG,KAAK,CAAC,WAAW,CAAC,CAGzG;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,aAAa,GAAG,KAAK,CAAC,MAAM,CAAC,CAGjG;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,aAAa,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,CAG3G;AAED;;GAEG;AACH,eAAO,MAAM,gBAAgB,iBAAkB,cAAc,gBAAgB,cAAc,4EAC/B,CAAC;AAE7D;;;GAGG;AACH,wBAAgB,SAAS,CAAC,OAAO,EAAE,qBAAqB,EAAE,MAAM,EAAE,cAAc,EAAE,GAAG,CAAC,EAAE,OAAO,GAAG,cAAc,CAW/G;AAED;;GAEG;AACH,wBAAgB,MAAM,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CActD;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,qBAAqB,EAAE,MAAM,EAAE,cAAc,GAAG,OAAO,CAchG;AAWD;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,qBAAqB,EAC9B,kBAAkB,EAAE,cAAc,EAClC,UAAU,GAAE,UAAe,GAC1B,cAAc,CAiDhB;AAED,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,qBAAqB,EAC9B,kBAAkB,EAAE,cAAc,EAClC,UAAU,GAAE,UAAe,GAC1B,YAAY,CAQd;AAED,oBAAY,YAAY,GAAG,CAAC,SAAS,EAAE,MAAM,KAAK,KAAK,CAAC,MAAM,CAAC,CAAC;AAEhE,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,eAAe,GAAG,YAAY,CAKzE;AAED,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC,eAAe,CAAC,CASvE;AAED,wBAAgB,6BAA6B,CAAC,YAAY,EAAE,YAAY,EAAE,IAAI,EAAE,eAAe,GAAG,MAAM,EAAE,CAGzG;AAED,wBAAgB,yBAAyB,CAAC,YAAY,EAAE,YAAY,EAAE,IAAI,EAAE,eAAe,GAAG,MAAM,EAAE,CAGrG;AAED,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,YAAY,EAAE,IAAI,EAAE,eAAe,GAAG,MAAM,EAAE,CAUjG;AAED,wBAAgB,iBAAiB,CAAC,aAAa,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,GAAG,eAAe,GAAG,KAAK,CAAC,IAAI,CAAC,CAM1G;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,UAEzE;AAED,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,aAAa,GAAG,eAAe,EAAE,CAalF"}
|
package/dist/refs.js
CHANGED
|
@@ -11,6 +11,7 @@ exports.createTemplateShapeName = createTemplateShapeName;
|
|
|
11
11
|
exports.dereferenceObjectSchema = dereferenceObjectSchema;
|
|
12
12
|
exports.dereferenceSchema = dereferenceSchema;
|
|
13
13
|
exports.followRef = followRef;
|
|
14
|
+
exports.getAllPropertyRefs = getAllPropertyRefs;
|
|
14
15
|
exports.getFlattenedTemplateShapeName = getFlattenedTemplateShapeName;
|
|
15
16
|
exports.getRef = getRef;
|
|
16
17
|
exports.getRefOrItemsRef = getRefOrItemsRef;
|
|
@@ -61,6 +62,8 @@ var _compile = require("ajv/dist/compile");
|
|
|
61
62
|
|
|
62
63
|
var _util = require("@takeshape/util");
|
|
63
64
|
|
|
65
|
+
var _isString = _interopRequireDefault(require("lodash/isString"));
|
|
66
|
+
|
|
64
67
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
65
68
|
|
|
66
69
|
/**
|
|
@@ -631,7 +634,7 @@ function propertyRefItemToPath(getNamespace, item) {
|
|
|
631
634
|
}
|
|
632
635
|
|
|
633
636
|
function propertyRefToArgs(projectSchema, ref) {
|
|
634
|
-
const parsed = parsePropertyRef(ref);
|
|
637
|
+
const parsed = typeof ref === 'object' ? ref : parsePropertyRef(ref);
|
|
635
638
|
|
|
636
639
|
if (parsed) {
|
|
637
640
|
const path = propertyRefItemToArgsPath(createGetNamespace(projectSchema), parsed);
|
|
@@ -645,4 +648,20 @@ function propertyRefToArgs(projectSchema, ref) {
|
|
|
645
648
|
|
|
646
649
|
function shapeNameToRef(context, shapeName) {
|
|
647
650
|
return refItemToAtRef(shapeNameToRefItem(context, shapeName));
|
|
651
|
+
}
|
|
652
|
+
|
|
653
|
+
function getAllPropertyRefs(projectSchema) {
|
|
654
|
+
const result = [];
|
|
655
|
+
(0, _util.visit)(projectSchema, ['to'], (value, path) => {
|
|
656
|
+
const parent = (0, _get.default)(projectSchema, path.slice(0, -1));
|
|
657
|
+
|
|
658
|
+
if ((0, _isString.default)(value) && (0, _util.isRecord)(parent) && parent.name === 'delegate') {
|
|
659
|
+
const parsed = parsePropertyRef(value);
|
|
660
|
+
|
|
661
|
+
if (parsed) {
|
|
662
|
+
result.push(parsed);
|
|
663
|
+
}
|
|
664
|
+
}
|
|
665
|
+
});
|
|
666
|
+
return result;
|
|
648
667
|
}
|
package/dist/validate.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../src/validate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAmB,WAAW,EAAC,MAAM,KAAK,CAAC;AACvD,OAAO,KAAK,EAAC,UAAU,EAAE,SAAS,EAAC,MAAM,gBAAgB,CAAC;AAC1D,OAAO,KAAK,EAAmB,mBAAmB,EAAC,MAAM,eAAe,CAAC;AACzE,OAAO,KAAK,EAEV,gBAAgB,EAChB,aAAa,EASb,iBAAiB,EAUlB,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EAAwB,yBAAyB,EAAC,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../src/validate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAmB,WAAW,EAAC,MAAM,KAAK,CAAC;AACvD,OAAO,KAAK,EAAC,UAAU,EAAE,SAAS,EAAC,MAAM,gBAAgB,CAAC;AAC1D,OAAO,KAAK,EAAmB,mBAAmB,EAAC,MAAM,eAAe,CAAC;AACzE,OAAO,KAAK,EAEV,gBAAgB,EAChB,aAAa,EASb,iBAAiB,EAUlB,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EAAwB,yBAAyB,EAAC,MAAM,mBAAmB,CAAC;AAmtBnF,oBAAY,sBAAsB,GAC9B;IAAC,KAAK,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,gBAAgB,CAAC;IAAC,MAAM,EAAE,SAAS,CAAA;CAAC,GAC1D;IAAC,KAAK,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,SAAS,CAAC;IAAC,MAAM,EAAE,yBAAyB,EAAE,CAAA;CAAC,CAAC;AAE3E,wBAAgB,WAAW,CAAC,KAAK,EAAE,WAAW,GAAG,yBAAyB,CAuBzE;AAED,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,CAAC,aAAa,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC;IAC/C,QAAQ,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,eAAe,KAAK,sBAAsB,CAAC;CAClF;AACD,MAAM,WAAW,eAAe;IAC9B,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,uBAAuB,CAAC,EAAE,MAAM,EAAE,CAAC;IACnC,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC9B,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,iBAAiB,GAAG,SAAS,CAAC;CACnE;AAuKD;;GAEG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,sBAAsB,CAqB9F;AAED,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,OAAO,GAAG,aAAa,CAgBnE;AAgBD;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,cAAc,EAAE,OAAO,GAAG,SAAS,CAQpE;AAgBD;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,OAAO,GAAG,UAAU,CAQlE;AAqBD;;;;;GAKG;AACH,wBAAgB,2BAA2B,CAAC,WAAW,EAAE,OAAO,GAAG,mBAAmB,CAarF"}
|
package/dist/validate.js
CHANGED
|
@@ -299,14 +299,16 @@ function validateResolver(projectSchema, basePath, resolver) {
|
|
|
299
299
|
const parsed = (0, _refs.parsePropertyRef)(resolver.to);
|
|
300
300
|
|
|
301
301
|
if (parsed) {
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
302
|
+
if (parsed.serviceId === 'local') {
|
|
303
|
+
const targetResolver = (0, _get.default)(projectSchema, (0, _refs.propertyRefItemToResolverPath)(getNamespace, parsed));
|
|
304
|
+
|
|
305
|
+
if (!(0, _utils.isBasicResolver)(targetResolver) && !(0, _utils.isComposeResolver)(targetResolver)) {
|
|
306
|
+
errors.push({
|
|
307
|
+
type: 'notFound',
|
|
308
|
+
path: basePath.concat('to'),
|
|
309
|
+
message: `Missing resolver config at property ref "${resolver.to}"`
|
|
310
|
+
});
|
|
311
|
+
}
|
|
310
312
|
}
|
|
311
313
|
} else {
|
|
312
314
|
errors.push({
|
package/es/refs.js
CHANGED
|
@@ -5,7 +5,8 @@ import omit from 'lodash/fp/omit';
|
|
|
5
5
|
import { getServiceNamespace, getServiceNamespaces } from './services';
|
|
6
6
|
import { mergeObjectSchemas } from './util/merge';
|
|
7
7
|
import { resolveSchema } from 'ajv/dist/compile';
|
|
8
|
-
import { isIntegerLike, isDefined } from '@takeshape/util';
|
|
8
|
+
import { isIntegerLike, isDefined, visit, isRecord } from '@takeshape/util';
|
|
9
|
+
import isString from 'lodash/isString';
|
|
9
10
|
|
|
10
11
|
/**
|
|
11
12
|
* Guard for RefItemWithPath. Tests for presence of all required props.
|
|
@@ -534,7 +535,7 @@ export function propertyRefItemToPath(getNamespace, item) {
|
|
|
534
535
|
return ['shapes', applyNamespace(shapeName), 'schema', 'properties', propertyName];
|
|
535
536
|
}
|
|
536
537
|
export function propertyRefToArgs(projectSchema, ref) {
|
|
537
|
-
const parsed = parsePropertyRef(ref);
|
|
538
|
+
const parsed = typeof ref === 'object' ? ref : parsePropertyRef(ref);
|
|
538
539
|
|
|
539
540
|
if (parsed) {
|
|
540
541
|
const path = propertyRefItemToArgsPath(createGetNamespace(projectSchema), parsed);
|
|
@@ -547,4 +548,19 @@ export function propertyRefToArgs(projectSchema, ref) {
|
|
|
547
548
|
|
|
548
549
|
export function shapeNameToRef(context, shapeName) {
|
|
549
550
|
return refItemToAtRef(shapeNameToRefItem(context, shapeName));
|
|
551
|
+
}
|
|
552
|
+
export function getAllPropertyRefs(projectSchema) {
|
|
553
|
+
const result = [];
|
|
554
|
+
visit(projectSchema, ['to'], (value, path) => {
|
|
555
|
+
const parent = get(projectSchema, path.slice(0, -1));
|
|
556
|
+
|
|
557
|
+
if (isString(value) && isRecord(parent) && parent.name === 'delegate') {
|
|
558
|
+
const parsed = parsePropertyRef(value);
|
|
559
|
+
|
|
560
|
+
if (parsed) {
|
|
561
|
+
result.push(parsed);
|
|
562
|
+
}
|
|
563
|
+
}
|
|
564
|
+
});
|
|
565
|
+
return result;
|
|
550
566
|
}
|
package/es/validate.js
CHANGED
|
@@ -252,14 +252,16 @@ function validateResolver(projectSchema, basePath, resolver) {
|
|
|
252
252
|
const parsed = parsePropertyRef(resolver.to);
|
|
253
253
|
|
|
254
254
|
if (parsed) {
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
255
|
+
if (parsed.serviceId === 'local') {
|
|
256
|
+
const targetResolver = get(projectSchema, propertyRefItemToResolverPath(getNamespace, parsed));
|
|
257
|
+
|
|
258
|
+
if (!isBasicResolver(targetResolver) && !isComposeResolver(targetResolver)) {
|
|
259
|
+
errors.push({
|
|
260
|
+
type: 'notFound',
|
|
261
|
+
path: basePath.concat('to'),
|
|
262
|
+
message: `Missing resolver config at property ref "${resolver.to}"`
|
|
263
|
+
});
|
|
264
|
+
}
|
|
263
265
|
}
|
|
264
266
|
} else {
|
|
265
267
|
errors.push({
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@takeshape/schema",
|
|
3
|
-
"version": "8.
|
|
3
|
+
"version": "8.239.0",
|
|
4
4
|
"description": "TakeShape Schema",
|
|
5
5
|
"homepage": "https://www.takeshape.io",
|
|
6
6
|
"repository": {
|
|
@@ -21,9 +21,9 @@
|
|
|
21
21
|
"examples"
|
|
22
22
|
],
|
|
23
23
|
"dependencies": {
|
|
24
|
-
"@takeshape/errors": "8.
|
|
25
|
-
"@takeshape/json-schema": "8.
|
|
26
|
-
"@takeshape/util": "8.
|
|
24
|
+
"@takeshape/errors": "8.239.0",
|
|
25
|
+
"@takeshape/json-schema": "8.239.0",
|
|
26
|
+
"@takeshape/util": "8.239.0",
|
|
27
27
|
"ajv": "^8.10.0",
|
|
28
28
|
"ajv-formats": "^2.1.1",
|
|
29
29
|
"blueimp-md5": "^2.10.0",
|