@takeshape/schema 8.35.1 → 8.35.2

package/es/index.js

@@ -1,3 +1,4 @@
+// Only export User here since AccessPolicyDocument is in auth-schemas
 export * from './content-schema-transform';
 export * from './get-is-leaf';
 export * from './project-schema';
@@ -7,10 +8,9 @@ export * from './template-shapes';
 export * from './taxonomies';
 export * from './workflows';
 export * from './builtin-schema';
-export * from './auth-schemas'; // Only export User here since AccessPolicyDocument is in auth-schemas
-
+export * from './auth-schemas';
 export * from './api-version';
-export { listTypePrefix, ensureLatest, normalizeSchemaVersion, getRelationshipSchema, migrateToLatestProjectSchema } from './migration';
+export * from './migration';
 export * from './validate';
 export { builtInShapes } from './builtin-schema';
 export * from './versions';

package/es/migration/index.js

@@ -0,0 +1,82 @@
+import { isLatestProjectSchema, isProjectSchemaV1, isProjectSchemaV3, isProjectSchemaV3_1, isProjectSchemaV3_2, isProjectSchemaV3_3, isProjectSchemaV3_4, isProjectSchemaV3_5, isProjectSchemaV3_5_1, isProjectSchemaV3_6, isProjectSchemaV3_7, isProjectSchemaV3_8, isProjectSchemaV3_9, isProjectSchemaV3_10 } from '../types/utils';
+import migrateToV3 from './to/v3.0.0';
+import migrateToV3_1 from './to/v3.1.0';
+import migrateToV3_2 from './to/v3.2.0';
+import migrateToV3_3 from './to/v3.3.0';
+import migrateToV3_4 from './to/v3.4.0';
+import migrateToV3_5 from './to/v3.5.0';
+import migrateToV3_5_1 from './to/v3.5.1';
+import migrateToV3_6 from './to/v3.6.0';
+import migrateToV3_7 from './to/v3.7.0';
+import migrateToV3_8 from './to/v3.8.0';
+import migrateToV3_9_0 from './to/v3.9.0';
+import migrateToV3_10 from './to/v3.10.0';
+import migrateToV3_11_0 from './to/v3.11.0';
+export * from './utils';
+export const listTypePrefix = 'PaginatedList';
+export async function migrateToLatestProjectSchema(context, projectSchema) {
+  if (projectSchema.schemaVersion === '4.0.0') {
+    throw new Error('You are using an unreleased schema version. Migration is not possible');
+  }
+
+  if (isProjectSchemaV1(projectSchema)) {
+    projectSchema = migrateToV3(projectSchema);
+  }
+
+  if (isProjectSchemaV3(projectSchema)) {
+    projectSchema = await migrateToV3_1(context, projectSchema);
+  }
+
+  if (isProjectSchemaV3_1(projectSchema)) {
+    projectSchema = migrateToV3_2(projectSchema);
+  }
+
+  if (isProjectSchemaV3_2(projectSchema)) {
+    projectSchema = await migrateToV3_3(context, projectSchema);
+  }
+
+  if (isProjectSchemaV3_3(projectSchema)) {
+    projectSchema = migrateToV3_4(projectSchema);
+  }
+
+  if (isProjectSchemaV3_4(projectSchema)) {
+    projectSchema = migrateToV3_5(projectSchema);
+  }
+
+  if (isProjectSchemaV3_5(projectSchema)) {
+    projectSchema = migrateToV3_5_1(projectSchema);
+  }
+
+  if (isProjectSchemaV3_5_1(projectSchema)) {
+    projectSchema = migrateToV3_6(projectSchema);
+  }
+
+  if (isProjectSchemaV3_6(projectSchema)) {
+    projectSchema = migrateToV3_7(projectSchema);
+  }
+
+  if (isProjectSchemaV3_7(projectSchema)) {
+    projectSchema = migrateToV3_8(projectSchema);
+  }
+
+  if (isProjectSchemaV3_8(projectSchema)) {
+    projectSchema = migrateToV3_9_0(projectSchema);
+  }
+
+  if (isProjectSchemaV3_9(projectSchema)) {
+    projectSchema = migrateToV3_10(projectSchema);
+  }
+
+  if (isProjectSchemaV3_10(projectSchema)) {
+    projectSchema = migrateToV3_11_0(context, projectSchema);
+  }
+
+  return projectSchema;
+}
+export async function ensureLatest(context, schema) {
+  if (!schema || isLatestProjectSchema(schema)) {
+    return schema;
+  }
+
+  return migrateToLatestProjectSchema(context, schema);
+}

