@takeshape/schema 9.84.0 → 9.86.2

package/dist/validate.d.ts

@@ -3,6 +3,7 @@ import type { RoleImport, RoleInput } from './auth-schemas';
 import type { ProjectSchemaImport, LayerState } from './types/types';
 import type { AnyProjectSchemaJSON, ProjectSchemaJSON } from './project-schema';
 import { SchemaValidationErrorItem } from '@takeshape/errors';
+import { Entitlements } from '@takeshape/util';
 import { SetRequired } from 'type-fest';
 export type SchemaValidationResult = {
     valid: true;
@@ -28,6 +29,7 @@ export type ResolveLayer = (layerId: string) => Promise<LayerState>;
 export interface ValidateContext extends ValidateSyntaxOptions {
     resolveLayer?: ResolveLayer;
     allowDisconnectedLayers?: boolean;
+    entitlements: Entitlements;
 }
 export type ValidateReferencesContext = SetRequired<ValidateContext, 'resolveLayer'>;
 export declare function validateSchemaSyntax(obj: unknown, options?: ValidateSyntaxOptions): SchemaValidationResult;

package/dist/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;AAC1D,OAAO,KAAK,EAAC,mBAAmB,EAAE,UAAU,EAAc,MAAM,eAAe,CAAC;AAChF,OAAO,KAAK,EACV,oBAAoB,EACpB,iBAAiB,EAYlB,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EAAwB,yBAAyB,EAAC,MAAM,mBAAmB,CAAC;AAuCnF,OAAO,EAAC,WAAW,EAAC,MAAM,WAAW,CAAC;AA41BtC,MAAM,MAAM,sBAAsB,GAC9B;IAAC,KAAK,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,oBAAoB,CAAC;IAAC,MAAM,EAAE,SAAS,CAAA;CAAC,GAC9D;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,qBAAqB,KAAK,sBAAsB,CAAC;CACxF;AACD,MAAM,WAAW,qBAAqB;IACpC,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC9B,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B;AAED,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;AAEpE,MAAM,WAAW,eAAgB,SAAQ,qBAAqB;IAC5D,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC;AAED,MAAM,MAAM,yBAAyB,GAAG,WAAW,CAAC,eAAe,EAAE,cAAc,CAAC,CAAC;AAmHrF,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,GAAE,qBAA0B,GAAG,sBAAsB,CAW9G;AAED;;GAEG;AACH,wBAAsB,cAAc,CAAC,OAAO,EAAE,eAAe,EAAE,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,sBAAsB,CAAC,CA+B5G;AAED,wBAAgB,6BAA6B,CAAC,GAAG,EAAE,OAAO,GAAG,iBAAiB,CAgB7E;AAgBD;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,cAAc,EAAE,OAAO,GAAG,SAAS,CAQpE;AAgBD;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,OAAO,GAAG,UAAU,CAQrE;AAED,MAAM,MAAM,mCAAmC,GAC3C;IAAC,KAAK,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,mBAAmB,CAAC;IAAC,MAAM,EAAE,SAAS,CAAA;CAAC,GAC7D;IAAC,KAAK,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,SAAS,CAAC;IAAC,MAAM,EAAE,yBAAyB,EAAE,CAAA;CAAC,CAAC;AAE3E;;GAEG;AACH,wBAAgB,2BAA2B,CAAC,WAAW,EAAE,OAAO,GAAG,mCAAmC,CAIrG;AAED;;;;;GAKG;AACH,wBAAgB,8BAA8B,CAAC,WAAW,EAAE,OAAO,GAAG,mBAAmB,CAQxF"}
+{"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;AAC1D,OAAO,KAAK,EAAC,mBAAmB,EAAE,UAAU,EAAc,MAAM,eAAe,CAAC;AAChF,OAAO,KAAK,EACV,oBAAoB,EACpB,iBAAiB,EAYlB,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EAAwB,yBAAyB,EAAC,MAAM,mBAAmB,CAAC;AA4BnF,OAAO,EAEL,YAAY,EAKb,MAAM,iBAAiB,CAAC;AAWzB,OAAO,EAAC,WAAW,EAAC,MAAM,WAAW,CAAC;AA62BtC,MAAM,MAAM,sBAAsB,GAC9B;IAAC,KAAK,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,oBAAoB,CAAC;IAAC,MAAM,EAAE,SAAS,CAAA;CAAC,GAC9D;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,qBAAqB,KAAK,sBAAsB,CAAC;CACxF;AACD,MAAM,WAAW,qBAAqB;IACpC,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC9B,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B;AAED,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;AAEpE,MAAM,WAAW,eAAgB,SAAQ,qBAAqB;IAC5D,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,YAAY,EAAE,YAAY,CAAC;CAC5B;AAED,MAAM,MAAM,yBAAyB,GAAG,WAAW,CAAC,eAAe,EAAE,cAAc,CAAC,CAAC;AAmHrF,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,GAAE,qBAA0B,GAAG,sBAAsB,CAW9G;AAED;;GAEG;AACH,wBAAsB,cAAc,CAAC,OAAO,EAAE,eAAe,EAAE,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAgC5G;AAED,wBAAgB,6BAA6B,CAAC,GAAG,EAAE,OAAO,GAAG,iBAAiB,CAgB7E;AAgBD;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,cAAc,EAAE,OAAO,GAAG,SAAS,CAQpE;AAgBD;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,OAAO,GAAG,UAAU,CAQrE;AAED,MAAM,MAAM,mCAAmC,GAC3C;IAAC,KAAK,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,mBAAmB,CAAC;IAAC,MAAM,EAAE,SAAS,CAAA;CAAC,GAC7D;IAAC,KAAK,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,SAAS,CAAC;IAAC,MAAM,EAAE,yBAAyB,EAAE,CAAA;CAAC,CAAC;AAE3E;;GAEG;AACH,wBAAgB,2BAA2B,CAAC,WAAW,EAAE,OAAO,GAAG,mCAAmC,CAIrG;AAED;;;;;GAKG;AACH,wBAAgB,8BAA8B,CAAC,WAAW,EAAE,OAAO,GAAG,mBAAmB,CAQxF"}

package/dist/validate.js

@@ -362,7 +362,8 @@ async function validateShapeJoins(context, projectSchema) {
   }
   return (0, _lodash.flatten)(await Promise.all(promises));
 }
