@platecms/delta-validation 0.12.1 → 1.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platecms/delta-validation",
-  "version": "0.12.1",
+  "version": "1.2.0",
   "description": "This package contains the validation system for Plate.",
   "license": "UNLICENSED",
   "publishConfig": {
@@ -17,9 +17,9 @@
     "src/**/*"
   ],
   "peerDependencies": {
-    "@platecms/delta-cast": "0.12.1",
-    "@platecms/delta-plate-resource-notation": "0.12.1",
-    "@platecms/delta-types": "0.12.1",
+    "@platecms/delta-cast": "1.2.0",
+    "@platecms/delta-plate-resource-notation": "1.2.0",
+    "@platecms/delta-types": "1.2.0",
     "class-transformer": "0.5.1",
     "reflect-metadata": "0.2.2",
     "tslib": "2.8.1"

package/src/lib/helpers/rule-to-schema.spec.ts

@@ -5,14 +5,14 @@ import { ArrayValidationSchema } from "../schemas/array.schema";
 import { ruleToSchema } from "./rule-to-schema";
 
 describe("ruleToSchema", () => {
-  const mockPrn = PRN.fromString("prn:plate:-1:cxc:validation-rule:1");
+  const mockPrn = PRN.fromString("prn:plate:-1:cms:validation-rule:1");
 
   describe("ALLOWED_VALUES rule", () => {
     it("converts ALLOWED_VALUES rule to array schema with inner content-value schema", () => {
       const rule = {
         ruleType: RuleType.ALLOWED_VALUES,
         settings: { allowedValues: ["option1", "option2", "option3"] },
-        prn: PRN.fromString("prn:plate:-1:cxc:validation-rule:1"),
+        prn: PRN.fromString("prn:plate:-1:cms:validation-rule:1"),
       };
 
       const schema = ruleToSchema(rule);
@@ -68,7 +68,7 @@ describe("ruleToSchema", () => {
       const rule = {
         ruleType: RuleType.STRING_FORMAT,
         settings: { allowedFormat: ".*@.*\\..*" },
-        prn: PRN.fromString("prn:plate:-1:cxc:validation-rule:1"),
+        prn: PRN.fromString("prn:plate:-1:cms:validation-rule:1"),
       };
 
       const schema = ruleToSchema(rule);
@@ -241,7 +241,7 @@ describe("ruleToSchema", () => {
       const rule = {
         ruleType: RuleType.RELATABLE_CONTENT_TYPES,
         settings: { allowedTypes: [ContentValueTypeNames.STRING, ContentValueTypeNames.NUMBER] },
-        prn: PRN.fromString("prn:plate:-1:cxc:validation-rule:1"),
+        prn: PRN.fromString("prn:plate:-1:cms:validation-rule:1"),
       };
 
       const schema = ruleToSchema(rule);

package/src/lib/helpers/validate-with-function.spec.ts

@@ -6,7 +6,7 @@ import { RuleType } from "../enums/rule-types.enum";
 import { validateWithFunction } from "./validate-with-function";
 
 describe("validate-with-function", () => {
-  const mockRulePrn = PRN.fromString("prn:plate:-1:cxc:validation-rule:1");
+  const mockRulePrn = PRN.fromString("prn:plate:-1:cms:validation-rule:1");
   const mockPath = ["content-type-prn", "content-field-prn"];
   const fallbackErrorMessage = "Validation failed";
 
@@ -182,7 +182,7 @@ describe("validate-with-function", () => {
 
       // Test with PRN
       const prnResult = validateWithFunction(
-        PRN.fromString("prn:plate:-1:cxc:content-item:1"),
+        PRN.fromString("prn:plate:-1:cms:content-item:1"),
         mockRule,
         mockPath,
         fallbackErrorMessage,
@@ -229,7 +229,7 @@ describe("validate-with-function", () => {
         42,
         true,
         new Date("2023-01-01"),
-        PRN.fromString("prn:plate:-1:cxc:content-item:1"),
+        PRN.fromString("prn:plate:-1:cms:content-item:1"),
         { type: "root", children: [] },
       ];
 

package/src/lib/schemas/array.schema.spec.ts

@@ -105,7 +105,7 @@ describe("ArrayValidationSchema", () => {
         ruleType: RuleType.COUNT,
         settings: { min: 2, max: 4 },
         id: "count-rule",
-        prn: PRN.fromString("prn:plate:-1:cxc:validation-rule:1"),
+        prn: PRN.fromString("prn:plate:-1:cms:validation-rule:1"),
       };
 
       const schemaWithRule = new ArrayValidationSchema<ContentValueType>(mockRule);

package/src/lib/schemas/content-value.schema.spec.ts

@@ -37,7 +37,7 @@ describe("ContentValueValidationSchema", () => {
     });
 
     it("passes validation when value is a PRN", () => {
-      const prn = PRN.fromString("prn:plate:-1:cxc:content-item:1");
+      const prn = PRN.fromString("prn:plate:-1:cms:content-item:1");
       const result = schema.validate(prn, { path: ["test"] });
       expect(result.isValid).toBe(true);
       expect(result.errors).toHaveLength(0);
@@ -92,10 +92,10 @@ describe("ContentValueValidationSchema", () => {
 
   describe("allowed content types validation", () => {
     it("passes validation when PRN content type is in allowed types", () => {
-      const allowedTypes = [PRN.fromString("prn:plate:-1:cxc:content-item:1")];
+      const allowedTypes = [PRN.fromString("prn:plate:-1:cms:content-item:1")];
       schema.allowedContentTypes(allowedTypes);
 
-      const prn = PRN.fromString("prn:plate:-1:cxc:content-item:1");
+      const prn = PRN.fromString("prn:plate:-1:cms:content-item:1");
       const result = schema.validate(prn, { path: ["test"] });
       expect(result.isValid).toBe(true);
       expect(result.errors).toHaveLength(0);
@@ -106,7 +106,7 @@ describe("ContentValueValidationSchema", () => {
       const mockRule = {
         ruleType: RuleType.VALUE_TYPE,
         settings: { allowedTypes: allowedValueTypes },
-        prn: PRN.fromString("prn:plate:-1:cxc:validation-rule:1"),
+        prn: PRN.fromString("prn:plate:-1:cms:validation-rule:1"),
       };
 
       const schemaWithRule = new ContentValueValidationSchema(mockRule).allowedValueTypes(allowedValueTypes);
@@ -119,7 +119,7 @@ describe("ContentValueValidationSchema", () => {
   describe("method chaining", () => {
     it("supports method chaining", () => {
       const allowedValueTypes = [ContentValueTypeNames.STRING, ContentValueTypeNames.NUMBER];
-      const allowedContentTypes = [PRN.fromString("prn:plate:-1:cxc:content-item:1")];
+      const allowedContentTypes = [PRN.fromString("prn:plate:-1:cms:content-item:1")];
 
       const result = schema
         .allowedValueTypes(allowedValueTypes)

package/src/lib/schemas/date.schema.spec.ts

@@ -88,7 +88,7 @@ describe("DateValidationSchema", () => {
       const mockRule = {
         ruleType: RuleType.DATE_BETWEEN,
         settings: { start: startDate, end: endDate },
-        prn: PRN.fromString("prn:plate:-1:cxc:validation-rule:1"),
+        prn: PRN.fromString("prn:plate:-1:cms:validation-rule:1"),
       };
 
       schema = new DateValidationSchema(mockRule).start(startDate).end(endDate);

package/src/lib/schemas/string.schema.spec.ts

@@ -88,7 +88,7 @@ describe("StringValidationSchema", () => {
       const mockRule = {
         ruleType: RuleType.STRING_FORMAT,
         settings: { allowedFormat: ".*@.*\\..*" },
-        prn: PRN.fromString("prn:plate:-1:cxc:validation-rule:1"),
+        prn: PRN.fromString("prn:plate:-1:cms:validation-rule:1"),
       };
 
       const schemaWithRule = new StringValidationSchema(mockRule);

package/src/lib/validation-rules/allowed-values.validation-rule.spec.ts

@@ -6,7 +6,7 @@ describe("AllowedValuesValidationRule", () => {
   let rulePrn: PRN;
 
   beforeEach(() => {
-    rulePrn = PRN.fromString("prn:plate:-1:cxc:validation-rule:1");
+    rulePrn = PRN.fromString("prn:plate:-1:cms:validation-rule:1");
   });
 
   describe("validate", () => {
@@ -14,7 +14,7 @@ describe("AllowedValuesValidationRule", () => {
       let rule: AllowedValuesValidationRule;
 
       beforeEach(() => {
-        const allowedValues = [1, "2", true, new Date("2020-01-01"), PRN.fromString("prn:plate:-1:cxc:content-item:1")];
+        const allowedValues = [1, "2", true, new Date("2020-01-01"), PRN.fromString("prn:plate:-1:cms:content-item:1")];
         rule = new AllowedValuesValidationRule(rulePrn, { allowedValues });
       });
 
@@ -28,8 +28,8 @@ describe("AllowedValuesValidationRule", () => {
           false,
           new Date("2020-01-01"),
           new Date("2020-01-02"),
-          PRN.fromString("prn:plate:-1:cxc:content-item:1"),
-          PRN.fromString("prn:plate:-1:cxc:content-item:2"),
+          PRN.fromString("prn:plate:-1:cms:content-item:1"),
+          PRN.fromString("prn:plate:-1:cms:content-item:2"),
         ]);
         expect(result).toBeContentValidationResult([true, false, true, false, true, false, true, false, true, false]);
       });
@@ -48,7 +48,7 @@ describe("AllowedValuesValidationRule", () => {
         [1, false],
         [true, false],
         [new Date("2020-01-01"), false],
-        [PRN.fromString("prn:plate:-1:cxc:content-item:1"), false],
+        [PRN.fromString("prn:plate:-1:cms:content-item:1"), false],
       ])("returns false if the value is %s", (value, expected) => {
         expect(rule.validate([value])).toBeContentValidationResult([expected]);
       });

package/src/lib/validation-rules/count.validation-rule.spec.ts

@@ -3,7 +3,7 @@ import { InvalidValidationRuleSettingsError } from "../errors/invalid-validation
 import { CountValidationRule } from "./count.validation-rule";
 
 describe("CountValidationRule", () => {
-  const rulePrn = PRN.fromString("prn:plate:-1:cxc:validation-rule:1");
+  const rulePrn = PRN.fromString("prn:plate:-1:cms:validation-rule:1");
 
   describe("constructor", () => {
     it("throws an error if neither min nor max are provided", () => {

package/src/lib/validation-rules/date-between.validation-rule.spec.ts

@@ -3,7 +3,7 @@ import { InvalidValidationRuleSettingsError } from "../errors/invalid-validation
 import { DateBetweenValidationRule } from "./date-between.validation-rule";
 
 describe("DateBetweenValidationRule", () => {
-  const rulePrn = PRN.fromString("prn:plate:-1:cxc:validation-rule:1");
+  const rulePrn = PRN.fromString("prn:plate:-1:cms:validation-rule:1");
 
   describe("constructor", () => {
     it("throws an error if min and max are not provided", () => {

package/src/lib/validation-rules/date-between.validation-rule.ts

@@ -15,15 +15,15 @@ export function validateValueDateBetween(
     return null;
   }
 
-  if (ruleInstance.settings.start != null && value < ruleInstance.settings.start) {
+  if (ruleInstance.settings.start != null && value < new Date(ruleInstance.settings.start as unknown as Date)) {
     return new ValidationErrorDetails(
-      `The date must be greater than or equal ${ruleInstance.settings.start.toDateString()}`,
+      `The date must be greater than or equal ${new Date(ruleInstance.settings.start).toDateString()}`,
       ruleInstance,
     );
   }
-  if (ruleInstance.settings.end != null && value > ruleInstance.settings.end) {
+  if (ruleInstance.settings.end != null && value > new Date(ruleInstance.settings.end)) {
     return new ValidationErrorDetails(
-      `The date must be lower than or equal ${ruleInstance.settings.end.toDateString()}`,
+      `The date must be lower than or equal ${new Date(ruleInstance.settings.end).toDateString()}`,
       ruleInstance,
     );
   }

package/src/lib/validation-rules/decimal-count.validation-rule.spec.ts

@@ -2,7 +2,7 @@ import { PRN } from "@platecms/delta-plate-resource-notation";
 import { DecimalCountValidationRule } from "./decimal-count.validation-rule";
 
 describe("DecimalCountValidationRule", () => {
-  const rulePrn = PRN.fromString("prn:plate:-1:cxc:validation-rule:decimal-count");
+  const rulePrn = PRN.fromString("prn:plate:-1:cms:validation-rule:decimal-count");
 
   describe("validate", () => {
     describe("with max of 0", () => {

package/src/lib/validation-rules/number-between.validation-rule.spec.ts

@@ -3,7 +3,7 @@ import { InvalidValidationRuleSettingsError } from "../errors/invalid-validation
 import { NumberBetweenValidationRule } from "./number-between.validation-rule";
 
 describe("NumberBetweenValidationRule", () => {
-  const rulePrn = PRN.fromString("prn:plate:-1:cxc:validation-rule:1");
+  const rulePrn = PRN.fromString("prn:plate:-1:cms:validation-rule:1");
 
   describe("constructor", () => {
     it("throws an error if min and max are not provided", () => {

package/src/lib/validation-rules/relatable-content-types.validation-rule.spec.ts

@@ -3,15 +3,15 @@ import { InvalidValidationArgumentsError } from "../errors/invalid-validation-ar
 import { RelatableContentTypesValidationRule } from "./relatable-content-types.validation-rule";
 
 describe("RelatableContentTypesValidationRule", () => {
-  const rulePrn = PRN.fromString("prn:plate:-1:cxc:validation-rule:1");
-  const contentItemPrn = PRN.fromString("prn:plate:-1:cxc:content-item:1");
+  const rulePrn = PRN.fromString("prn:plate:-1:cms:validation-rule:1");
+  const contentItemPrn = PRN.fromString("prn:plate:-1:cms:content-item:1");
 
   const allowedContentTypes = [
-    PRN.fromString("prn:plate:-1:cxc:content-type:1"),
-    PRN.fromString("prn:plate:-1:cxc:content-type:2"),
+    PRN.fromString("prn:plate:-1:cms:content-type:1"),
+    PRN.fromString("prn:plate:-1:cms:content-type:2"),
   ];
 
-  const disallowedContentType = PRN.fromString("prn:plate:-1:cxc:content-type:3");
+  const disallowedContentType = PRN.fromString("prn:plate:-1:cms:content-type:3");
 
   let rule: RelatableContentTypesValidationRule;
 

package/src/lib/validation-rules/string-format.validation-rule.spec.ts

@@ -2,7 +2,7 @@ import { PRN } from "@platecms/delta-plate-resource-notation";
 import { StringFormatValidationRule } from "./string-format.validation-rule";
 
 describe("StringFormatValidationRule", () => {
-  const rulePrn = PRN.fromString("prn:plate:-1:cxc:validation-rule:string-format");
+  const rulePrn = PRN.fromString("prn:plate:-1:cms:validation-rule:string-format");
 
   describe("with an email regex", () => {
     let rule: StringFormatValidationRule;

package/src/lib/validation-rules/value-type.validation-rule.spec.ts

@@ -3,7 +3,7 @@ import { ContentValueType, ContentValueTypeNames } from "@platecms/delta-types";
 import { ValueTypeValidationRule, ValueTypeValidationRuleSettings } from "./value-type.validation-rule";
 
 describe("ValueTypeValidationRule", () => {
-  const rulePrn = PRN.fromString("prn:plate:-1:cxc:validation-rule:value-type");
+  const rulePrn = PRN.fromString("prn:plate:-1:cms:validation-rule:value-type");
 
   describe.each([
     [
@@ -42,7 +42,7 @@ describe("ValueTypeValidationRule", () => {
       "with allowed content item type",
       { allowedTypes: [ContentValueTypeNames.CONTENT_ITEM] },
       [
-        [PRN.fromString("prn:plate:-1:cxc:content-item:1"), true],
+        [PRN.fromString("prn:plate:-1:cms:content-item:1"), true],
         ["foo", false],
       ],
     ],
@@ -50,7 +50,7 @@ describe("ValueTypeValidationRule", () => {
       "with allowed asset type",
       { allowedTypes: [ContentValueTypeNames.ASSET] },
       [
-        [PRN.fromString("prn:plate:-1:am:asset:1"), true],
+        [PRN.fromString("prn:plate:-1:ps:asset:1"), true],
         ["foo", false],
       ],
     ],
@@ -58,7 +58,7 @@ describe("ValueTypeValidationRule", () => {
       "with allowed path part type",
       { allowedTypes: [ContentValueTypeNames.PATH_PART] },
       [
-        [PRN.fromString("prn:plate:-1:cxc:path-part:1"), true],
+        [PRN.fromString("prn:plate:-1:cms:path-part:1"), true],
         ["foo", false],
       ],
     ],
@@ -66,7 +66,7 @@ describe("ValueTypeValidationRule", () => {
       "with allowed grid placement type",
       { allowedTypes: [ContentValueTypeNames.GRID_PLACEMENT] },
       [
-        [PRN.fromString("prn:plate:-1:cxc:grid-placement:1"), true],
+        [PRN.fromString("prn:plate:-1:cms:grid-placement:1"), true],
         ["foo", false],
       ],
     ],
@@ -75,13 +75,13 @@ describe("ValueTypeValidationRule", () => {
       { allowedTypes: [ContentValueTypeNames.SMART_TEXT] },
       [
         [{ type: "root", children: [] }, true],
-        [PRN.fromString("prn:plate:-1:cxc:grid-placement:1"), false],
+        [PRN.fromString("prn:plate:-1:cms:grid-placement:1"), false],
       ],
     ],
     [
       "with incorrect prn",
       { allowedTypes: [ContentValueTypeNames.CONTENT_ITEM] },
-      [[PRN.fromString("prn:plate:-1:am:asset:1"), false]],
+      [[PRN.fromString("prn:plate:-1:ps:asset:1"), false]],
     ],
     [
       "with multiple types",
@@ -90,7 +90,7 @@ describe("ValueTypeValidationRule", () => {
       },
       [
         ["foo", true],
-        [PRN.fromString("prn:plate:-1:cxc:content-item:1"), true],
+        [PRN.fromString("prn:plate:-1:cms:content-item:1"), true],
         [new Date(), false],
       ],
     ],