package/es/migration/to/v3.0.0.js

@@ -0,0 +1,245 @@
+import forEach from 'lodash/forEach';
+import pick from 'lodash/pick';
+import { pascalCase, deepClone } from '@takeshape/util';
+import { arraySchemaKeys, getShapeQueriesAndMutations, multipleRelationshipSchemaKeys, objectSchemaKeys, scalarSchemaKeys, schemaMetadataKeys } from '../../schema-util';
+import { formatDate, getRelationshipSchema } from '../utils';
+const annotationMap = {
+  l10n: '@l10n',
+  sensitive: '@sensitive',
+  syncLocaleStructure: '@syncLocaleStructure'
+};
+
+function isColor(schema) {
+  const {
+    type,
+    properties
+  } = schema;
+  return Boolean(type === 'object' && properties && properties.hsl && properties.hsv && properties.rgb && properties.hex);
+}
+
+function getModelType(contentType) {
+  if (contentType.single) {
+    return 'single';
+  }
+
+  if (contentType.taxonomy) {
+    return 'taxonomy';
+  }
+
+  return 'multiple';
+} // eslint-disable-next-line complexity
+
+
+function migrateToContentSchemaV3(params) {
+  const {
+    schema,
+    service,
+    name,
+    key,
+    setSource,
+    omitAllSources
+  } = params;
+  const {
+    type
+  } = schema;
+  const mapping = !omitAllSources && key && setSource !== false && name !== key ? `${service}.${key}` : undefined;
+  forEach(schema, (value, key) => {
+    if (annotationMap[key]) {
+      const newAnnotation = annotationMap[key];
+      schema[newAnnotation] = value; // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
+
+      delete schema[key];
+    }
+  });
+
+  if (type === 'string' || type === 'boolean' || type === 'number' || type === 'integer') {
+    return {
+      schema: { ...pick(schema, scalarSchemaKeys),
+        '@mapping': mapping
+      }
+    };
+  }
+
+  const {
+    relationship
+  } = schema;
+
+  if (relationship) {
+    const {
+      contentTypeIds,
+      type: relationshipType,
+      relatedName
+    } = relationship;
+    return {
+      schema: { ...pick(schema, relationshipType === 'multiple' ? multipleRelationshipSchemaKeys : schemaMetadataKeys),
+        '@mapping': mapping,
+        ...getRelationshipSchema({
+          shapeIds: contentTypeIds,
+          type: relationshipType ?? 'single',
+          // Type is optional on assets
+          relatedName
+        })
+      }
+    };
+  }
+
+  if (type === 'object' && schema.draftjs) {
+    return {
+      schema: { ...pick(schema, scalarSchemaKeys),
+        '@mapping': mapping,
+        '@tag': 'draftjs'
+      }
+    };
+  }
+
+  if (isColor(schema)) {
+    return {
+      schema: { ...pick(schema, scalarSchemaKeys),
+        $ref: '#/shapes/TSColor/schema',
+        '@mapping': mapping
+      }
+    };
+  }
+
+  if (type === 'object' && schema.properties) {
+    const properties = {};
+    const shapes = {};
+    const shapeTitle = [params.shapeTitle, pascalCase(schema.title ?? params.name)].filter(Boolean).join(' ');
+    const shapeName = `${params.shapeName}${pascalCase(params.name)}`;
+    const contentSourceId = `takeshape:local:${shapeName}`;
+    forEach(schema.properties, (propSchema, name) => {
+      const {
+        schema: migratedPropSchema,
+        hoistedShapes
+      } = migrateToContentSchemaV3({ ...params,
+        shapeName,
+        shapeTitle,
+        depth: params.depth + 1,
+        schema: propSchema,
+        parentSchema: schema,
+        service: contentSourceId,
+        key: propSchema.key ?? name,
+        name,
+        setSource: true
+      });
+      properties[name] = migratedPropSchema;
+      Object.assign(shapes, hoistedShapes);
+    });
+
+    if (params.depth > 0) {
+      const {
+        title,
+        description,
+        ...rest
+      } = schema;
+      return {
+        schema: {
+          title,
+          description,
+          '@mapping': mapping,
+          $ref: `#/shapes/${shapeName}/schema`
+        },
+        hoistedShapes: { ...shapes,
+          [shapeName]: {
+            id: name === key ? shapeName : key,
+            name: shapeName,
+            title: shapeTitle,
+            schema: { ...pick(rest, objectSchemaKeys),
+              type: 'object',
+              properties
+            }
+          }
+        }
+      };
+    }
+
+    return {
+      schema: { ...pick(schema, objectSchemaKeys),
+        properties,
+        '@mapping': mapping
+      },
+      hoistedShapes: shapes
+    };
+  }
+
+  if (schema.type === 'array' && schema.items) {
+    const {
+      schema: itemSchema,
+      hoistedShapes
+    } = migrateToContentSchemaV3({ ...params,
+      schema: schema.items,
+      parentSchema: schema,
+      service: 'parent',
+      setSource: false
+    });
+    return {
+      schema: { ...pick(schema, arraySchemaKeys),
+        items: itemSchema,
+        '@mapping': mapping
+      },
+      hoistedShapes
+    };
+  }
+
+  throw new Error(`Unknown schema type "${type}"`);
+}
+
+function contentTypeToShape(contentType, contentTypeId) {
+  const title = contentType.title ?? contentType.name;
+  const name = pascalCase(contentType.name);
+  const contentSourceId = `takeshape:local:${name}`;
+  const {
+    schema,
+    hoistedShapes
+  } = migrateToContentSchemaV3({
+    shapeName: name,
+    shapeTitle: title,
+    schema: contentType.schema,
+    service: contentSourceId,
+    name: '',
+    key: '',
+    depth: 0
+  });
+  return {
+    [name]: {
+      id: contentTypeId,
+      name,
+      title,
+      model: {
+        type: getModelType(contentType)
+      },
+      workflow: contentType.workflow,
+      schema: schema
+    },
+    ...hoistedShapes
+  };
+}
+
+function migrateToV3_0_0(projectSchema) {
+  const {
+    contentTypes,
+    created,
+    updated,
+    ...rest
+  } = projectSchema;
+  const shapes = {};
+  const forms = {};
+  Object.keys(contentTypes).forEach(contentTypeId => {
+    const contentType = contentTypes[contentTypeId];
+    Object.assign(shapes, contentTypeToShape(contentType, contentTypeId));
+    forms[pascalCase(contentType.name)] = contentType.forms;
+  }); // Use deepClone to drop undefined values, this improves compatibility with validation and testing
+  // Schemas are typically saved in Dynamo or JSON files which also remove undefined values
+  // Dropping them here is done for consistency's sake
+
+  return deepClone({ ...rest,
+    ...getShapeQueriesAndMutations(Object.values(shapes)),
+    schemaVersion: '3',
+    created: formatDate(created),
+    updated: formatDate(updated),
+    shapes,
+    forms
+  });
+}
+
+export default migrateToV3_0_0;

