@takeshape/schema 8.30.0 → 8.35.1

package/examples/latest/stripe-starter-resolved.json

@@ -395,7 +395,7 @@
       "namespace": "Stripe",
       "serviceType": "openapi",
       "authenticationType": "bearer",
-      "authentication": "supersecret",
+      "authentication": "abc",
       "options": {
         "endpoint": "https://api.stripe.com/",
         "spec": "https://raw.githubusercontent.com/stripe/openapi/master/openapi/spec3.json"
@@ -29312,5 +29312,5 @@
       }
     }
   },
-  "schemaVersion": "3.10.0"
+  "schemaVersion": "3.11.0"
 }

package/examples/latest/user-schema-no-required.json

@@ -169,5 +169,6 @@
       }
     }
   },
-  "schemaVersion": "3.10.0"
+  "schemaVersion": "3.11.0",
+  "services": {}
 }

package/examples/latest/user-schema-with-defaults.json

@@ -194,5 +194,6 @@
       }
     }
   },
-  "schemaVersion": "3.10.0"
+  "schemaVersion": "3.11.0",
+  "services": {}
 }

package/lib/migration-utils.d.ts

@@ -0,0 +1,18 @@
+/**
+ * This file is a stop-gap for this story: https://app.shortcut.com/takeshape/story/7140/reorganize-schema-migration-ts-into-a-directory
+ */
+import type { ServiceKey } from './types/types';
+import type { StoredServiceConfigV3_1_0, ServiceConfigV3_1_0 } from './project-schema';
+/**
+ * `graphql:my-key` `my-key`
+ */
+export declare function parseV3ServiceStr(service: string): {
+    provider?: string;
+    id: string;
+};
+/**
+ * Ensures a consistent service config, inluding updating the service
+ * authentication object.
+ */
+export declare function updateServiceConfigV3ToV3_1(serviceConfig: Record<string, unknown>, serviceKey: ServiceKey): StoredServiceConfigV3_1_0 | ServiceConfigV3_1_0;
+//# sourceMappingURL=migration-utils.d.ts.map

package/lib/migration-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"migration-utils.d.ts","sourceRoot":"","sources":["../../src/migration-utils.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAC,UAAU,EAA2B,MAAM,eAAe,CAAC;AACxE,OAAO,KAAK,EAAC,yBAAyB,EAAE,mBAAmB,EAA8B,MAAM,kBAAkB,CAAC;AAQlH;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAC,CAGlF;AAED;;;GAGG;AAEH,wBAAgB,2BAA2B,CACzC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACtC,UAAU,EAAE,UAAU,GACrB,yBAAyB,GAAG,mBAAmB,CAkGjD"}

package/lib/migration-utils.js

