@takeshape/schema 8.59.0 → 8.62.0

package/es/types/utils.js

@@ -5,6 +5,7 @@ import coerce from 'semver/functions/coerce';
 import isPlainObject from 'lodash/isPlainObject';
 import isString from 'lodash/isString';
 import isArray from 'lodash/isArray';
+import isUndefined from 'lodash/isUndefined';
 import has from 'lodash/has';
 import { CURRENT_SCHEMA_VERSION, latestSchemaJson } from '../schemas';
 import satisfies from 'semver/functions/satisfies';
@@ -72,7 +73,12 @@ export const isProjectSchemaV3_11 = createVersionPredicate('3.11.0');
 export const isProjectSchemaV3_12 = createVersionPredicate('3.12.0');
 export const isProjectSchemaV3_12_1 = createVersionPredicate('3.12.1');
 export const isProjectSchemaV3_12_2 = createVersionPredicate('3.12.2');
+export const isProjectSchemaV3_12_3 = createVersionPredicate('3.12.3');
+export const isProjectSchemaV3_13_0 = createVersionPredicate('3.13.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');
+}
 export function isV3XSchema(maybeSchema) {
   if (!isObject(maybeSchema) || !isString(maybeSchema.projectId) || !isString(maybeSchema.schemaVersion)) {
     return false;
@@ -91,7 +97,7 @@ export function isAnyProjectSchema(value) {
   }
 
   const maybeSchema = value;
-  return isObject(value) && isString(maybeSchema.projectId) && (isProjectSchemaV1(maybeSchema) || isProjectSchemaV3(maybeSchema) || isProjectSchemaV3_1(maybeSchema) || isProjectSchemaV3_2(maybeSchema) || isProjectSchemaV3_3(maybeSchema) || isProjectSchemaV3_4(maybeSchema) || isProjectSchemaV3_5(maybeSchema) || isProjectSchemaV3_5_1(maybeSchema) || isProjectSchemaV3_6(maybeSchema) || isProjectSchemaV3_7(maybeSchema) || isProjectSchemaV3_8(maybeSchema) || isProjectSchemaV3_9(maybeSchema) || isProjectSchemaV3_10(maybeSchema) || isProjectSchemaV3_11(maybeSchema) || isProjectSchemaV3_12(maybeSchema) || isProjectSchemaV3_12_1(maybeSchema) || isProjectSchemaV3_12_2(maybeSchema));
+  return isObject(value) && isString(maybeSchema.projectId) && (isV1XSchema(maybeSchema) || isV3XSchema(maybeSchema));
 }
 export function isProjectSchemaWithServices(schema) {
   return typeof schema.dataKey !== 'undefined' && typeof schema.services !== 'undefined';

package/es/validate.js

@@ -279,26 +279,26 @@ function validateIndexedShapeConfig(projectSchema, shapeName, config) {
   var _config$queries;
 
   const errors = [];
-  const all = (_config$queries = config.queries) === null || _config$queries === void 0 ? void 0 : _config$queries.all;
+  const list = (_config$queries = config.queries) === null || _config$queries === void 0 ? void 0 : _config$queries.list;
 
-  if (all) {
-    if (projectSchema.queries[all.name] === undefined) {
+  if (list) {
+    if (projectSchema.queries[list.name] === undefined) {
       errors.push({
-        path: ['indexedShapes', shapeName, 'queries', 'all', 'name'],
+        path: ['indexedShapes', shapeName, 'queries', 'list', 'name'],
         type: 'notFound',
-        message: `Invalid query "${all.name}"`
+        message: `Invalid query "${list.name}"`
       });
     }
 
     const shape = projectSchema.shapes[shapeName]; // Resolved shapes are not checked
 
-    if (shape && all.ignoreFields) {
-      for (const fieldName of all.ignoreFields) {
+    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', 'all', 'ignoreFields'],
+            path: ['indexedShapes', shapeName, 'queries', 'list', 'ignoreFields'],
             type: 'notFound',
             message: `Invalid property "${fieldName}" on shape "${shapeName}"`
           });
@@ -393,10 +393,8 @@ function validateRefs(projectSchema, additionalShapeNames = builtInShapeNames) {
 }
 
 function validateDirectives(projectSchema, additionalShapeIds = builtInModelShapeIds) {
-  const errors = []; // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
-
-  const projectShapeIds = new Set([...getModelShapeIds(projectSchema.shapes), ...additionalShapeIds]); // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
-
+  const errors = [];
+  const projectShapeIds = new Set([...getModelShapeIds(projectSchema.shapes), ...additionalShapeIds]);
   visitShapeProperties(projectSchema.shapes, (schema, path) => {
     if (schema['@relationship']) {
       var _schema$Relationship;
@@ -428,8 +426,7 @@ function validateDirectives(projectSchema, additionalShapeIds = builtInModelShap
 }
 
 function validateOneOfs(projectSchema) {
-  const errors = []; // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
-
+  const errors = [];
   visitShapeProperties(projectSchema.shapes, (schema, path) => {
     const oneOfPath = schema.items ? ['items', 'oneOf'] : ['oneOf'];
     schema = schema.items ? schema.items : schema;