-function validateShapeLoaders(projectSchema, shape) {
+function validateShapeLoaders(context, projectSchema, shape) {
+  var _shape$cache2;
   const errors = [];
   if (shape.loaders) {
     const getNamespace = (0, _refs.createGetNamespace)(projectSchema);
@@ -393,6 +394,20 @@ function validateShapeLoaders(projectSchema, shape) {
       }
     }
   }
+  if ((_shape$cache2 = shape.cache) !== null && _shape$cache2 !== void 0 && _shape$cache2.triggers) {
+    var _context$entitlements;
+    const min = ((_context$entitlements = context.entitlements) === null || _context$entitlements === void 0 ? void 0 : _context$entitlements.minScheduleTriggerInterval) ?? _util.DEFAULT_MIN_SCHEDULE_TRIGGER_INTERVAL;
+    for (let i = 0; i < shape.cache.triggers.length; i++) {
+      const trigger = shape.cache.triggers[i];
+      if (trigger.type === 'schedule' && trigger.interval < min) {
+        errors.push({
+          path: ['shapes', shape.name, 'cache', 'triggers', i, 'interval'],
+          type: 'entitlement',
+          message: `Trigger interval ${trigger.interval} is below minimum ${min}`
+        });
+      }
+    }
+  }
   return errors;
 }
 function visitProperties(projectSchema, callback) {
@@ -402,13 +417,13 @@ function visitProperties(projectSchema, callback) {
     callback(property, propertyPath.slice(3, -2).split(`']['`));
   }, undefined);
 }