@@ -0,0 +1,203 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.parseV3ServiceStr = parseV3ServiceStr;
+exports.updateServiceConfigV3ToV3_1 = updateServiceConfigV3ToV3_1;
+
+var _utils = require("./types/utils");
+
+var _util = require("@takeshape/util");
+
+var _isObject = _interopRequireDefault(require("lodash/isObject"));
+
+var _isString = _interopRequireDefault(require("lodash/isString"));
+
+var _isUndefined = _interopRequireDefault(require("lodash/isUndefined"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/**
+ * This file is a stop-gap for this story: https://app.shortcut.com/takeshape/story/7140/reorganize-schema-migration-ts-into-a-directory
+ */
+
+/**
+ * `graphql:my-key` `my-key`
+ */
+function parseV3ServiceStr(service) {
+  const parts = service.split(':');
+  return {
+    provider: parts.length > 1 ? parts[0] : undefined,
+    id: parts.length > 1 ? parts[1] : parts[0]
+  };
+}
+/**
+ * Ensures a consistent service config, inluding updating the service
+ * authentication object.
+ */
+// eslint-disable-next-line complexity
+
+
+function updateServiceConfigV3ToV3_1(serviceConfig, serviceKey) {
+  if ((0, _utils.isAnyServiceConfig)(serviceConfig)) {
+    if ((0, _isString.default)(serviceConfig.authentication) || (0, _isUndefined.default)(serviceConfig.authentication)) {
+      return serviceConfig;
+    }
+
+    return serviceConfig;
+  }
+
+  const {
+    auth
+  } = serviceConfig;
+  const serviceParams = serviceConfig.params || {};
+  let {
+    provider: serviceKeyProvider,
+    id: serviceKeyId
+  } = parseV3ServiceStr(serviceKey);
+  const authType = serviceParams.authType || undefined;
+  const title = serviceParams.name || serviceKeyId;
+
+  if (serviceKeyId === 'vercel') {
+    serviceKeyProvider = 'vercel';
+  } else if (serviceKeyId === 'netlify') {
+    serviceKeyProvider = 'netlify';
+  } // Example schemas had this in params, which are untyped, so adding here just in case
+
+
+  if (serviceParams.type === 'rest') {
+    serviceKeyProvider = 'rest';
+  } else if (serviceParams.type === 'graphql' && serviceKeyProvider !== 'shopify') {
+    serviceKeyProvider = 'graphql';
+  }
+
+  let provider;
+  let authenticationType;
+  let serviceType;
+  let namespace;
+
+  if (serviceKeyProvider === 'shopify') {
+    provider = 'shopify';
+    authenticationType = 'oauth2Bearer';
+    serviceType = 'graphql';
+    namespace = serviceParams.namespace ?? 'Shopify';
+  } else if (serviceKeyProvider === 'takeshape') {
+    provider = 'takeshape';
+    authenticationType = 'none';
+    serviceType = 'takeshape';
+    namespace = serviceParams.namespace ?? 'TakeShape';
+  } else if (serviceKeyProvider === 'bigcommerce') {
+    provider = 'bigcommerce';
+    authenticationType = 'bearer';
+    serviceType = 'graphql';
+    namespace = serviceParams.namespace ?? 'BigCommerce';
+  } else if (serviceKeyProvider === 'rest') {
+    provider = 'generic';
+    authenticationType = mapAuthType(authType, auth);
+    serviceType = 'rest';
+    namespace = serviceParams.namespace ?? (0, _util.pascalCase)(title);
+  } else if (serviceKeyProvider === 'graphql') {
+    provider = 'generic';
+    authenticationType = mapAuthType(authType, auth);
+    serviceType = 'graphql';
+    namespace = serviceParams.namespace ?? (0, _util.pascalCase)(title);
+  } else if (serviceKeyProvider === 'vercel') {
+    provider = 'vercel';
+    authenticationType = 'oauth2Bearer';
+    serviceType = 'deployment';
+  } else if (serviceKeyProvider === 'netlify') {
+    provider = 'netlify';
+    authenticationType = 'oauth2Bearer';
+    serviceType = 'deployment';
+  } else {
+    provider = 'generic';
+    authenticationType = mapAuthType(authType, auth);
+    serviceType = 'unknown';
+    namespace = serviceParams.namespace ?? (0, _util.pascalCase)(title);
+  }
+
+  const updatedServiceConfig = {
+    title,
+    id: serviceKey,
+    provider,
+    namespace,
+    serviceType,
+    authenticationType,
+    options: { ...serviceParams
+    }
+  };
+
+  if (serviceConfig.auth && (0, _isObject.default)(serviceConfig.auth)) {
+    const authentication = updateServiceAuthentication(updatedServiceConfig.authenticationType, serviceConfig.auth, serviceParams);
+    return { ...updatedServiceConfig,
+      authentication
+    };
+  }
+
+  return updatedServiceConfig;
+}
+/**
+ * V1/V3 unencrypted `auth` -> V3.1 `authentication
+ */
+
+
+function updateServiceAuthentication(authenticationType, legacyAuth, legacyParams) {
+  if (authenticationType === 'oauth2Bearer') {
+    return {
+      token: legacyAuth.accessToken,
+      scope: legacyAuth.scope,
+      header: legacyParams.authHeader
+    };
+  }
+
+  if (authenticationType === 'searchParams' && legacyParams.authProp) {
+    return [{
+      name: legacyParams.authProp,
+      value: legacyAuth.accessToken
+    }];
+  }
+
+  if (authenticationType === 'basic') {
+    const [username, password] = Buffer.from(legacyAuth.accessToken, 'base64').toString('utf-8').split(':');
+    return {
+      username,
+      password
+    };
+  }
+
+  if (authenticationType === 'bearer') {
+    return {
+      token: legacyAuth.accessToken,
+      header: legacyParams.authHeader
+    };
+  }
+}
+
+function mapAuthType(authType, auth) {
+  if (authType === 'none') {
+    return 'none';
+  }
+
+  if (authType === 'searchParams') {
+    return 'searchParams';
+  }
+
+  if (authType === 'bearer') {
+    return 'bearer';
+  }
+
+  if (authType === 'bearer') {
+    return 'basic';
+  }
+
+  if (!auth) {
+    return 'none';
+  }
+
+  if (auth) {
+    return 'bearer';
+  }
+
+  return 'unknown';
+}

package/lib/migration.d.ts

@@ -1,6 +1,5 @@
-import type { ProjectSchema, AnyProjectSchema, ProjectSchemaV1_0_0, ProjectSchemaV3_0_0, ProjectSchemaV3_1_0, ProjectSchemaV3_2_0, ProjectSchemaV3_3_0, ProjectSchemaV3_4_0, ProjectSchemaV3_5_0, ProjectSchemaV3_5_1, ProjectSchemaV3_6_0, ProjectSchemaV3_7_0, ProjectSchemaV3_8_0, ProjectSchemaV3_9_0, ProjectSchemaV3_10_0, PropertySchema, ContentTypeV1_0_0, ContentSchemaV1_0_0, Relationship, FormConfig, Workflow, Shape, ShapeMapV3_0_0, ContentSchemaV3_0_0 } from './project-schema';
-import type { EncryptFn } from './services';
-import { SafeDecryptFn } from './services';
+import type { ProjectSchema, AnyProjectSchema, ProjectSchemaV1_0_0, ProjectSchemaV3_0_0, ProjectSchemaV3_1_0, ProjectSchemaV3_2_0, ProjectSchemaV3_3_0, ProjectSchemaV3_4_0, ProjectSchemaV3_5_0, ProjectSchemaV3_5_1, ProjectSchemaV3_6_0, ProjectSchemaV3_7_0, ProjectSchemaV3_8_0, ProjectSchemaV3_9_0, ProjectSchemaV3_10_0, ProjectSchemaV3_11_0, PropertySchema, ContentTypeV1_0_0, ContentSchemaV1_0_0, Relationship, FormConfig, Workflow, Shape, ShapeMapV3_0_0, ContentSchemaV3_0_0 } from './project-schema';
+import type { EncryptFn, SafeDecryptFn } from './services';
 export declare const listTypePrefix = "PaginatedList";
 interface ConversionParams {
     shapeName: string;
@@ -44,6 +43,7 @@ export declare function migrateToV3_7(projectSchema: ProjectSchemaV3_6_0): Proje
 export declare function migrateToV3_8(projectSchema: ProjectSchemaV3_7_0): ProjectSchemaV3_8_0;
 export declare function migrateToV3_9_0(projectSchema: ProjectSchemaV3_8_0): ProjectSchemaV3_9_0;
 export declare function migrateToV3_10(projectSchema: ProjectSchemaV3_9_0): ProjectSchemaV3_10_0;
+export declare function migrateToV3_11_0({ decryptFn, encryptFn }: ProjectSchemaMigrationContext, projectSchema: ProjectSchemaV3_10_0): ProjectSchemaV3_11_0;
 export declare function migrateToLatestProjectSchema(context: ProjectSchemaMigrationContext, projectSchema: AnyProjectSchema): Promise<ProjectSchema>;
 export declare function normalizeSchemaVersion(version?: string): string;
 export declare function isV1Like(schema: {

package/lib/migration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"migration.d.ts","sourceRoot":"","sources":["../../src/migration.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"migration.d.ts","sourceRoot":"","sources":["../../src/migration.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EACb,gBAAgB,EAChB,mBAAmB,EACnB,mBAAmB,EACnB,mBAAmB,EACnB,mBAAmB,EACnB,mBAAmB,EACnB,mBAAmB,EACnB,mBAAmB,EACnB,mBAAmB,EACnB,mBAAmB,EACnB,mBAAmB,EACnB,mBAAmB,EACnB,mBAAmB,EACnB,oBAAoB,EACpB,oBAAoB,EASpB,cAAc,EACd,iBAAiB,EAEjB,mBAAmB,EACnB,YAAY,EACZ,UAAU,EACV,QAAQ,EAER,KAAK,EACL,cAAc,EAOd,mBAAmB,EAWpB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAC,SAAS,EAAE,aAAa,EAAC,MAAM,YAAY,CAAC;AAmCzD,eAAO,MAAM,cAAc,kBAAkB,CAAC;AAQ9C,UAAU,gBAAgB;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,mBAAmB,CAAC;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,YAAY,CAAC,EAAE,mBAAmB,CAAC;CACpC;AAED,MAAM,WAAW,mBAAoB,SAAQ,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,QAAQ,GAAG,OAAO,GAAG,WAAW,CAAC;IACzG,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,GAAG,IAAI,CAAC,CAAC;IACtC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI,CAAC,CAAC;IAC1C,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,GAAG,IAAI,CAAC,CAAC;IAC5C,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,aAAK,iBAAiB,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;AAE/C,MAAM,WAAW,6BAA6B;IAC5C,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,SAAS,EAAE,SAAS,CAAC;IACrB,SAAS,EAAE,aAAa,CAAC;CAC1B;AAED,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,YAAY,GAAG,cAAc,CAiBhF;AAUD,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,gBAAgB,GAAG;IAClE,MAAM,EAAE,mBAAmB,CAAC;IAC5B,aAAa,CAAC,EAAE,cAAc,CAAC;CAChC,CA0HA;AAcD,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,GAAG,cAAc,CA2BxG;AAMD,wBAAgB,WAAW,CAAC,aAAa,EAAE,mBAAmB,GAAG,mBAAmB,CAuBnF;AAED,wBAAsB,aAAa,CACjC,OAAO,EAAE,6BAA6B,EACtC,aAAa,EAAE,mBAAmB,GACjC,OAAO,CAAC,mBAAmB,CAAC,CAgC9B;AAED,wBAAgB,aAAa,CAAC,aAAa,EAAE,mBAAmB,GAAG,mBAAmB,CAQrF;AAED,wBAAsB,aAAa,CACjC,OAAO,EAAE,6BAA6B,EACtC,aAAa,EAAE,mBAAmB,GACjC,OAAO,CAAC,mBAAmB,CAAC,CAY9B;AAED,wBAAgB,aAAa,CAAC,aAAa,EAAE,mBAAmB,GAAG,mBAAmB,CAQrF;AAED,wBAAgB,aAAa,CAAC,aAAa,EAAE,mBAAmB,GAAG,mBAAmB,CAQrF;AAED,wBAAgB,eAAe,CAAC,aAAa,EAAE,mBAAmB,GAAG,mBAAmB,CAQvF;AAED,wBAAgB,aAAa,CAAC,aAAa,EAAE,mBAAmB,GAAG,mBAAmB,CAQrF;AAED,wBAAgB,aAAa,CAAC,aAAa,EAAE,mBAAmB,GAAG,mBAAmB,CAQrF;AAED,wBAAgB,aAAa,CAAC,aAAa,EAAE,mBAAmB,GAAG,mBAAmB,CAQrF;AAED,wBAAgB,eAAe,CAAC,aAAa,EAAE,mBAAmB,GAAG,mBAAmB,CAqEvF;AAsCD,wBAAgB,cAAc,CAAC,aAAa,EAAE,mBAAmB,GAAG,oBAAoB,CAUvF;AAED,wBAAgB,gBAAgB,CAC9B,EAAC,SAAS,EAAE,SAAS,EAAC,EAAE,6BAA6B,EACrD,aAAa,EAAE,oBAAoB,GAClC,oBAAoB,CA6FtB;AAED,wBAAsB,4BAA4B,CAChD,OAAO,EAAE,6BAA6B,EACtC,aAAa,EAAE,gBAAgB,GAC9B,OAAO,CAAC,aAAa,CAAC,CA0DxB;AAED,wBAAgB,sBAAsB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAE/D;AAED,wBAAgB,QAAQ,CAAC,MAAM,EAAE;IAAC,aAAa,CAAC,EAAE,MAAM,CAAA;CAAC,GAAG,OAAO,CAElE;AAED,wBAAgB,IAAI,CAAC,MAAM,EAAE,gBAAgB,GAAG,MAAM,IAAI,mBAAmB,CAE5E;AAED,wBAAgB,QAAQ,CAAC,MAAM,EAAE;IAAC,aAAa,CAAC,EAAE,MAAM,CAAA;CAAC,GAAG,OAAO,CAElE;AAED,wBAAgB,IAAI,CAAC,MAAM,EAAE,gBAAgB,GAAG,MAAM,IAAI,mBAAmB,CAE5E;AAED,wBAAsB,YAAY,CAChC,OAAO,EAAE,6BAA6B,EACtC,MAAM,CAAC,EAAE,gBAAgB,GACxB,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAMpC"}

package/lib/migration.js

@@ -16,6 +16,7 @@ exports.migrateToLatestProjectSchema = migrateToLatestProjectSchema;
 exports.migrateToV3 = migrateToV3;
 exports.migrateToV3_1 = migrateToV3_1;
 exports.migrateToV3_10 = migrateToV3_10;
+exports.migrateToV3_11_0 = migrateToV3_11_0;
 exports.migrateToV3_2 = migrateToV3_2;
 exports.migrateToV3_3 = migrateToV3_3;
 exports.migrateToV3_4 = migrateToV3_4;
@@ -33,16 +34,20 @@ var _forEach = _interopRequireDefault(require("lodash/forEach"));
 
 var _pick = _interopRequireDefault(require("lodash/pick"));
 
+var _mapValues = _interopRequireDefault(require("lodash/mapValues"));
+
+var _isObject = _interopRequireDefault(require("lodash/isObject"));
+
+var _fromPairs = _interopRequireDefault(require("lodash/fromPairs"));
+
 var _util = require("@takeshape/util");
 
 var _schemaUtil = require("./schema-util");
 
-var _services = require("./services");
+var _migrationUtils = require("./migration-utils");
 
 var _utils = require("./types/utils");
 
-var _mapValues = _interopRequireDefault(require("lodash/mapValues"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const listTypePrefix = 'PaginatedList';
@@ -321,12 +326,12 @@ async function migrateToV3_1(context, projectSchema) {
   if (projectSchema.services) {
     services = await (0, _pReduce.default)(Object.entries(projectSchema.services), async (serviceMap, [serviceKey, serviceConfig]) => {
       const auth = serviceConfig.auth && decryptFn(serviceConfig.auth);
-      const updatedServiceConfig = (0, _services.updateServiceConfigV3ToV3_1)({ ...serviceConfig,
+      const updatedServiceConfig = (0, _migrationUtils.updateServiceConfigV3ToV3_1)({ ...serviceConfig,
         auth
       }, serviceKey);
       const authentication = updatedServiceConfig === null || updatedServiceConfig === void 0 ? void 0 : updatedServiceConfig.authentication;
       serviceMap[serviceKey] = { ...updatedServiceConfig,
-        authentication: (0, _utils.isServiceAuthentication)(authentication) ? encryptFn(authentication) : authentication
+        authentication: authentication && (0, _isObject.default)(authentication) ? encryptFn(authentication) : authentication
       };
       return serviceMap;
     }, {});
@@ -549,6 +554,102 @@ function migrateToV3_10(projectSchema) {
   };
 }
 
+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: (0, _fromPairs.default)(migratedServices),
+    schemaVersion: '3.11.0'
+  };
+}
+
 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');
@@ -602,6 +703,10 @@ async function migrateToLatestProjectSchema(context, projectSchema) {
     projectSchema = migrateToV3_10(projectSchema);
   }
 
+  if ((0, _utils.isProjectSchemaV3_10)(projectSchema)) {
+    projectSchema = migrateToV3_11_0(context, projectSchema);
+  }
+
   return projectSchema;
 }
 

package/lib/mocks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mocks.d.ts","sourceRoot":"","sources":["../../src/mocks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,aAAa,EAAE,aAAa,EAAE,mBAAmB,EAAC,MAAM,kBAAkB,CAAC;AACxF,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AAI9C;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,GAAE,OAAO,CAAC,aAAa,CAAM,GAAG,aAAa,CAKtG;AAED;;GAEG;AACH,wBAAgB,4BAA4B,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,GAAE,OAAO,CAAC,aAAa,CAAM,GAAG,aAAa,CAKlH;AAED,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,UAAU,EAAE,aAAa,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,GAAG,aAAa,CAgBrH;AAED,wBAAgB,6BAA6B,CAC3C,UAAU,EAAE,UAAU,EACtB,aAAa,CAAC,EAAE,OAAO,CAAC,mBAAmB,CAAC,GAC3C,mBAAmB,CAMrB"}
+{"version":3,"file":"mocks.d.ts","sourceRoot":"","sources":["../../src/mocks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,aAAa,EAAE,aAAa,EAAE,mBAAmB,EAAC,MAAM,kBAAkB,CAAC;AACxF,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AAI9C;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,GAAE,OAAO,CAAC,aAAa,CAAM,GAAG,aAAa,CAKtG;AAED;;GAEG;AACH,wBAAgB,4BAA4B,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,GAAE,OAAO,CAAC,aAAa,CAAM,GAAG,aAAa,CAKlH;AAED,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,UAAU,EAAE,aAAa,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,GAAG,aAAa,CAiBrH;AAED,wBAAgB,6BAA6B,CAC3C,UAAU,EAAE,UAAU,EACtB,aAAa,CAAC,EAAE,OAAO,CAAC,mBAAmB,CAAC,GAC3C,mBAAmB,CAMrB"}

package/lib/mocks.js

@@ -40,6 +40,7 @@ function createMockServiceConfig(serviceKey, serviceConfig) {
     namespace: (0, _util.pascalCase)(serviceKey),
     authenticationType: 'bearer',
     authentication: {
+      type: 'bearer',
       token: 'abc123'
     },
     options: {

package/lib/project-schema/index.d.ts

@@ -1,5 +1,6 @@
 export * from './latest';
 export * from './v4.0.0';
+export * from './v3.11.0';
 export * from './v3.10.0';
 export * from './v3.9.0';
 export * from './v3.8.0';
@@ -14,6 +15,7 @@ export * from './v3.1.0';
 export * from './v3.0.0';
 export * from './v1.0.0';
 import { ProjectSchemaV4_0_0 } from './v4.0.0';
+import { ProjectSchemaV3_11_0 } from './v3.11.0';
 import { ProjectSchemaV3_10_0 } from './v3.10.0';
 import { ProjectSchemaV3_9_0 } from './v3.9.0';
 import { ProjectSchemaV3_8_0 } from './v3.8.0';
@@ -28,5 +30,5 @@ import { ProjectSchemaV3_1_0 } from './v3.1.0';
 import { ProjectSchemaV3_0_0 } from './v3.0.0';
 import { ProjectSchemaV1_0_0 } from './v1.0.0';
 import { ProjectSchema } from './latest';
-export declare type AnyProjectSchema = ProjectSchemaV4_0_0 | ProjectSchemaV3_10_0 | ProjectSchemaV3_9_0 | ProjectSchemaV3_8_0 | ProjectSchemaV3_7_0 | ProjectSchemaV3_6_0 | ProjectSchemaV3_5_1 | ProjectSchemaV3_5_0 | ProjectSchemaV3_4_0 | ProjectSchemaV3_3_0 | ProjectSchemaV3_2_0 | ProjectSchemaV3_1_0 | ProjectSchemaV3_0_0 | ProjectSchemaV1_0_0 | ProjectSchema;
+export declare type AnyProjectSchema = ProjectSchemaV4_0_0 | ProjectSchemaV3_11_0 | ProjectSchemaV3_10_0 | ProjectSchemaV3_9_0 | ProjectSchemaV3_8_0 | ProjectSchemaV3_7_0 | ProjectSchemaV3_6_0 | ProjectSchemaV3_5_1 | ProjectSchemaV3_5_0 | ProjectSchemaV3_4_0 | ProjectSchemaV3_3_0 | ProjectSchemaV3_2_0 | ProjectSchemaV3_1_0 | ProjectSchemaV3_0_0 | ProjectSchemaV1_0_0 | ProjectSchema;
 //# sourceMappingURL=index.d.ts.map

package/lib/project-schema/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/project-schema/index.ts"],"names":[],"mappings":"AACA,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC;AAC1B,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,OAAO,EAAC,mBAAmB,EAAC,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAC,oBAAoB,EAAC,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAC,mBAAmB,EAAC,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAC,mBAAmB,EAAC,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAC,mBAAmB,EAAC,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAC,mBAAmB,EAAC,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAC,mBAAmB,EAAC,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAC,mBAAmB,EAAC,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAC,mBAAmB,EAAC,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAC,mBAAmB,EAAC,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAC,mBAAmB,EAAC,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAC,mBAAmB,EAAC,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAC,mBAAmB,EAAC,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAC,mBAAmB,EAAC,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAC,aAAa,EAAC,MAAM,UAAU,CAAC;AACvC,oBAAY,gBAAgB,GACxB,mBAAmB,GACnB,oBAAoB,GACpB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/project-schema/index.ts"],"names":[],"mappings":"AACA,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,OAAO,EAAC,mBAAmB,EAAC,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAC,oBAAoB,EAAC,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAC,oBAAoB,EAAC,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAC,mBAAmB,EAAC,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAC,mBAAmB,EAAC,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAC,mBAAmB,EAAC,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAC,mBAAmB,EAAC,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAC,mBAAmB,EAAC,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAC,mBAAmB,EAAC,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAC,mBAAmB,EAAC,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAC,mBAAmB,EAAC,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAC,mBAAmB,EAAC,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAC,mBAAmB,EAAC,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAC,mBAAmB,EAAC,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAC,mBAAmB,EAAC,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAC,aAAa,EAAC,MAAM,UAAU,CAAC;AACvC,oBAAY,gBAAgB,GACxB,mBAAmB,GACnB,oBAAoB,GACpB,oBAAoB,GACpB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,aAAa,CAAC"}

package/lib/project-schema/index.js

@@ -30,7 +30,7 @@ Object.keys(_v).forEach(function (key) {
   });
 });
 
-var _v2 = require("./v3.10.0");
+var _v2 = require("./v3.11.0");
 
 Object.keys(_v2).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -43,7 +43,7 @@ Object.keys(_v2).forEach(function (key) {
   });
 });
 
-var _v3 = require("./v3.9.0");
+var _v3 = require("./v3.10.0");
 
 Object.keys(_v3).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -56,7 +56,7 @@ Object.keys(_v3).forEach(function (key) {
   });
 });
 
-var _v4 = require("./v3.8.0");
+var _v4 = require("./v3.9.0");
 
 Object.keys(_v4).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -69,7 +69,7 @@ Object.keys(_v4).forEach(function (key) {
   });
 });
 
-var _v5 = require("./v3.7.0");
+var _v5 = require("./v3.8.0");
 
 Object.keys(_v5).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -82,7 +82,7 @@ Object.keys(_v5).forEach(function (key) {
   });
 });
 
-var _v6 = require("./v3.6.0");
+var _v6 = require("./v3.7.0");
 
 Object.keys(_v6).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -95,7 +95,7 @@ Object.keys(_v6).forEach(function (key) {
   });
 });
 
