@takeshape/schema 8.68.3 → 8.69.0

package/es/layers/layers.js

@@ -1,5 +1,5 @@
 import minimatch from 'minimatch';
-import { deepClone, isDefined, isObject } from '@takeshape/util';
+import { deepClone, isDefined, isRecord } from '@takeshape/util';
 import uniq from 'lodash/uniq';
 import { getArgsReferenceWithPath, getRefOrItemsRef, dereferenceSchema, parseReturnShape, refItemToString, splitAtRef } from './refs';
 import { isAllOfSchema, isObjectSchema, isOneOfSchema, isRefSchema } from './type-utils';
@@ -36,7 +36,7 @@ function filterLayer(layerSchema, filters) {
 
 
 export function isObjectSchemaV4_0_0(maybeObjectSchema) {
-  return maybeObjectSchema.type === 'object' && isObject(maybeObjectSchema.properties);
+  return maybeObjectSchema.type === 'object' && isRecord(maybeObjectSchema.properties);
 }
 
 function mergeShape(a, b) {

package/es/layers/type-utils.js

@@ -1,4 +1,4 @@
-import { isObject } from '@takeshape/util';
+import { isRecord } from '@takeshape/util';
 import isPlainObject from 'lodash/isPlainObject';
 import isString from 'lodash/isString';
 import isArray from 'lodash/isArray';
@@ -60,7 +60,7 @@ export function isDirectiveMappingArray(maybeArray) {
  */
 
 export function isDirectiveConfig(maybeConfig) {
-  return isArray(maybeConfig) && isArray(maybeConfig[0]) && isString(maybeConfig[0][0]) && isObject(maybeConfig[0][1]);
+  return isArray(maybeConfig) && isArray(maybeConfig[0]) && isString(maybeConfig[0][0]) && isRecord(maybeConfig[0][1]);
 }
 /**
  * Determine whether a ParameterSerializeOption is a content type serializer
@@ -135,8 +135,8 @@ export function isOneOfSchema(schema) {
   return isArray(schema.oneOf);
 }
 export function isArraySchema(schema) {
-  return schema.type === 'array' && isObject(schema.items);
+  return schema.type === 'array' && isRecord(schema.items);
 }
 export function isObjectSchema(schema) {
-  return schema.type === 'object' && isObject(schema.properties);
+  return schema.type === 'object' && isRecord(schema.properties);
 }

package/es/rewrite.js

@@ -1,5 +1,5 @@
 import defaults from 'lodash/fp/defaults';
-import { isObject } from '@takeshape/util';
+import { isRecord } from '@takeshape/util';
 const rewriteSchemaCache = new Map();
 
 function getRewriteCache(options) {
@@ -33,7 +33,7 @@ export function rewriteSchema(schema, options) {
   }
 
   rewrittenSchema = JSON.parse(JSON.stringify(schema), (_key, value) => {
-    if (isObject(value)) {
+    if (isRecord(value)) {
       // Remove required
       if (options.removeRequired && Array.isArray(value.required) && value.required.length) {
         delete value.required;
@@ -44,7 +44,7 @@ export function rewriteSchema(schema, options) {
         delete value.default;
       }
 
-      if (options.replaceInput && isObject(value['@input'])) {
+      if (options.replaceInput && isRecord(value['@input'])) {
         return { ...value['@input'],
           '@mapping': value['@mapping']
         };

package/es/types/utils.js

@@ -1,4 +1,4 @@
-import { isObject } from '@takeshape/util';
+import { isRecord } from '@takeshape/util';
 import { ArgsType, RefType } from './types';
 import eq from 'semver/functions/eq';
 import coerce from 'semver/functions/coerce';
@@ -79,10 +79,10 @@ export const isProjectSchemaV3_14_0 = createVersionPredicate('3.14.0');
 export const isProjectSchemaV3_15_0 = createVersionPredicate('3.15.0');
 export const isLatestProjectSchema = createVersionPredicate(CURRENT_SCHEMA_VERSION);
 export function isV1XSchema(maybeSchema) {
-  return isObject(maybeSchema) && isString(maybeSchema.projectId) && isObject(maybeSchema.contentTypes) && (isUndefined(maybeSchema.schemaVersion) || maybeSchema.schemaVersion === '1' || maybeSchema.schemaVersion === '1.0.0');
+  return isRecord(maybeSchema) && isString(maybeSchema.projectId) && isRecord(maybeSchema.contentTypes) && (isUndefined(maybeSchema.schemaVersion) || maybeSchema.schemaVersion === '1' || maybeSchema.schemaVersion === '1.0.0');
 }
 export function isV3XSchema(maybeSchema) {
-  if (!isObject(maybeSchema) || !isString(maybeSchema.projectId) || !isString(maybeSchema.schemaVersion)) {
+  if (!isRecord(maybeSchema) || !isString(maybeSchema.projectId) || !isString(maybeSchema.schemaVersion)) {
     return false;
   }
 
@@ -94,12 +94,12 @@ export function isV3XSchema(maybeSchema) {
  */
 
 export function isAnyProjectSchema(value) {
-  if (!isObject(value)) {
+  if (!isRecord(value)) {
     return false;
   }
 
   const maybeSchema = value;
-  return isObject(value) && isString(maybeSchema.projectId) && (isV1XSchema(maybeSchema) || isV3XSchema(maybeSchema));
+  return isRecord(value) && isString(maybeSchema.projectId) && (isV1XSchema(maybeSchema) || isV3XSchema(maybeSchema));
 }
 export function isProjectSchemaWithServices(schema) {
   return typeof schema.dataKey !== 'undefined' && typeof schema.services !== 'undefined';
@@ -125,7 +125,7 @@ export function isDirectiveMappingArray(maybeArray) {
  */
 
 export function isDirectiveConfig(maybeConfig) {
-  return isArray(maybeConfig) && isArray(maybeConfig[0]) && isString(maybeConfig[0][0]) && isObject(maybeConfig[0][1]);
+  return isArray(maybeConfig) && isArray(maybeConfig[0]) && isString(maybeConfig[0][0]) && isRecord(maybeConfig[0][1]);
 }
 /**
  * Determine whether a ParameterSerializeOption is a content type serializer
@@ -221,10 +221,10 @@ export function isEnumSchema(obj) {
   return isArray(obj.enum);
 }
 export function isArraySchema(propertySchema) {
-  return propertySchema.type === 'array' && isObject(propertySchema.items);
+  return propertySchema.type === 'array' && isRecord(propertySchema.items);
 }
 export function isObjectSchema(propertySchema) {
-  return propertySchema.type === 'object' && isObject(propertySchema.properties);
+  return propertySchema.type === 'object' && isRecord(propertySchema.properties);
 }
 /** Service Config Utils **/
 

package/es/unions.js

@@ -1,5 +1,5 @@
 import { getRef, refItemToShapeName } from './refs';
-import { camelCase, isObject } from '@takeshape/util';
+import { camelCase, isRecord } from '@takeshape/util';
 import omit from 'lodash/omit';
 import { getContentTransform, toName } from './content-schema-transform';
 import { isRefSchema } from './types/utils';
@@ -64,7 +64,7 @@ function formatKeys(keys) {
 
 // eslint-disable-next-line max-params
 export const createUnwrapTransform = projectSchema => (obj, schema, name, shape, next) => {
-  if (isObject(obj)) {
+  if (isRecord(obj)) {
     const oneOfKeys = enumerateOneOfKeys(projectSchema, getOneOf(schema));
     const objectKeys = Object.keys(obj);
 
@@ -80,10 +80,10 @@ export const createUnwrapTransform = projectSchema => (obj, schema, name, shape,
     } of oneOfKeys) {
       const propValue = obj[propName];
 
-      if (isObject(propValue)) {
+      if (isRecord(propValue)) {
         const transformedPropValue = next(propValue, propSchema, name);
 
-        if (isObject(transformedPropValue)) {
+        if (isRecord(transformedPropValue)) {
           return { ...transformedPropValue,
             _shapeId: shapeId
           };
@@ -94,7 +94,7 @@ export const createUnwrapTransform = projectSchema => (obj, schema, name, shape,
 }; // eslint-disable-next-line max-params
 
 export const createWrapTransform = projectSchema => (obj, schema, name, shape, next) => {
-  if (isObject(obj) && typeof obj._shapeId === 'string') {
+  if (isRecord(obj) && typeof obj._shapeId === 'string') {
     const shape = getShapeById(projectSchema, obj._shapeId);
 
     if (shape) {

package/es/validate.js

@@ -290,22 +290,6 @@ function validateIndexedShapeConfig(projectSchema, shapeName, config) {
         message: `Invalid query "${list.name}"`
       });
     }
-
-    const shape = projectSchema.shapes[shapeName]; // Resolved shapes are not checked
-
-    if (shape && list.ignoreFields) {
-      for (const fieldName of list.ignoreFields) {
-        var _properties;
-
-        if (((_properties = shape.schema.properties) === null || _properties === void 0 ? void 0 : _properties[fieldName]) === undefined) {
-          errors.push({
-            path: ['indexedShapes', shapeName, 'queries', 'list', 'ignoreFields'],
-            type: 'notFound',
-            message: `Invalid property "${fieldName}" on shape "${shapeName}"`
-          });
-        }
-      }
-    }
   }
 
   return errors;

package/lib/layers/layers.js

@@ -59,7 +59,7 @@ function filterLayer(layerSchema, filters) {
 
 
 function isObjectSchemaV4_0_0(maybeObjectSchema) {
-  return maybeObjectSchema.type === 'object' && (0, _util.isObject)(maybeObjectSchema.properties);
+  return maybeObjectSchema.type === 'object' && (0, _util.isRecord)(maybeObjectSchema.properties);
 }
 
 function mergeShape(a, b) {

package/lib/layers/type-utils.js

@@ -104,7 +104,7 @@ function isDirectiveMappingArray(maybeArray) {
 
 
 function isDirectiveConfig(maybeConfig) {
-  return (0, _isArray.default)(maybeConfig) && (0, _isArray.default)(maybeConfig[0]) && (0, _isString.default)(maybeConfig[0][0]) && (0, _util.isObject)(maybeConfig[0][1]);
+  return (0, _isArray.default)(maybeConfig) && (0, _isArray.default)(maybeConfig[0]) && (0, _isString.default)(maybeConfig[0][0]) && (0, _util.isRecord)(maybeConfig[0][1]);
 }
 /**
  * Determine whether a ParameterSerializeOption is a content type serializer
@@ -190,9 +190,9 @@ function isOneOfSchema(schema) {
 }
 
 function isArraySchema(schema) {
-  return schema.type === 'array' && (0, _util.isObject)(schema.items);
+  return schema.type === 'array' && (0, _util.isRecord)(schema.items);
 }
 
 function isObjectSchema(schema) {
-  return schema.type === 'object' && (0, _util.isObject)(schema.properties);
+  return schema.type === 'object' && (0, _util.isRecord)(schema.properties);
 }

package/lib/rewrite.js

@@ -44,7 +44,7 @@ function rewriteSchema(schema, options) {
   }
 
   rewrittenSchema = JSON.parse(JSON.stringify(schema), (_key, value) => {
-    if ((0, _util.isObject)(value)) {
+    if ((0, _util.isRecord)(value)) {
       // Remove required
       if (options.removeRequired && Array.isArray(value.required) && value.required.length) {
         delete value.required;
@@ -55,7 +55,7 @@ function rewriteSchema(schema, options) {
         delete value.default;
       }
 
-      if (options.replaceInput && (0, _util.isObject)(value['@input'])) {
+      if (options.replaceInput && (0, _util.isRecord)(value['@input'])) {
         return { ...value['@input'],
           '@mapping': value['@mapping']
         };

package/lib/types/utils.js

@@ -176,11 +176,11 @@ const isLatestProjectSchema = createVersionPredicate(_schemas.CURRENT_SCHEMA_VER
 exports.isLatestProjectSchema = isLatestProjectSchema;
 
 function isV1XSchema(maybeSchema) {
-  return (0, _util.isObject)(maybeSchema) && (0, _isString.default)(maybeSchema.projectId) && (0, _util.isObject)(maybeSchema.contentTypes) && ((0, _isUndefined.default)(maybeSchema.schemaVersion) || maybeSchema.schemaVersion === '1' || maybeSchema.schemaVersion === '1.0.0');
+  return (0, _util.isRecord)(maybeSchema) && (0, _isString.default)(maybeSchema.projectId) && (0, _util.isRecord)(maybeSchema.contentTypes) && ((0, _isUndefined.default)(maybeSchema.schemaVersion) || maybeSchema.schemaVersion === '1' || maybeSchema.schemaVersion === '1.0.0');
 }
 
 function isV3XSchema(maybeSchema) {
-  if (!(0, _util.isObject)(maybeSchema) || !(0, _isString.default)(maybeSchema.projectId) || !(0, _isString.default)(maybeSchema.schemaVersion)) {
+  if (!(0, _util.isRecord)(maybeSchema) || !(0, _isString.default)(maybeSchema.projectId) || !(0, _isString.default)(maybeSchema.schemaVersion)) {
     return false;
   }
 
@@ -193,12 +193,12 @@ function isV3XSchema(maybeSchema) {
 
 
 function isAnyProjectSchema(value) {
-  if (!(0, _util.isObject)(value)) {
+  if (!(0, _util.isRecord)(value)) {
     return false;
   }
 
   const maybeSchema = value;
-  return (0, _util.isObject)(value) && (0, _isString.default)(maybeSchema.projectId) && (isV1XSchema(maybeSchema) || isV3XSchema(maybeSchema));
+  return (0, _util.isRecord)(value) && (0, _isString.default)(maybeSchema.projectId) && (isV1XSchema(maybeSchema) || isV3XSchema(maybeSchema));
 }
 
 function isProjectSchemaWithServices(schema) {
@@ -228,7 +228,7 @@ function isDirectiveMappingArray(maybeArray) {
 
 
 function isDirectiveConfig(maybeConfig) {
-  return (0, _isArray.default)(maybeConfig) && (0, _isArray.default)(maybeConfig[0]) && (0, _isString.default)(maybeConfig[0][0]) && (0, _util.isObject)(maybeConfig[0][1]);
+  return (0, _isArray.default)(maybeConfig) && (0, _isArray.default)(maybeConfig[0]) && (0, _isString.default)(maybeConfig[0][0]) && (0, _util.isRecord)(maybeConfig[0][1]);
 }
 /**
  * Determine whether a ParameterSerializeOption is a content type serializer
@@ -341,11 +341,11 @@ function isEnumSchema(obj) {
 }
 
 function isArraySchema(propertySchema) {
-  return propertySchema.type === 'array' && (0, _util.isObject)(propertySchema.items);
+  return propertySchema.type === 'array' && (0, _util.isRecord)(propertySchema.items);
 }
 
 function isObjectSchema(propertySchema) {
-  return propertySchema.type === 'object' && (0, _util.isObject)(propertySchema.properties);
+  return propertySchema.type === 'object' && (0, _util.isRecord)(propertySchema.properties);
 }
 /** Service Config Utils **/
 

package/lib/unions.js

@@ -86,7 +86,7 @@ function formatKeys(keys) {
 
 // eslint-disable-next-line max-params
 const createUnwrapTransform = projectSchema => (obj, schema, name, shape, next) => {
-  if ((0, _util.isObject)(obj)) {
+  if ((0, _util.isRecord)(obj)) {
     const oneOfKeys = enumerateOneOfKeys(projectSchema, getOneOf(schema));
     const objectKeys = Object.keys(obj);
 
@@ -102,10 +102,10 @@ const createUnwrapTransform = projectSchema => (obj, schema, name, shape, next)
     } of oneOfKeys) {
       const propValue = obj[propName];
 
-      if ((0, _util.isObject)(propValue)) {
+      if ((0, _util.isRecord)(propValue)) {
         const transformedPropValue = next(propValue, propSchema, name);
 
-        if ((0, _util.isObject)(transformedPropValue)) {
+        if ((0, _util.isRecord)(transformedPropValue)) {
           return { ...transformedPropValue,
             _shapeId: shapeId
           };
@@ -119,7 +119,7 @@ const createUnwrapTransform = projectSchema => (obj, schema, name, shape, next)
 exports.createUnwrapTransform = createUnwrapTransform;
 
 const createWrapTransform = projectSchema => (obj, schema, name, shape, next) => {
-  if ((0, _util.isObject)(obj) && typeof obj._shapeId === 'string') {
+  if ((0, _util.isRecord)(obj) && typeof obj._shapeId === 'string') {
     const shape = (0, _schemaUtil.getShapeById)(projectSchema, obj._shapeId);
 
     if (shape) {

package/lib/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;AAE1D,OAAO,KAAK,EAEV,gBAAgB,EAChB,aAAa,EASb,iBAAiB,EAIlB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAwB,yBAAyB,EAAC,MAAM,mBAAmB,CAAC;AA+dnF,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,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,iBAAiB,GAAG,SAAS,CAAC;CACnE;AA6ID;;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;;;;;;GAMG;AACH,wBAAgB,2BAA2B,CAAC,WAAW,EAAE,OAAO,GAAG,gBAAgB,CASlF"}
+{"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;AAE1D,OAAO,KAAK,EAEV,gBAAgB,EAChB,aAAa,EASb,iBAAiB,EAGlB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAwB,yBAAyB,EAAC,MAAM,mBAAmB,CAAC;AAgdnF,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,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,iBAAiB,GAAG,SAAS,CAAC;CACnE;AA6ID;;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;;;;;;GAMG;AACH,wBAAgB,2BAA2B,CAAC,WAAW,EAAE,OAAO,GAAG,gBAAgB,CASlF"}

package/lib/validate.js

@@ -325,22 +325,6 @@ function validateIndexedShapeConfig(projectSchema, shapeName, config) {
         message: `Invalid query "${list.name}"`
       });
     }
-
-    const shape = projectSchema.shapes[shapeName]; // Resolved shapes are not checked
-
-    if (shape && list.ignoreFields) {
-      for (const fieldName of list.ignoreFields) {
-        var _properties;
-
-        if (((_properties = shape.schema.properties) === null || _properties === void 0 ? void 0 : _properties[fieldName]) === undefined) {
-          errors.push({
-            path: ['indexedShapes', shapeName, 'queries', 'list', 'ignoreFields'],
-            type: 'notFound',
-            message: `Invalid property "${fieldName}" on shape "${shapeName}"`
-          });
-        }
-      }
-    }
   }
 
   return errors;

package/package.json

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