@takeshape/schema 8.186.0 → 8.189.0

package/dist/template-shapes/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/template-shapes/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAuB,MAAM,SAAS,CAAC;AAC/D,OAAO,EAAC,aAAa,EAAC,MAAM,mBAAmB,CAAC;AAmChD,wBAAgB,eAAe,CAC7B,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,MAAM,EACpB,SAAS,EAAE,MAAM,GAChB,gBAAgB,CAOlB;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAEzD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/template-shapes/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAuB,MAAM,SAAS,CAAC;AAC/D,OAAO,EAAC,aAAa,EAAC,MAAM,mBAAmB,CAAC;AAmChD,wBAAgB,eAAe,CAC7B,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,MAAM,EACpB,SAAS,EAAE,MAAM,GAChB,gBAAgB,CAWlB;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAEzD"}

package/dist/template-shapes/index.js

@@ -32,6 +32,10 @@ function resolveTemplate(projectSchema, templateName, shapeName) {
     throw new Error(`Invalid shape template ${templateName}`);
   }
 
+  if (projectSchema.shapes[shapeName] === undefined) {
+    throw new Error(`Unknown shape "${shapeName}" in template "${templateName}"`);
+  }
+
   return mapping({
     projectSchema
   }, projectSchema.shapes[shapeName]);

package/dist/validate.d.ts.map

@@ -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,EAKlB,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EAAwB,yBAAyB,EAAC,MAAM,mBAAmB,CAAC;AAudnF,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;AAqKD;;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"}
+{"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,EAKlB,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EAAwB,yBAAyB,EAAC,MAAM,mBAAmB,CAAC;AAofnF,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;AAqKD;;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

@@ -60,8 +60,16 @@ var _util = require("@takeshape/util");
 
 var _forOwn = _interopRequireDefault(require("lodash/forOwn"));
 
+var _uniqBy = _interopRequireDefault(require("lodash/uniqBy"));
+
+var _initial = _interopRequireDefault(require("lodash/initial"));
+
+var _last = _interopRequireDefault(require("lodash/last"));
+
 var _relationships = require("./relationships");
 
+var _get = _interopRequireDefault(require("lodash/get"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function findDuplicates(items) {
@@ -412,6 +420,18 @@ function validateRefs(projectSchema, additionalShapeNames = builtInShapeNames) {
           message: `allOf cannot be self-referential`
         });
       }
+
+      const parentPath = (0, _initial.default)(item.path);
+      const parentSchema = (0, _get.default)(projectSchema, parentPath);
+      const propName = (0, _last.default)(item.path);
+
+      if (propName === '@ref' && parentSchema.$ref) {
+        errors.push({
+          type: 'conflict',
+          path: parentPath,
+          message: `Ref cannot have both @ref and $ref`
+        });
+      }
     });
   }
 
@@ -471,14 +491,23 @@ function validateOneOfs(projectSchema) {
     const oneOfPath = property.items ? ['items', 'oneOf'] : ['oneOf'];
     const relationship = (0, _relationships.getRelationship)(property);
     const schema = property.items ? property.items : property;
+    const isUnion = (0, _unions.isUnionSchema)(schema);
 
-    if (schema.oneOf && !relationship && !(0, _unions.isUnionSchema)(schema) && !(0, _enum.isEnumLikeSchema)(schema)) {
+    if (schema.oneOf && !relationship && !isUnion && !(0, _enum.isEnumLikeSchema)(schema)) {
       errors.push({
-        type: 'json',
+        type: 'conflict',
         path: propertyPath.concat(oneOfPath),
         message: `Invalid oneOf must contain only @ref or title + enum/const schemas`
       });
     }
+
+    if (isUnion && schema.oneOf.length !== (0, _uniqBy.default)(schema.oneOf, refSchema => (0, _refs.getRefShapeName)(projectSchema, refSchema)).length) {
+      errors.push({
+        type: 'conflict',
+        path: propertyPath.concat(oneOfPath),
+        message: `Invalid oneOf must not contain duplicate references`
+      });
+    }
   });
   return errors;
 }

