@takeshape/schema 8.32.0 → 8.33.0

package/lib/types/utils.js

@@ -13,6 +13,7 @@ exports.isBasicAuthentication = isBasicAuthentication;
 exports.isBasicResolver = isBasicResolver;
 exports.isBearerAuthentication = isBearerAuthentication;
 exports.isComposeResolver = isComposeResolver;
+exports.isCustomAuthentication = isCustomAuthentication;
 exports.isDirectiveConfig = isDirectiveConfig;
 exports.isDirectiveMappingArray = isDirectiveMappingArray;
 exports.isDirectiveMappingMap = isDirectiveMappingMap;
@@ -22,6 +23,7 @@ exports.isGraphQLServiceConfig = isGraphQLServiceConfig;
 exports.isGraphqlResolver = isGraphqlResolver;
 exports.isLatestProjectSchema = void 0;
 exports.isOAuth2Authentication = isOAuth2Authentication;
+exports.isOAuth2BearerAuthentication = isOAuth2BearerAuthentication;
 exports.isObjectSchema = isObjectSchema;
 exports.isOneOfSchema = isOneOfSchema;
 exports.isOpenAPIServiceConfig = isOpenAPIServiceConfig;
@@ -34,7 +36,7 @@ exports.isParameterSerializeContentOptions = isParameterSerializeContentOptions;
 exports.isParameterSerializeStyleForPathParams = isParameterSerializeStyleForPathParams;
 exports.isParameterSerializeStyleForSearchParams = isParameterSerializeStyleForSearchParams;
 exports.isParameterSerializeStyleOptions = isParameterSerializeStyleOptions;
-exports.isProjectSchemaV3_9 = exports.isProjectSchemaV3_8 = exports.isProjectSchemaV3_7 = exports.isProjectSchemaV3_6 = exports.isProjectSchemaV3_5_1 = exports.isProjectSchemaV3_5 = exports.isProjectSchemaV3_4 = exports.isProjectSchemaV3_3 = exports.isProjectSchemaV3_2 = exports.isProjectSchemaV3_10 = exports.isProjectSchemaV3_1 = exports.isProjectSchemaV3 = exports.isProjectSchemaV1 = void 0;
+exports.isProjectSchemaV3_9 = exports.isProjectSchemaV3_8 = exports.isProjectSchemaV3_7 = exports.isProjectSchemaV3_6 = exports.isProjectSchemaV3_5_1 = exports.isProjectSchemaV3_5 = exports.isProjectSchemaV3_4 = exports.isProjectSchemaV3_3 = exports.isProjectSchemaV3_2 = exports.isProjectSchemaV3_11 = exports.isProjectSchemaV3_10 = exports.isProjectSchemaV3_1 = exports.isProjectSchemaV3 = exports.isProjectSchemaV1 = void 0;
 exports.isProjectSchemaWithServices = isProjectSchemaWithServices;
 exports.isRESTServiceConfig = isRESTServiceConfig;
 exports.isRefSchema = isRefSchema;
@@ -150,6 +152,8 @@ const isProjectSchemaV3_9 = createVersionPredicate('3.9.0');
 exports.isProjectSchemaV3_9 = isProjectSchemaV3_9;
 const isProjectSchemaV3_10 = createVersionPredicate('3.10.0');
 exports.isProjectSchemaV3_10 = isProjectSchemaV3_10;
+const isProjectSchemaV3_11 = createVersionPredicate('3.11.0');
+exports.isProjectSchemaV3_11 = isProjectSchemaV3_11;
 const isLatestProjectSchema = createVersionPredicate(_schemas.CURRENT_SCHEMA_VERSION);
 exports.isLatestProjectSchema = isLatestProjectSchema;
 
@@ -172,7 +176,7 @@ function isAnyProjectSchema(value) {
   }
 
   const maybeSchema = value;