-var _v7 = require("./v3.5.1");
+var _v7 = require("./v3.6.0");
 
 Object.keys(_v7).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -108,7 +108,7 @@ Object.keys(_v7).forEach(function (key) {
   });
 });
 
-var _v8 = require("./v3.5.0");
+var _v8 = require("./v3.5.1");
 
 Object.keys(_v8).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -121,7 +121,7 @@ Object.keys(_v8).forEach(function (key) {
   });
 });
 
-var _v9 = require("./v3.4.0");
+var _v9 = require("./v3.5.0");
 
 Object.keys(_v9).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -134,7 +134,7 @@ Object.keys(_v9).forEach(function (key) {
   });
 });
 
-var _v10 = require("./v3.3.0");
+var _v10 = require("./v3.4.0");
 
 Object.keys(_v10).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -147,7 +147,7 @@ Object.keys(_v10).forEach(function (key) {
   });
 });
 
-var _v11 = require("./v3.2.0");
+var _v11 = require("./v3.3.0");
 
 Object.keys(_v11).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -160,7 +160,7 @@ Object.keys(_v11).forEach(function (key) {
   });
 });
 
-var _v12 = require("./v3.1.0");
+var _v12 = require("./v3.2.0");
 
 Object.keys(_v12).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -173,7 +173,7 @@ Object.keys(_v12).forEach(function (key) {
   });
 });
 
-var _v13 = require("./v3.0.0");
+var _v13 = require("./v3.1.0");
 
 Object.keys(_v13).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -186,7 +186,7 @@ Object.keys(_v13).forEach(function (key) {
   });
 });
 
-var _v14 = require("./v1.0.0");
+var _v14 = require("./v3.0.0");
 
 Object.keys(_v14).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -197,4 +197,17 @@ Object.keys(_v14).forEach(function (key) {
       return _v14[key];
     }
   });
+});
+
+var _v15 = require("./v1.0.0");
+
+Object.keys(_v15).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _v15[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _v15[key];
+    }
+  });
 });