package/es/template-shapes/index.js

@@ -22,6 +22,10 @@ export function resolveTemplate(projectSchema, templateName, shapeName) {
     throw new Error(`Invalid shape template ${templateName}`);
   }
 
+  if (projectSchema.shapes[shapeName] === undefined) {
+    throw new Error(`Unknown shape "${shapeName}" in template "${templateName}"`);
+  }
+
   return mapping({
     projectSchema
   }, projectSchema.shapes[shapeName]);

package/es/validate.js

@@ -16,14 +16,18 @@ import { getAllNamespaceShapes, getAllRefsInShapes } from './schema-util';
 import { builtInShapes } from './builtin-schema';
 import { isValidTemplate } from './template-shapes';
 import { isBasicResolver, isComposeResolver } from './types/utils';
-import { refItemToAtRef, refItemToShapeName, parseReturnShape } from './refs';
+import { refItemToAtRef, refItemToShapeName, parseReturnShape, getRefShapeName } from './refs';
 import { scalars } from './scalars';
 import { isUnionSchema } from './unions';
 import { isEnumLikeSchema } from './enum';
 import metaSchemaV3_9_0 from './schemas/project-schema/meta-schema-v3.9.0.json';
 import { isIntegerLike } from '@takeshape/util';
 import forOwn from 'lodash/forOwn';
+import uniqBy from 'lodash/uniqBy';
+import initial from 'lodash/initial';
+import last from 'lodash/last';
 import { getRelationship } from './relationships';
+import get from 'lodash/get';
 
 function findDuplicates(items) {
   const seen = {};
@@ -373,6 +377,18 @@ function validateRefs(projectSchema, additionalShapeNames = builtInShapeNames) {
           message: `allOf cannot be self-referential`
         });
       }
+
+      const parentPath = initial(item.path);
+      const parentSchema = get(projectSchema, parentPath);
+      const propName = last(item.path);
+
+      if (propName === '@ref' && parentSchema.$ref) {
+        errors.push({
+          type: 'conflict',
+          path: parentPath,
+          message: `Ref cannot have both @ref and $ref`
+        });
+      }
     });
   }
 
@@ -432,14 +448,23 @@ function validateOneOfs(projectSchema) {
     const oneOfPath = property.items ? ['items', 'oneOf'] : ['oneOf'];
     const relationship = getRelationship(property);
     const schema = property.items ? property.items : property;
+    const isUnion = isUnionSchema(schema);
 
-    if (schema.oneOf && !relationship && !isUnionSchema(schema) && !isEnumLikeSchema(schema)) {
+    if (schema.oneOf && !relationship && !isUnion && !isEnumLikeSchema(schema)) {
       errors.push({
-        type: 'json',
+        type: 'conflict',
         path: propertyPath.concat(oneOfPath),
         message: `Invalid oneOf must contain only @ref or title + enum/const schemas`
       });
     }
+
+    if (isUnion && schema.oneOf.length !== uniqBy(schema.oneOf, refSchema => getRefShapeName(projectSchema, refSchema)).length) {
+      errors.push({
+        type: 'conflict',
+        path: propertyPath.concat(oneOfPath),
+        message: `Invalid oneOf must not contain duplicate references`
+      });
+    }
   });
   return errors;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takeshape/schema",
-  "version": "8.186.0",
+  "version": "8.189.0",
   "description": "TakeShape Schema",
   "homepage": "https://www.takeshape.io",
   "repository": {
@@ -21,9 +21,9 @@
     "examples"
   ],
   "dependencies": {
-    "@takeshape/errors": "8.186.0",
-    "@takeshape/json-schema": "8.186.0",
-    "@takeshape/util": "8.186.0",
+    "@takeshape/errors": "8.189.0",
+    "@takeshape/json-schema": "8.189.0",
+    "@takeshape/util": "8.189.0",
     "ajv": "^8.10.0",
     "ajv-formats": "^2.1.1",
     "blueimp-md5": "^2.10.0",