@takeshape/schema 8.188.2 → 8.189.4

package/es/schemas/project-schema.json

@@ -78,6 +78,9 @@
     {
       "$ref": "https://schema.takeshape.io/project-schema/v3.18.0#"
     },
+    {
+      "$ref": "https://schema.takeshape.io/project-schema/v3.18.1#"
+    },
     {
       "$ref": "https://schema.takeshape.io/project-schema/v4.0.0#"
     }

package/es/util/has-arg.js

@@ -1,8 +1,11 @@
 import { findSchemaAtPath } from './find-shape-at-path';
+export function getArgs(prop) {
+  return '@args' in prop ? prop['@args'] : 'args' in prop ? prop.args : undefined;
+}
 export function hasArg(projectSchema, prop, argPath) {
   var _projectSchema$shapes;
 
-  const args = 'args' in prop ? prop.args : prop['@args'];
+  const args = getArgs(prop);
 
   if (!args) {
     return false;

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;
 }