package/es/{migration-utils.js → migration/to/v3.1.0.js}

@@ -1,16 +1,14 @@
-/**
- * This file is a stop-gap for this story: https://app.shortcut.com/takeshape/story/7140/reorganize-schema-migration-ts-into-a-directory
- */
-import { isAnyServiceConfig } from './types/utils';
-import { pascalCase } from '@takeshape/util';
+import pReduce from 'p-reduce';
 import isObject from 'lodash/isObject';
 import isString from 'lodash/isString';
 import isUndefined from 'lodash/isUndefined';
+import { deepClone, pascalCase } from '@takeshape/util';
+import { isAnyServiceConfig } from '../../types/utils';
 /**
  * `graphql:my-key` `my-key`
  */
 
-export function parseV3ServiceStr(service) {
+function parseV3ServiceStr(service) {
   const parts = service.split(':');
   return {
     provider: parts.length > 1 ? parts[0] : undefined,
@@ -23,7 +21,8 @@ export function parseV3ServiceStr(service) {
  */
 // eslint-disable-next-line complexity
 
-export function updateServiceConfigV3ToV3_1(serviceConfig, serviceKey) {
+
+function updateServiceConfigV3ToV3_1(serviceConfig, serviceKey) {
   if (isAnyServiceConfig(serviceConfig)) {
     if (isString(serviceConfig.authentication) || isUndefined(serviceConfig.authentication)) {
       return serviceConfig;
@@ -125,6 +124,7 @@ export function updateServiceConfigV3ToV3_1(serviceConfig, serviceKey) {
  * V1/V3 unencrypted `auth` -> V3.1 `authentication
  */
 
+
 function updateServiceAuthentication(authenticationType, legacyAuth, legacyParams) {
   if (authenticationType === 'oauth2Bearer') {
     return {
@@ -183,4 +183,36 @@ function mapAuthType(authType, auth) {
   }
 
   return 'unknown';
-}
+}
+
+async function migrateToV3_1(context, projectSchema) {
+  const {
+    encryptFn,
+    decryptFn
+  } = context;
+  let services;
+  /**
+   * Services can only be migrated if a dataKey is present, otherwise they will need to be discarded.
+   */
+
+  if (projectSchema.services) {
+    services = await pReduce(Object.entries(projectSchema.services), async (serviceMap, [serviceKey, serviceConfig]) => {
+      const auth = serviceConfig.auth && decryptFn(serviceConfig.auth);
+      const updatedServiceConfig = updateServiceConfigV3ToV3_1({ ...serviceConfig,
+        auth
+      }, serviceKey);
+      const authentication = updatedServiceConfig === null || updatedServiceConfig === void 0 ? void 0 : updatedServiceConfig.authentication;
+      serviceMap[serviceKey] = { ...updatedServiceConfig,
+        authentication: authentication && isObject(authentication) ? encryptFn(authentication) : authentication
+      };
+      return serviceMap;
+    }, {});
+  }
+
+  return deepClone({ ...projectSchema,
+    services,
+    schemaVersion: '3.1.0'
+  });
+}
+
+export default migrateToV3_1;

package/es/migration/to/v3.10.0.js

@@ -0,0 +1,56 @@
+import mapValues from 'lodash/mapValues';
+
+function migrateQueryToV3_10(query, queryName) {
+  const {
+    args,
+    shape
+  } = query;
+
+  if (typeof args === 'object' && ('oneOf' in args || 'allOf' in args || '$ref' in args || '@ref' in args)) {
+    // As of 11/15/2021 no production schemas contained queries with these args
+    throw new Error(`Query "${queryName}" contains an unsupported arg schema ${JSON.stringify(args)}. Please contact support`);
+  }
+
+  if (typeof shape === 'object' && !shape.items['@ref']) {
+    // As of 11/15/2021 no production schemas contained queries with array return shapes that are not @refs
+    throw new Error(`Query "${queryName}" contains an unsupported shape schema ${JSON.stringify(shape)}. Please contact support`);
+  }
+
+  return query;
+}
+
+function migrateShapeToV3_10(shape) {
+  const {
+    schema,
+    ...rest
+  } = shape; // As of 11/15/2021 no production schemas contained shapes with array schemas
+
+  if ('type' in schema && schema.type === 'array') {
+    throw new Error(`Shape ${shape.name} uses an unsupported array schema. Please contact support`);
+  }
+
+  const newSchema = '$ref' in schema || '@ref' in schema ? {
+    allOf: [schema]
+  } : schema;
+  return { ...rest,
+    schema: newSchema
+  };
+}
+
+function migrateToV3_10(projectSchema) {
+  const {
+    queries,
+    mutations,
+    shapes,
+    schemaVersion,
+    ...rest
+  } = projectSchema;
+  return { ...rest,
+    queries: mapValues(queries, migrateQueryToV3_10),
+    mutations: mapValues(mutations, migrateQueryToV3_10),
+    shapes: mapValues(shapes, migrateShapeToV3_10),
+    schemaVersion: '3.10.0'
+  };
+}
+
+export default migrateToV3_10;

package/es/migration/to/v3.11.0.js

@@ -0,0 +1,99 @@
+import fromPairs from 'lodash/fromPairs';
+
+function migrateToV3_11_0({
+  decryptFn,
+  encryptFn
+}, projectSchema) {
+  const migratedServices = [];
+
+  for (const [serviceKey, serviceConfig] of Object.entries(projectSchema.services ?? {})) {
+    const {
+      authenticationType,
+      authentication
+    } = serviceConfig; // Migrate authentication, ensuring now required properties
+
+    if (authentication && authenticationType !== 'unknown' && authenticationType !== 'none') {
+      const decrypted = decryptFn(authentication);
+
+      if (!decrypted) {
+        throw new Error(`Service "${serviceKey}" authentication could not be decrypted. Please contact support.`);
+      }
+
+      let migrated;
+
+      if (authenticationType === 'searchParams') {
+        migrated = {
+          params: decrypted,
+          type: authenticationType
+        };
+      }
+
+      if (authenticationType === 'basic') {
+        migrated = {
+          username: '',
+          password: '',
+          ...decrypted,
+          type: authenticationType
+        };
+      }
+
+      if (authenticationType === 'bearer') {
+        migrated = {
+          token: '',
+          ...decrypted,
+          type: authenticationType
+        };
+      }
+
+      if (authenticationType === 'oauth2Bearer') {
+        migrated = {
+          token: '',
+          ...decrypted,
+          type: authenticationType
+        };
+      }
+
+      if (authenticationType === 'oauth2') {
+        migrated = {
+          grantType: 'clientCredentials',
+          clientId: '',
+          ...decrypted,
+          type: authenticationType
+        };
+      }
+
+      if (authenticationType === 'aws') {
+        migrated = {
+          awsAccessKeyId: '',
+          awsSecretAccessKey: '',
+          ...decrypted,
+          type: authenticationType
+        };
+      }
+
+      if (authenticationType === 'custom') {
+        migrated = { ...decrypted,
+          type: authenticationType
+        };
+      }
+
+      if (migrated) {
+        const migratedServiceConfig = { ...serviceConfig,
+          authentication: encryptFn(migrated)
+        };
+        migratedServices.push([serviceKey, migratedServiceConfig]);
+      } else {
+        migratedServices.push([serviceKey, serviceConfig]);
+      }
+    } else {
+      migratedServices.push([serviceKey, serviceConfig]);
+    }
+  }
+
+  return { ...projectSchema,
+    services: fromPairs(migratedServices),
+    schemaVersion: '3.11.0'
+  };
+}
+
+export default migrateToV3_11_0;

package/es/migration/to/v3.2.0.js

@@ -0,0 +1,10 @@
+function migrateToV3_2(projectSchema) {
+  /**
+   * No migration needed all changes are backwards compatible.
+   */
+  return { ...projectSchema,
+    schemaVersion: '3.2.0'
+  };
+}
+
+export default migrateToV3_2;

package/es/migration/to/v3.3.0.js

@@ -0,0 +1,16 @@
+async function migrateToV3_3(context, projectSchema) {
+  const {
+    generateDataKeyFn
+  } = context;
+  const dataKey = projectSchema.dataKey ? projectSchema.dataKey : await generateDataKeyFn();
+  /**
+   * Generate a dataKey if none is present.
+   */
+
+  return { ...projectSchema,
+    schemaVersion: '3.3.0',
+    dataKey
+  };
+}
+
+export default migrateToV3_3;

package/es/migration/to/v3.4.0.js

@@ -0,0 +1,10 @@
+function migrateToV3_4(projectSchema) {
+  /**
+   * No migration needed all changes are backwards compatible.
+   */
+  return { ...projectSchema,
+    schemaVersion: '3.4.0'
+  };
+}
+
+export default migrateToV3_4;

package/es/migration/to/v3.5.0.js

@@ -0,0 +1,10 @@
+function migrateToV3_5(projectSchema) {
+  /**
+   * No migration needed all changes are backwards compatible.
+   */
+  return { ...projectSchema,
+    schemaVersion: '3.5.0'
+  };
+}
+
+export default migrateToV3_5;

package/es/migration/to/v3.5.1.js

@@ -0,0 +1,10 @@
+function migrateToV3_5_1(projectSchema) {
+  /**
+   * No migration needed all changes are backwards compatible.
+   */
+  return { ...projectSchema,
+    schemaVersion: '3.5.1'
+  };
+}
+
+export default migrateToV3_5_1;

package/es/migration/to/v3.6.0.js

@@ -0,0 +1,10 @@
+function migrateToV3_6(projectSchema) {
+  /**
+   * No migration needed all changes are backwards compatible.
+   */
+  return { ...projectSchema,
+    schemaVersion: '3.6.0'
+  };
+}
+
+export default migrateToV3_6;

package/es/migration/to/v3.7.0.js

@@ -0,0 +1,10 @@
+function migrateToV3_7(projectSchema) {
+  /**
+   * No migration needed all changes are backwards compatible.
+   */
+  return { ...projectSchema,
+    schemaVersion: '3.7.0'
+  };
+}
+
+export default migrateToV3_7;

package/es/migration/to/v3.8.0.js

@@ -0,0 +1,10 @@
+function migrateToV3_8(projectSchema) {
+  /**
+   * No migration needed all changes are backwards compatible.
+   */
+  return { ...projectSchema,
+    schemaVersion: '3.8.0'
+  };
+}
+
+export default migrateToV3_8;