-function validateIndexedShapes(projectSchema) {
+function validateIndexedShapes(context, projectSchema) {
   const errors = [];
   const {
     shapes
   } = projectSchema;
   for (const shape of Object.values(shapes)) {
-    const newErrors = validateShapeLoaders(projectSchema, shape);
+    const newErrors = validateShapeLoaders(context, projectSchema, shape);
     if (newErrors.length) {
       errors.push(...newErrors);
     }
@@ -787,7 +802,7 @@ function formatValidationResult(context, errors, schema) {
 }
 function validateSyntax(context, schema) {
   let errors = [];
-  errors = errors.concat(checkShapeNames(schema.shapes)).concat(checkShapeIds(schema.shapes)).concat(validateWorkflows(schema)).concat(validateLocalQueryConfigs(schema)).concat(validateLocalRefs(schema)).concat(validateLocalShapeJoins(schema)).concat(validateDirectives(schema)).concat(validateLocales(schema)).concat(checkWorkflowStepNames(schema.workflows)).concat(checkWorkflowStepKeys(schema.workflows)).concat(validateOneOfs(schema)).concat(validateIndexedShapes(schema)).concat(validateInterfaces(schema)).concat(validateInterfaceImplementations(schema));
+  errors = errors.concat(checkShapeNames(schema.shapes)).concat(checkShapeIds(schema.shapes)).concat(validateWorkflows(schema)).concat(validateLocalQueryConfigs(schema)).concat(validateLocalRefs(schema)).concat(validateLocalShapeJoins(schema)).concat(validateDirectives(schema)).concat(validateLocales(schema)).concat(checkWorkflowStepNames(schema.workflows)).concat(checkWorkflowStepKeys(schema.workflows)).concat(validateOneOfs(schema)).concat(validateIndexedShapes(context, schema)).concat(validateInterfaces(schema)).concat(validateInterfaceImplementations(schema));
   return formatValidationResult(context, errors, schema);
 }
 async function validateReferences(context, schema) {

package/es/validate.js

@@ -18,7 +18,7 @@ import { refItemToShapeName, getRefShapeName, parsePropertyRef, propertyRefItemT
 import { scalars } from './scalars';
 import { isUnionSchema } from './unions';
 import { isEnumLikeSchema } from './enum';
-import { ensureArray, isIntegerLike, isRecord, value } from '@takeshape/util';
+import { DEFAULT_MIN_SCHEDULE_TRIGGER_INTERVAL, ensureArray, isIntegerLike, isRecord, value } from '@takeshape/util';
 import uniqBy from 'lodash/uniqBy';
 import initial from 'lodash/initial';
 import last from 'lodash/last';
@@ -348,7 +348,8 @@ async function validateShapeJoins(context, projectSchema) {
   }
   return flatten(await Promise.all(promises));
 }
-function validateShapeLoaders(projectSchema, shape) {
+function validateShapeLoaders(context, projectSchema, shape) {
+  var _shape$cache2;
   const errors = [];
   if (shape.loaders) {
     const getNamespace = createGetNamespace(projectSchema);
@@ -379,6 +380,20 @@ function validateShapeLoaders(projectSchema, shape) {
       }
     }
   }
+  if ((_shape$cache2 = shape.cache) !== null && _shape$cache2 !== void 0 && _shape$cache2.triggers) {
+    var _context$entitlements;
+    const min = ((_context$entitlements = context.entitlements) === null || _context$entitlements === void 0 ? void 0 : _context$entitlements.minScheduleTriggerInterval) ?? DEFAULT_MIN_SCHEDULE_TRIGGER_INTERVAL;
+    for (let i = 0; i < shape.cache.triggers.length; i++) {
+      const trigger = shape.cache.triggers[i];
+      if (trigger.type === 'schedule' && trigger.interval < min) {
+        errors.push({
+          path: ['shapes', shape.name, 'cache', 'triggers', i, 'interval'],
+          type: 'entitlement',
+          message: `Trigger interval ${trigger.interval} is below minimum ${min}`
+        });
+      }
+    }
+  }
   return errors;
 }
 function visitProperties(projectSchema, callback) {
@@ -388,13 +403,13 @@ function visitProperties(projectSchema, callback) {
     callback(property, propertyPath.slice(3, -2).split(`']['`));
   }, undefined);
 }
-function validateIndexedShapes(projectSchema) {
+function validateIndexedShapes(context, projectSchema) {
   const errors = [];
   const {
     shapes
   } = projectSchema;
   for (const shape of Object.values(shapes)) {
-    const newErrors = validateShapeLoaders(projectSchema, shape);
+    const newErrors = validateShapeLoaders(context, projectSchema, shape);
     if (newErrors.length) {
       errors.push(...newErrors);
     }
@@ -773,7 +788,7 @@ function formatValidationResult(context, errors, schema) {
 }
 function validateSyntax(context, schema) {
   let errors = [];
-  errors = errors.concat(checkShapeNames(schema.shapes)).concat(checkShapeIds(schema.shapes)).concat(validateWorkflows(schema)).concat(validateLocalQueryConfigs(schema)).concat(validateLocalRefs(schema)).concat(validateLocalShapeJoins(schema)).concat(validateDirectives(schema)).concat(validateLocales(schema)).concat(checkWorkflowStepNames(schema.workflows)).concat(checkWorkflowStepKeys(schema.workflows)).concat(validateOneOfs(schema)).concat(validateIndexedShapes(schema)).concat(validateInterfaces(schema)).concat(validateInterfaceImplementations(schema));
+  errors = errors.concat(checkShapeNames(schema.shapes)).concat(checkShapeIds(schema.shapes)).concat(validateWorkflows(schema)).concat(validateLocalQueryConfigs(schema)).concat(validateLocalRefs(schema)).concat(validateLocalShapeJoins(schema)).concat(validateDirectives(schema)).concat(validateLocales(schema)).concat(checkWorkflowStepNames(schema.workflows)).concat(checkWorkflowStepKeys(schema.workflows)).concat(validateOneOfs(schema)).concat(validateIndexedShapes(context, schema)).concat(validateInterfaces(schema)).concat(validateInterfaceImplementations(schema));
   return formatValidationResult(context, errors, schema);
 }
 async function validateReferences(context, schema) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takeshape/schema",
-  "version": "9.84.0",
+  "version": "9.86.2",
   "description": "TakeShape Schema",
   "homepage": "https://www.takeshape.io",
   "repository": {
@@ -28,9 +28,9 @@
     "p-reduce": "^2.1.0",
     "semver": "^7.3.2",
     "tiny-invariant": "^1.2.0",
-    "@takeshape/errors": "9.84.0",
-    "@takeshape/json-schema": "9.84.0",
-    "@takeshape/util": "9.84.0"
+    "@takeshape/json-schema": "9.86.2",
+    "@takeshape/errors": "9.86.2",
+    "@takeshape/util": "9.86.2"
   },
   "devDependencies": {
     "@takeshape/json-schema-to-typescript": "^11.0.0",
@@ -46,7 +46,7 @@
     "meow": "^9.0.0",
     "p-map": "^5.0.0",
     "shortid": "^2.2.15",
-    "@takeshape/typescript-jest-junit-reporter": "9.84.0"
+    "@takeshape/typescript-jest-junit-reporter": "9.86.2"
   },
   "engines": {
     "node": ">=16"