-  return (0, _util.isObject)(value) && (0, _isString.default)(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));
+  return (0, _util.isObject)(value) && (0, _isString.default)(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));
 }
 
 function isProjectSchemaWithServices(schema) {
@@ -352,33 +356,41 @@ function isEncryptedServiceConfig(maybeConfig) {
 }
 
 function isServiceConfigWithOAuth2Authentication(maybeServiceConfig) {
-  return isAnyServiceConfig(maybeServiceConfig) && maybeServiceConfig.authenticationType === 'oauth2' && isOAuth2Authentication(maybeServiceConfig.authentication);
+  return isAnyServiceConfig(maybeServiceConfig) && isServiceAuthentication(maybeServiceConfig.authentication) && isOAuth2Authentication(maybeServiceConfig.authentication);
 }
 
 function isServiceConfigWithCustomAuthentication(maybeServiceConfig) {
-  return isAnyServiceConfig(maybeServiceConfig) && maybeServiceConfig.authenticationType === 'custom' && isServiceAuthentication(maybeServiceConfig.authentication);
+  return isAnyServiceConfig(maybeServiceConfig) && isServiceAuthentication(maybeServiceConfig.authentication) && isCustomAuthentication(maybeServiceConfig.authentication);
 }
 /** Authentication Utils **/
 
 
 function isServiceAuthentication(maybeAuthentication) {
-  return maybeAuthentication && (0, _util.isObject)(maybeAuthentication);
+  return maybeAuthentication === null || maybeAuthentication === void 0 ? void 0 : maybeAuthentication.type;
 }
 
-function isBearerAuthentication(maybeAuthentication) {
-  return isServiceAuthentication(maybeAuthentication) && (0, _isString.default)(maybeAuthentication.token);
+function isBearerAuthentication(authentication) {
+  return (authentication === null || authentication === void 0 ? void 0 : authentication.type) === 'bearer';
 }
 
-function isBasicAuthentication(maybeAuthentication) {
-  return isServiceAuthentication(maybeAuthentication) && ((0, _isString.default)(maybeAuthentication.username) || (0, _isString.default)(maybeAuthentication.password));
+function isBasicAuthentication(authentication) {
+  return (authentication === null || authentication === void 0 ? void 0 : authentication.type) === 'basic';
 }
 
-function isSearchParamsAuthentication(maybeAuthentication) {
-  return (0, _isArray.default)(maybeAuthentication) && maybeAuthentication.every(value => (0, _util.isObject)(value) && Object.entries(value).every(([k, v]) => (k === 'name' || k === 'value') && (0, _isString.default)(v)));
+function isSearchParamsAuthentication(authentication) {
+  return (authentication === null || authentication === void 0 ? void 0 : authentication.type) === 'searchParams';
 }
 
-function isOAuth2Authentication(maybeAuthentication) {
-  return isServiceAuthentication(maybeAuthentication) && (0, _isString.default)(maybeAuthentication.clientId);
+function isOAuth2Authentication(authentication) {
+  return (authentication === null || authentication === void 0 ? void 0 : authentication.type) === 'oauth2';
+}
+
+function isOAuth2BearerAuthentication(authentication) {
+  return (authentication === null || authentication === void 0 ? void 0 : authentication.type) === 'oauth2Bearer';
+}
+
+function isCustomAuthentication(authentication) {
+  return (authentication === null || authentication === void 0 ? void 0 : authentication.type) === 'custom';
 }
 /** Miscellaneous Utils **/
 

package/lib/validate.d.ts

@@ -1,7 +1,7 @@
+import type { ErrorObject } from 'ajv';
 import type { RoleImport, RoleInput } from './auth-schemas';
 import type { AnyProjectSchema, ProjectSchema, LayerSchemaV4_0_0 } from './project-schema';
 import { SchemaValidationErrorItem } from '@takeshape/errors';
-import { ErrorObject } from 'ajv';
 export declare type SchemaValidationResult = {
     valid: true;
     schema: AnyProjectSchema;

package/lib/validate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../src/validate.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,UAAU,EAAE,SAAS,EAAC,MAAM,gBAAgB,CAAC;AAE1D,OAAO,KAAK,EAEV,gBAAgB,EAChB,aAAa,EASb,iBAAiB,EAElB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAwB,yBAAyB,EAAC,MAAM,mBAAmB,CAAC;AAQnF,OAAO,EAAC,WAAW,EAAC,MAAM,KAAK,CAAC;AAqahC,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;AA4ID;;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,EAElB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAwB,yBAAyB,EAAC,MAAM,mBAAmB,CAAC;AA4anF,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;AA4ID;;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/package.json

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