@takeshape/schema 8.43.0 → 8.44.2

package/es/layers/layers.js

@@ -173,7 +173,7 @@ export function collectReferencedShapeNames(layerId, refSet) {
   const collect = schema => {
     const args = schema['@args'];
 
-    if (args && isObject(args) && isObjectSchema(args)) {
+    if (args && typeof args === 'object') {
       Object.values(args.properties).forEach(collect);
     }
 

package/es/layers/type-utils.js

@@ -128,18 +128,15 @@ export function isParameterSerializeStyleOptions(maybeStyle) {
 export function isRefSchema(maybeRefSchema) {
   return isString(maybeRefSchema['@ref']) || isString(maybeRefSchema.$ref);
 }
-export function isAllOfSchema(maybeExtendableSchema) {
-  return isArray(maybeExtendableSchema.allOf);
+export function isAllOfSchema(schema) {
+  return isArray(schema.allOf);
 }
-export function isOneOfSchema(maybeExclusiveOrSchema) {
-  return isArray(maybeExclusiveOrSchema.oneOf);
+export function isOneOfSchema(schema) {
+  return isArray(schema.oneOf);
 }
-export function isArraySchema(maybeArraySchema) {
-  return maybeArraySchema.type === 'array' && isObject(maybeArraySchema.items);
+export function isArraySchema(schema) {
+  return schema.type === 'array' && isObject(schema.items);
 }
-export function isObjectSchema(maybeObjectSchema) {
-  return maybeObjectSchema.type === 'object' && isObject(maybeObjectSchema.properties);
-}
-export function isContentObjectSchema(maybeSchema) {
-  return isRefSchema(maybeSchema) || isAllOfSchema(maybeSchema) || isObjectSchema(maybeSchema);
+export function isObjectSchema(schema) {
+  return schema.type === 'object' && isObject(schema.properties);
 }

package/es/schemas/project-schema/v4.0.0.json

@@ -7,7 +7,7 @@
       "type": "array",
       "minItems": 1,
       "items": {
-        "$ref": "#/definitions/contentSchema"
+        "$ref": "#/definitions/propertySchema"
       }
     },
     "nonNegativeInteger": {
@@ -100,14 +100,29 @@
       },
       "required": ["$ref"]
     },
+    "shapeSchemaEnum": {
+      "title": "Shape Schema Enum",
+      "type": "object",
+      "properties": {
+        "enum": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "minItems": 1
+        }
+      },
+      "additionalProperties": false,
+      "required": ["enum"]
+    },
     "objectSchema": {
       "title": "Object Schema",
+      "type": "object",
       "allOf": [
         {
-          "$ref": "#/definitions/contentSchema"
+          "$ref": "#/definitions/propertySchema"
         },
         {
-          "type": "object",
           "properties": {
             "type": {
               "type": "string",
@@ -116,7 +131,7 @@
             "properties": {
               "type": "object",
               "additionalProperties": {
-                "$ref": "#/definitions/contentSchema"
+                "$ref": "#/definitions/propertySchema"
               }
             }
           },
@@ -124,12 +139,12 @@
         }
       ]
     },
-    "arraySchema": {
-      "title": "Array Schema",
+    "returnShapeArraySchema": {
+      "title": "Return Shape Array Schema",
       "type": "object",
       "allOf": [
         {
-          "$ref": "#/definitions/contentSchema"
+          "$ref": "#/definitions/propertySchema"
         },
         {
           "properties": {
@@ -138,29 +153,26 @@
               "const": "array"
             },
             "items": {
-              "$ref": "#/definitions/contentObjectSchema"
+              "oneOf": [
+                {"$ref": "#/definitions/refSchema"},
+                {
+                  "type": "object",
+                  "properties": {
+                    "type": {
+                      "enum": ["boolean", "integer", "number", "string"]
+                    }
+                  },
+                  "required": ["type"]
+                }
+              ]
             }
           },
           "required": ["type", "items"]
         }
       ]
     },
-    "enumSchema": {
-      "title": "Enum Schema",
-      "type": "object",
-      "properties": {
-        "enum": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        }
-      },
-      "required": ["enum"],
-      "additionalProperties": false
-    },
-    "allOfSchema": {
-      "title": "All Of Schema",
+    "shapeSchemaAllOf": {
+      "title": "Shape Schema All Of",
       "type": "object",
       "properties": {
         "allOf": {
@@ -184,8 +196,37 @@
       "required": ["allOf"],
       "additionalProperties": false
     },
-    "oneOfSchema": {
-      "title": "One Of Schema",
+    "allOfSchema": {
+      "title": "AllOfSchema",
+      "allOf": [
+        {"$ref": "#/definitions/propertySchema"},
+        {
+          "type": "object",
+          "properties": {
+            "allOf": {
+              "type": "array",
+              "items": {
+                "oneOf": [
+                  {
+                    "$ref": "#/definitions/refSchema"
+                  },
+                  {
+                    "$ref": "#/definitions/refSchemaLegacy"
+                  },
+                  {
+                    "$ref": "#/definitions/objectSchema"
+                  }
+                ],
+                "unevaluatedProperties": true
+              }
+            }
+          },
+          "required": ["allOf"]
+        }
+      ]
+    },
+    "shapeSchemaOneOf": {
+      "title": "Shape Schema One Of",
       "type": "object",
       "properties": {
         "oneOf": {
@@ -209,30 +250,46 @@
       "required": ["oneOf"],
       "additionalProperties": false
     },
-    "contentObjectSchema": {
-      "title": "Content Object Schema",
-      "type": "object",
-      "oneOf": [
-        {
-          "$ref": "#/definitions/allOfSchema"
-        },
-        {
-          "$ref": "#/definitions/oneOfSchema"
-        },
-        {
-          "$ref": "#/definitions/refSchema"
-        },
-        {
-          "$ref": "#/definitions/refSchemaLegacy"
-        },
-        {
-          "$ref": "#/definitions/objectSchema"
-        },
+    "oneOfSchema": {
+      "title": "OneOfSchema",
+      "allOf": [
+        {"$ref": "#/definitions/propertySchema"},
         {
-          "$ref": "#/definitions/arraySchema"
+          "type": "object",
+          "properties": {
+            "oneOf": {
+              "type": "array",
+              "items": {
+                "oneOf": [
+                  {
+                    "$ref": "#/definitions/refSchema"
+                  },
+                  {
+                    "$ref": "#/definitions/refSchemaLegacy"
+                  },
+                  {
+                    "$ref": "#/definitions/objectSchema"
+                  }
+                ],
+                "unevaluatedProperties": true
+              }
+            }
+          },
+          "required": ["oneOf"],
+          "additionalProperties": false
         }
       ]
     },
+    "shapeSchema": {
+      "title": "Shape Schema",
+      "type": "object",
+      "oneOf": [
+        {"$ref": "#/definitions/shapeSchemaAllOf"},
+        {"$ref": "#/definitions/shapeSchemaOneOf"},
+        {"$ref": "#/definitions/shapeSchemaEnum"},
+        {"$ref": "#/definitions/objectSchema"}
+      ]
+    },
     "queryMap": {
       "title": "Query Map",
       "type": "object",
@@ -244,11 +301,11 @@
     },
     "args": {
       "title": "Args",
-      "oneOf": [{"type": "string"}, {"$ref": "#/definitions/contentObjectSchema"}]
+      "oneOf": [{"type": "string"}, {"$ref": "#/definitions/objectSchema"}]
     },
     "returnShape": {
       "title": "Return Shape",
-      "oneOf": [{"type": "string"}, {"$ref": "#/definitions/arraySchema"}]
+      "oneOf": [{"type": "string"}, {"$ref": "#/definitions/returnShapeArraySchema"}]
     },
     "directiveConfigItem": {
       "title": "Directive Config Item",
@@ -1249,8 +1306,8 @@
       },
       "required": ["resolver", "shape"]
     },
-    "contentSchema": {
-      "title": "Content Schema",
+    "propertySchema": {
+      "title": "Property Schema",
       "type": "object",
       "properties": {
         "$ref": {
@@ -1301,7 +1358,7 @@
           "format": "regex"
         },
         "items": {
-          "$ref": "#/definitions/contentSchema"
+          "$ref": "#/definitions/propertySchema"
         },
         "maxItems": {
           "$ref": "#/definitions/nonNegativeInteger"
@@ -1325,7 +1382,7 @@
         "properties": {
           "type": "object",
           "additionalProperties": {
-            "$ref": "#/definitions/contentSchema"
+            "$ref": "#/definitions/propertySchema"
           },
           "default": {}
         },
@@ -1442,12 +1499,7 @@
           "enum": ["extend", "replace"]
         },
         "schema": {
-          "oneOf": [
-            {"$ref": "#/definitions/objectSchema"},
-            {"$ref": "#/definitions/allOfSchema"},
-            {"$ref": "#/definitions/oneOfSchema"},
-            {"$ref": "#/definitions/enumSchema"}
-          ]
+          "$ref": "#/definitions/shapeSchema"
         }
       },
       "required": [

package/es/template-shapes/templates.js

@@ -166,25 +166,25 @@ const idSchema = {
   },
   required: ['_id']
 };
-
-function rewriteSchema(shapeSchema) {
+export function rewriteSchema(shapeSchema) {
   return JSON.parse(JSON.stringify(shapeSchema), (key, value) => {
-    var _value$required;
+    if (typeof value === 'object') {
+      var _value$required;
 
-    // Remove required
-    if (typeof value === 'object' && value.type === 'object' && (_value$required = value.required) !== null && _value$required !== void 0 && _value$required.length) {
-      delete value.required;
-    } // Remove default
+      // Remove required
+      if ((_value$required = value.required) !== null && _value$required !== void 0 && _value$required.length) {
+        delete value.required;
+      } // Remove default
 
 
-    if (typeof value === 'object' && value.type && value.default) {
-      delete value.default;
+      if (value.type !== undefined && value.default !== undefined) {
+        delete value.default;
+      }
     }
 
     return value;
   });
 }
-
 export function getIDQueryArgs(templateName) {
   return (context, shape) => {
     var _shape$model;

package/lib/layers/layers.d.ts

@@ -1,7 +1,7 @@
-import { ContentSchemaV4_0_0, FlattenedSchemaV4_0_0, LayerSchemaV4_0_0, ObjectSchemaV4_0_0, ProjectSchemaV4_0_0, QueryV4_0_0, ShapeMapV4_0_0 } from '../project-schema';
+import { PropertySchemaV4_0_0, FlattenedSchemaV4_0_0, LayerSchemaV4_0_0, ObjectSchemaV4_0_0, ProjectSchemaV4_0_0, QueryV4_0_0, ShapeMapV4_0_0 } from '../project-schema';
 import { RefItemWithPath } from './refs';
 export declare type GetLayer = (layerId: string) => LayerSchemaV4_0_0 | undefined;
-export declare function isObjectSchemaV4_0_0(maybeObjectSchema: ContentSchemaV4_0_0): maybeObjectSchema is ObjectSchemaV4_0_0;
+export declare function isObjectSchemaV4_0_0(maybeObjectSchema: PropertySchemaV4_0_0): maybeObjectSchema is ObjectSchemaV4_0_0;
 export declare type RefPredicate = (ref: RefItemWithPath) => boolean;
 /**
  * Walk through a `ProjectSchema` and collect all the `ref`s.
@@ -21,7 +21,7 @@ export declare function getAllRefsInQueries(context: SchemaContext, rootProperty
  * @param predicate return true to include the ref in
  */
 export declare function getAllRefs(projectSchema: SchemaContext, predicate?: RefPredicate): RefItemWithPath[];
-export declare function collectReferencedShapeNames(layerId: string, refSet: Set<string>): (schema: ContentSchemaV4_0_0) => void;
+export declare function collectReferencedShapeNames(layerId: string, refSet: Set<string>): (schema: PropertySchemaV4_0_0) => void;
 export declare function flattenSchema(projectSchema: ProjectSchemaV4_0_0, getLayer: GetLayer): FlattenedSchemaV4_0_0;
 export {};
 //# sourceMappingURL=layers.d.ts.map

package/lib/layers/layers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"layers.d.ts","sourceRoot":"","sources":["../../../src/layers/layers.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EACnB,qBAAqB,EAErB,iBAAiB,EACjB,kBAAkB,EAClB,mBAAmB,EAEnB,WAAW,EACX,cAAc,EAEf,MAAM,mBAAmB,CAAC;AAI3B,OAAO,EAIL,eAAe,EAIhB,MAAM,QAAQ,CAAC;AAMhB,oBAAY,QAAQ,GAAG,CAAC,OAAO,EAAE,MAAM,KAAK,iBAAiB,GAAG,SAAS,CAAC;AA+B1E,wBAAgB,oBAAoB,CAAC,iBAAiB,EAAE,mBAAmB,GAAG,iBAAiB,IAAI,kBAAkB,CAEpH;AA8BD,oBAAY,YAAY,GAAG,CAAC,GAAG,EAAE,eAAe,KAAK,OAAO,CAAC;AAQ7D;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,cAAc,EAAE,SAAS,CAAC,EAAE,YAAY,GAAG,eAAe,EAAE,CA0BtG;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,SAAS,EAAE,MAAM,EAAE,EACnB,KAAK,EAAE,WAAW,EAClB,SAAS,CAAC,EAAE,CAAC,GAAG,EAAE,eAAe,KAAK,OAAO,GAC5C,eAAe,EAAE,CA8BnB;AAED,aAAK,aAAa,GAAG,IAAI,CAAC,qBAAqB,EAAE,QAAQ,GAAG,SAAS,GAAG,WAAW,CAAC,CAAC;AAErF;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,aAAa,EACtB,gBAAgB,EAAE,SAAS,GAAG,WAAW,EACzC,SAAS,CAAC,EAAE,YAAY,GACvB,eAAe,EAAE,CAanB;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,aAAa,EAAE,aAAa,EAAE,SAAS,CAAC,EAAE,YAAY,GAAG,eAAe,EAAE,CAMpG;AAED,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,YAErD,mBAAmB,KAAG,IAAI,CAkBpD;AAuFD,wBAAgB,aAAa,CAAC,aAAa,EAAE,mBAAmB,EAAE,QAAQ,EAAE,QAAQ,GAAG,qBAAqB,CAgF3G"}
+{"version":3,"file":"layers.d.ts","sourceRoot":"","sources":["../../../src/layers/layers.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,EACpB,qBAAqB,EAErB,iBAAiB,EACjB,kBAAkB,EAClB,mBAAmB,EAEnB,WAAW,EACX,cAAc,EAEf,MAAM,mBAAmB,CAAC;AAI3B,OAAO,EAIL,eAAe,EAIhB,MAAM,QAAQ,CAAC;AAMhB,oBAAY,QAAQ,GAAG,CAAC,OAAO,EAAE,MAAM,KAAK,iBAAiB,GAAG,SAAS,CAAC;AA+B1E,wBAAgB,oBAAoB,CAAC,iBAAiB,EAAE,oBAAoB,GAAG,iBAAiB,IAAI,kBAAkB,CAErH;AA8BD,oBAAY,YAAY,GAAG,CAAC,GAAG,EAAE,eAAe,KAAK,OAAO,CAAC;AAQ7D;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,cAAc,EAAE,SAAS,CAAC,EAAE,YAAY,GAAG,eAAe,EAAE,CA0BtG;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,SAAS,EAAE,MAAM,EAAE,EACnB,KAAK,EAAE,WAAW,EAClB,SAAS,CAAC,EAAE,CAAC,GAAG,EAAE,eAAe,KAAK,OAAO,GAC5C,eAAe,EAAE,CA8BnB;AAED,aAAK,aAAa,GAAG,IAAI,CAAC,qBAAqB,EAAE,QAAQ,GAAG,SAAS,GAAG,WAAW,CAAC,CAAC;AAErF;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,aAAa,EACtB,gBAAgB,EAAE,SAAS,GAAG,WAAW,EACzC,SAAS,CAAC,EAAE,YAAY,GACvB,eAAe,EAAE,CAanB;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,aAAa,EAAE,aAAa,EAAE,SAAS,CAAC,EAAE,YAAY,GAAG,eAAe,EAAE,CAMpG;AAED,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,YAErD,oBAAoB,KAAG,IAAI,CAkBrD;AAuFD,wBAAgB,aAAa,CAAC,aAAa,EAAE,mBAAmB,EAAE,QAAQ,EAAE,QAAQ,GAAG,qBAAqB,CAgF3G"}

package/lib/layers/layers.js

@@ -199,7 +199,7 @@ function collectReferencedShapeNames(layerId, refSet) {
   const collect = schema => {
     const args = schema['@args'];
 
-    if (args && (0, _util.isObject)(args) && (0, _typeUtils.isObjectSchema)(args)) {
+    if (args && typeof args === 'object') {
       Object.values(args.properties).forEach(collect);
     }
 

package/lib/layers/refs.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="lodash" />
 import type { SchemaPath } from '../types';
 import type { Maybe } from '@takeshape/util';
-import type { ContentSchemaV4_0_0, QueryV4_0_0, ShapeMapV4_0_0, ShapeV4_0_0, ReturnShapeV4_0_0 } from '../project-schema';
+import type { PropertySchemaV4_0_0, QueryV4_0_0, ShapeMapV4_0_0, ShapeV4_0_0, ReturnShapeV4_0_0 } from '../project-schema';
 /**
  * This interface describes a parsed `@ref` or `$ref`.
  * The intended usage is to convert a schema with a ref to a RefItem which can then
@@ -54,19 +54,19 @@ export declare function atRefToRefItem(atRef: string, template?: string): RefIte
  * Given a content schema and project schema, finds a `@ref` or `$ref` and
  * returns a `RefItem` suitable for loading a referenced schema...
  */
-export declare function getRef(refSchema: ContentSchemaV4_0_0): Maybe<RefItem>;
-export declare function getRefWithPath(refSchema: ContentSchemaV4_0_0, schemaPath?: SchemaPath): Maybe<RefItemWithPath>;
+export declare function getRef(refSchema: PropertySchemaV4_0_0): Maybe<RefItem>;
+export declare function getRefWithPath(refSchema: PropertySchemaV4_0_0, schemaPath?: SchemaPath): Maybe<RefItemWithPath>;
 /**
  * Tests for a `@ref` or `$ref` property directly on the passed schema.
  *
  * @param schema Any schema that might could have a ref property.
  */
-export declare function hasRefProperty(schema: ContentSchemaV4_0_0): boolean;
+export declare function hasRefProperty(schema: PropertySchemaV4_0_0): boolean;
 /**
  * From a schema with a ref, will return the top-level ref, and potentially
  * a ref item from a nested `items` property.
  */
-export declare function getRefOrItemsRef(refSchema: ContentSchemaV4_0_0, schemaPath?: SchemaPath): Maybe<RefItemWithPath>;
+export declare function getRefOrItemsRef(refSchema: PropertySchemaV4_0_0, schemaPath?: SchemaPath): Maybe<RefItemWithPath>;
 /**
  * Turns a `RefItem` into an `@ref`.
  */
@@ -78,22 +78,22 @@ export declare function refItemToShape(shapes: ShapeMapV4_0_0, refItem: RefItem)
 /**
  * Helper fn to omit `ref` props from the target schema, and then extend it with the source schema.
  */
-export declare const omitRefAndExtend: (targetSchema: ContentSchemaV4_0_0, sourceSchema: ContentSchemaV4_0_0) => import("lodash").Omit<ContentSchemaV4_0_0, "@ref" | "$ref"> & ContentSchemaV4_0_0;
+export declare const omitRefAndExtend: (targetSchema: PropertySchemaV4_0_0, sourceSchema: PropertySchemaV4_0_0) => import("lodash").Omit<PropertySchemaV4_0_0, "@ref" | "$ref"> & PropertySchemaV4_0_0;
 /**
  * If there is a $ref, this will insert a content schema from the top level
  * in place of the reference.
  */
-export declare function followRef(shapes: ShapeMapV4_0_0, contentSchema: ContentSchemaV4_0_0): ContentSchemaV4_0_0;
+export declare function followRef(shapes: ShapeMapV4_0_0, contentSchema: PropertySchemaV4_0_0): PropertySchemaV4_0_0;
 /**
  * Returns whether a schema has refs.
  */
-export declare function hasRef(contentSchema: ContentSchemaV4_0_0): boolean;
+export declare function hasRef(contentSchema: PropertySchemaV4_0_0): boolean;
 /**
  * Returns whether a schema has refs which can be followed.
  */
-export declare function hasResolvableRef(shapes: ShapeMapV4_0_0, contentSchema: ContentSchemaV4_0_0): boolean;
-export declare function getArgsReferenceWithPath(argsSchema: ContentSchemaV4_0_0 | QueryV4_0_0, schemaPath?: SchemaPath): Maybe<RefItemWithPath>;
-export declare function dereferenceSchema(shapes: ShapeMapV4_0_0, shapeOrFieldSchema: ContentSchemaV4_0_0, schemaPath?: SchemaPath): ContentSchemaV4_0_0;
+export declare function hasResolvableRef(shapes: ShapeMapV4_0_0, contentSchema: PropertySchemaV4_0_0): boolean;
+export declare function getArgsReferenceWithPath(argsSchema: PropertySchemaV4_0_0 | QueryV4_0_0, schemaPath?: SchemaPath): Maybe<RefItemWithPath>;
+export declare function dereferenceSchema(shapes: ShapeMapV4_0_0, shapeOrFieldSchema: PropertySchemaV4_0_0, schemaPath?: SchemaPath): PropertySchemaV4_0_0;
 export interface ParsedReturnShape {
     isArray: boolean;
     template?: string;

package/lib/layers/refs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"refs.d.ts","sourceRoot":"","sources":["../../../src/layers/refs.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,UAAU,CAAC;AACzC,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,iBAAiB,CAAC;AAC3C,OAAO,KAAK,EAAC,mBAAmB,EAAE,WAAW,EAAE,cAAc,EAAE,WAAW,EAAE,iBAAiB,EAAC,MAAM,mBAAmB,CAAC;AASxH;;;;GAIG;AACH,MAAM,WAAW,OAAO;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,eAAgB,SAAQ,OAAO;IAC9C,IAAI,EAAE,UAAU,CAAC;CAClB;AAED;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAIrE;AAED;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,GAAG,KAAK,CAAC,WAAW,CAAC,CAEtG;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAW1D;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAQxE;AAED;;;GAGG;AACH,wBAAgB,MAAM,CAAC,SAAS,EAAE,mBAAmB,GAAG,KAAK,CAAC,OAAO,CAAC,CAKrE;AAED,wBAAgB,cAAc,CAAC,SAAS,EAAE,mBAAmB,EAAE,UAAU,GAAE,UAAe,GAAG,KAAK,CAAC,eAAe,CAAC,CASlH;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAEnE;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,mBAAmB,EAAE,UAAU,GAAE,UAAe,GAAG,KAAK,CAAC,eAAe,CAAC,CAUpH;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAExD;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,OAAO,GAAG,KAAK,CAAC,WAAW,CAAC,CAE3F;AAED;;GAEG;AACH,eAAO,MAAM,gBAAgB,iBAAkB,mBAAmB,gBAAgB,mBAAmB,sFACzC,CAAC;AAE7D;;;GAGG;AACH,wBAAgB,SAAS,CAAC,MAAM,EAAE,cAAc,EAAE,aAAa,EAAE,mBAAmB,GAAG,mBAAmB,CAWzG;AAED;;GAEG;AACH,wBAAgB,MAAM,CAAC,aAAa,EAAE,mBAAmB,GAAG,OAAO,CAclE;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,cAAc,EAAE,aAAa,EAAE,mBAAmB,GAAG,OAAO,CAcpG;AAED,wBAAgB,wBAAwB,CACtC,UAAU,EAAE,mBAAmB,GAAG,WAAW,EAC7C,UAAU,GAAE,UAAe,GAC1B,KAAK,CAAC,eAAe,CAAC,CAYxB;AAQD,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,kBAAkB,EAAE,mBAAmB,EACvC,UAAU,GAAE,UAAe,GAC1B,mBAAmB,CAkCrB;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,KAAK,EAAE,iBAAiB,GAAG,iBAAiB,CAqB5E"}
+{"version":3,"file":"refs.d.ts","sourceRoot":"","sources":["../../../src/layers/refs.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,UAAU,CAAC;AACzC,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,iBAAiB,CAAC;AAC3C,OAAO,KAAK,EACV,oBAAoB,EACpB,WAAW,EACX,cAAc,EACd,WAAW,EACX,iBAAiB,EAClB,MAAM,mBAAmB,CAAC;AAS3B;;;;GAIG;AACH,MAAM,WAAW,OAAO;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,eAAgB,SAAQ,OAAO;IAC9C,IAAI,EAAE,UAAU,CAAC;CAClB;AAED;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAIrE;AAED;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,GAAG,KAAK,CAAC,WAAW,CAAC,CAEtG;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAW1D;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAQxE;AAED;;;GAGG;AACH,wBAAgB,MAAM,CAAC,SAAS,EAAE,oBAAoB,GAAG,KAAK,CAAC,OAAO,CAAC,CAKtE;AAED,wBAAgB,cAAc,CAAC,SAAS,EAAE,oBAAoB,EAAE,UAAU,GAAE,UAAe,GAAG,KAAK,CAAC,eAAe,CAAC,CASnH;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,oBAAoB,GAAG,OAAO,CAEpE;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,oBAAoB,EAAE,UAAU,GAAE,UAAe,GAAG,KAAK,CAAC,eAAe,CAAC,CAUrH;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAExD;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,OAAO,GAAG,KAAK,CAAC,WAAW,CAAC,CAE3F;AAED;;GAEG;AACH,eAAO,MAAM,gBAAgB,iBAAkB,oBAAoB,gBAAgB,oBAAoB,wFAC3C,CAAC;AAE7D;;;GAGG;AACH,wBAAgB,SAAS,CAAC,MAAM,EAAE,cAAc,EAAE,aAAa,EAAE,oBAAoB,GAAG,oBAAoB,CAW3G;AAED;;GAEG;AACH,wBAAgB,MAAM,CAAC,aAAa,EAAE,oBAAoB,GAAG,OAAO,CAcnE;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,cAAc,EAAE,aAAa,EAAE,oBAAoB,GAAG,OAAO,CAcrG;AAED,wBAAgB,wBAAwB,CACtC,UAAU,EAAE,oBAAoB,GAAG,WAAW,EAC9C,UAAU,GAAE,UAAe,GAC1B,KAAK,CAAC,eAAe,CAAC,CAYxB;AAQD,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,kBAAkB,EAAE,oBAAoB,EACxC,UAAU,GAAE,UAAe,GAC1B,oBAAoB,CAkCtB;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,KAAK,EAAE,iBAAiB,GAAG,iBAAiB,CAqB5E"}

package/lib/layers/type-utils.d.ts

@@ -1,4 +1,4 @@
-import { BasicResolverV4_0_0, ComposeResolverV4_0_0, TakeshapeResolverV4_0_0, GraphqlResolverV4_0_0, RestResolverV4_0_0, AwsLambdaResolverV4_0_0, UtilResolverV4_0_0, DirectiveMappingMapV4_0_0, DirectiveConfigV4_0_0, DirectiveMappingArrayV4_0_0, ParameterSerializeContentOptionsV4_0_0, ParameterOpV4_0_0, ParameterOpNestedV4_0_0, ParameterOpMappingV4_0_0, ParameterOpValueV4_0_0, ContentObjectSchemaV4_0_0, ContentSchemaV4_0_0, ArraySchemaV4_0_0, OneOfSchemaV4_0_0, AllOfSchemaV4_0_0, RefSchemaLegacyV4_0_0, RefSchemaV4_0_0, ParameterSerializeStyleOptionsV4_0_0, ParameterSerializeOptionsV4_0_0, ObjectSchemaV4_0_0, ParameterOpOpV4_0_0 } from '../project-schema';
+import { BasicResolverV4_0_0, ComposeResolverV4_0_0, TakeshapeResolverV4_0_0, GraphqlResolverV4_0_0, RestResolverV4_0_0, AwsLambdaResolverV4_0_0, UtilResolverV4_0_0, DirectiveMappingMapV4_0_0, DirectiveConfigV4_0_0, DirectiveMappingArrayV4_0_0, ParameterSerializeContentOptionsV4_0_0, ParameterOpV4_0_0, ParameterOpNestedV4_0_0, ParameterOpMappingV4_0_0, ParameterOpValueV4_0_0, PropertySchemaV4_0_0, OneOfSchemaV4_0_0, AllOfSchemaV4_0_0, RefSchemaLegacyV4_0_0, RefSchemaV4_0_0, ParameterSerializeStyleOptionsV4_0_0, ParameterSerializeOptionsV4_0_0, ObjectSchemaV4_0_0, ParameterOpOpV4_0_0, ReturnShapeArraySchemaV4_0_0 } from '../project-schema';
 /** Resolver Type Utils **/
 /**
  * Only tests that the shape is right, not that the name is correct. That's a job for the validator.
@@ -52,10 +52,9 @@ export declare function isParameterOpOp(maybeOp: ParameterOpV4_0_0): maybeOp is
  */
 export declare function isParameterSerializeStyleOptions(maybeStyle: ParameterSerializeOptionsV4_0_0): maybeStyle is ParameterSerializeStyleOptionsV4_0_0;
 /** Typeguards for different types of shape schemas **/
-export declare function isRefSchema(maybeRefSchema: ContentObjectSchemaV4_0_0 | ContentSchemaV4_0_0): maybeRefSchema is RefSchemaV4_0_0 | RefSchemaLegacyV4_0_0;
-export declare function isAllOfSchema(maybeExtendableSchema: ContentObjectSchemaV4_0_0 | ContentSchemaV4_0_0): maybeExtendableSchema is AllOfSchemaV4_0_0;
-export declare function isOneOfSchema(maybeExclusiveOrSchema: ContentObjectSchemaV4_0_0 | ContentSchemaV4_0_0): maybeExclusiveOrSchema is OneOfSchemaV4_0_0;
-export declare function isArraySchema(maybeArraySchema: ContentObjectSchemaV4_0_0 | ContentSchemaV4_0_0): maybeArraySchema is ArraySchemaV4_0_0;
-export declare function isObjectSchema(maybeObjectSchema: ContentObjectSchemaV4_0_0 | ContentSchemaV4_0_0): maybeObjectSchema is ObjectSchemaV4_0_0;
-export declare function isContentObjectSchema(maybeSchema: ContentObjectSchemaV4_0_0 | ContentSchemaV4_0_0): maybeSchema is ContentObjectSchemaV4_0_0;
+export declare function isRefSchema(maybeRefSchema: PropertySchemaV4_0_0): maybeRefSchema is RefSchemaV4_0_0 | RefSchemaLegacyV4_0_0;
+export declare function isAllOfSchema(schema: PropertySchemaV4_0_0): schema is AllOfSchemaV4_0_0;
+export declare function isOneOfSchema(schema: PropertySchemaV4_0_0): schema is OneOfSchemaV4_0_0;
+export declare function isArraySchema(schema: PropertySchemaV4_0_0): schema is ReturnShapeArraySchemaV4_0_0;
+export declare function isObjectSchema(schema: PropertySchemaV4_0_0): schema is ObjectSchemaV4_0_0;
 //# sourceMappingURL=type-utils.d.ts.map

package/lib/layers/type-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"type-utils.d.ts","sourceRoot":"","sources":["../../../src/layers/type-utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"type-utils.d.ts","sourceRoot":"","sources":["../../../src/layers/type-utils.ts"],"names":[],"mappings":"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"}

package/lib/layers/type-utils.js

@@ -8,7 +8,6 @@ exports.isArraySchema = isArraySchema;
 exports.isAwsLambdaResolver = isAwsLambdaResolver;
 exports.isBasicResolver = isBasicResolver;
 exports.isComposeResolver = isComposeResolver;
-exports.isContentObjectSchema = isContentObjectSchema;
 exports.isDirectiveConfig = isDirectiveConfig;
 exports.isDirectiveMappingArray = isDirectiveMappingArray;
 exports.isDirectiveMappingMap = isDirectiveMappingMap;
@@ -182,22 +181,18 @@ function isRefSchema(maybeRefSchema) {
   return (0, _isString.default)(maybeRefSchema['@ref']) || (0, _isString.default)(maybeRefSchema.$ref);
 }
 
-function isAllOfSchema(maybeExtendableSchema) {
-  return (0, _isArray.default)(maybeExtendableSchema.allOf);
+function isAllOfSchema(schema) {
+  return (0, _isArray.default)(schema.allOf);
 }
 
-function isOneOfSchema(maybeExclusiveOrSchema) {
-  return (0, _isArray.default)(maybeExclusiveOrSchema.oneOf);
+function isOneOfSchema(schema) {
+  return (0, _isArray.default)(schema.oneOf);
 }
 
-function isArraySchema(maybeArraySchema) {
-  return maybeArraySchema.type === 'array' && (0, _util.isObject)(maybeArraySchema.items);
+function isArraySchema(schema) {
+  return schema.type === 'array' && (0, _util.isObject)(schema.items);
 }
 
-function isObjectSchema(maybeObjectSchema) {
-  return maybeObjectSchema.type === 'object' && (0, _util.isObject)(maybeObjectSchema.properties);
-}
-
-function isContentObjectSchema(maybeSchema) {
-  return isRefSchema(maybeSchema) || isAllOfSchema(maybeSchema) || isObjectSchema(maybeSchema);
+function isObjectSchema(schema) {
+  return schema.type === 'object' && (0, _util.isObject)(schema.properties);
 }

package/lib/layers/visitor.d.ts

@@ -1,6 +1,6 @@
-import { ContentSchemaV4_0_0, ShapeMapV4_0_0 } from '../project-schema';
+import { PropertySchemaV4_0_0, ShapeMapV4_0_0 } from '../project-schema';
 import { SchemaPath } from '../types';
-export declare type PropertyVisitorCallback = (schema: ContentSchemaV4_0_0, path: SchemaPath) => void;
-export declare function visitSchemaProperties(schema: ContentSchemaV4_0_0, path: Array<string | number>, callback: PropertyVisitorCallback): void;
+export declare type PropertyVisitorCallback = (schema: PropertySchemaV4_0_0, path: SchemaPath) => void;
+export declare function visitSchemaProperties(schema: PropertySchemaV4_0_0, path: Array<string | number>, callback: PropertyVisitorCallback): void;
 export declare function visitShapeProperties(shapes: ShapeMapV4_0_0, callback: PropertyVisitorCallback): void;
 //# sourceMappingURL=visitor.d.ts.map

package/lib/layers/visitor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"visitor.d.ts","sourceRoot":"","sources":["../../../src/layers/visitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,mBAAmB,EAAE,cAAc,EAAC,MAAM,mBAAmB,CAAC;AAEtE,OAAO,EAAC,UAAU,EAAC,MAAM,UAAU,CAAC;AAEpC,oBAAY,uBAAuB,GAAG,CAAC,MAAM,EAAE,mBAAmB,EAAE,IAAI,EAAE,UAAU,KAAK,IAAI,CAAC;AAE9F,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,mBAAmB,EAC3B,IAAI,EAAE,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,EAC5B,QAAQ,EAAE,uBAAuB,GAChC,IAAI,CA4BN;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,uBAAuB,GAAG,IAAI,CAIpG"}
+{"version":3,"file":"visitor.d.ts","sourceRoot":"","sources":["../../../src/layers/visitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,oBAAoB,EAAE,cAAc,EAAC,MAAM,mBAAmB,CAAC;AAEvE,OAAO,EAAC,UAAU,EAAC,MAAM,UAAU,CAAC;AAEpC,oBAAY,uBAAuB,GAAG,CAAC,MAAM,EAAE,oBAAoB,EAAE,IAAI,EAAE,UAAU,KAAK,IAAI,CAAC;AAE/F,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,oBAAoB,EAC5B,IAAI,EAAE,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,EAC5B,QAAQ,EAAE,uBAAuB,GAChC,IAAI,CA4BN;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,uBAAuB,GAAG,IAAI,CAIpG"}