@prismatic-io/spectral 7.6.4 → 7.6.6

package/dist/conditionalLogic/index.js

@@ -21,6 +21,7 @@ exports.evaluate = exports.parseDate = exports.contains = exports.parseValue = e
 const types_1 = require("./types");
 const date_fns_1 = require("date-fns");
 const lodash_1 = __importDefault(require("lodash"));
+const util_1 = __importDefault(require("../util"));
 const validate = (expression) => {
     if (!(expression instanceof Array)) {
         return [false, `Invalid expression syntax: '${expression}'`];
@@ -234,11 +235,11 @@ const evaluate = (expression) => {
                 case types_1.BinaryOperator.doesNotEndWith:
                     return !`${right}`.endsWith(`${left}`);
                 case types_1.BinaryOperator.dateTimeAfter:
-                    return (0, date_fns_1.isAfter)(left, right);
+                    return (0, date_fns_1.isAfter)(util_1.default.types.toDate(left), util_1.default.types.toDate(right));
                 case types_1.BinaryOperator.dateTimeBefore:
-                    return (0, date_fns_1.isBefore)(left, right);
+                    return (0, date_fns_1.isBefore)(util_1.default.types.toDate(left), util_1.default.types.toDate(right));
                 case types_1.BinaryOperator.dateTimeSame:
-                    return left == right;
+                    return (0, date_fns_1.isEqual)(util_1.default.types.toDate(left), util_1.default.types.toDate(right));
                 default:
                     throw new Error(`Invalid operator: '${operator}'`);
             }

package/dist/conditionalLogic/types.d.ts

@@ -40,15 +40,15 @@ export declare enum BinaryOperator {
 }
 export declare const BinaryOperatorPhrase: {
     equal: string;
+    exactlyMatches: string;
     notEqual: string;
+    doesNotExactlyMatch: string;
     greaterThan: string;
     greaterThanOrEqual: string;
     lessThan: string;
     lessThanOrEqual: string;
     in: string;
     notIn: string;
-    exactlyMatches: string;
-    doesNotExactlyMatch: string;
     startsWith: string;
     doesNotStartWith: string;
     endsWith: string;
@@ -60,15 +60,15 @@ export declare const BinaryOperatorPhrase: {
 export declare type TermOperator = UnaryOperator | BinaryOperator;
 export declare const TermOperatorPhrase: {
     equal: string;
+    exactlyMatches: string;
     notEqual: string;
+    doesNotExactlyMatch: string;
     greaterThan: string;
     greaterThanOrEqual: string;
     lessThan: string;
     lessThanOrEqual: string;
     in: string;
     notIn: string;
-    exactlyMatches: string;
-    doesNotExactlyMatch: string;
     startsWith: string;
     doesNotStartWith: string;
     endsWith: string;

package/dist/conditionalLogic/types.js

@@ -47,20 +47,20 @@ var BinaryOperator;
     BinaryOperator["dateTimeSame"] = "dateTimeSame";
 })(BinaryOperator = exports.BinaryOperator || (exports.BinaryOperator = {}));
 exports.BinaryOperatorPhrase = {
-    [BinaryOperator.equal]: "equal",
+    [BinaryOperator.equal]: "equals",
+    [BinaryOperator.exactlyMatches]: "exactly matches",
     [BinaryOperator.notEqual]: "does not equal",
+    [BinaryOperator.doesNotExactlyMatch]: "does not exactly match",
     [BinaryOperator.greaterThan]: "is greater than",
     [BinaryOperator.greaterThanOrEqual]: "is greater than or equal to",
     [BinaryOperator.lessThan]: "is less than",
     [BinaryOperator.lessThanOrEqual]: "is less than or equal to",
     [BinaryOperator.in]: "contained in",
     [BinaryOperator.notIn]: "not contained in",
-    [BinaryOperator.exactlyMatches]: "exactly matches",
-    [BinaryOperator.doesNotExactlyMatch]: "does not exactly match",
-    [BinaryOperator.startsWith]: "starts with",
-    [BinaryOperator.doesNotStartWith]: "does not start with",
-    [BinaryOperator.endsWith]: "ends with",
-    [BinaryOperator.doesNotEndWith]: "does not end with",
+    [BinaryOperator.startsWith]: "starts the string",
+    [BinaryOperator.doesNotStartWith]: "does not start the string",
+    [BinaryOperator.endsWith]: "ends the string",
+    [BinaryOperator.doesNotEndWith]: "does not end the string",
     [BinaryOperator.dateTimeAfter]: "is after (date/time)",
     [BinaryOperator.dateTimeBefore]: "is before (date/time)",
     [BinaryOperator.dateTimeSame]: "is the same (date/time)",

package/dist/util.js

@@ -13,6 +13,7 @@ exports.toObject = exports.lowerCaseHeaders = void 0;
 const parseISO_1 = __importDefault(require("date-fns/parseISO"));
 const isValid_1 = __importDefault(require("date-fns/isValid"));
 const isDate_1 = __importDefault(require("date-fns/isDate"));
+const fromUnixTime_1 = __importDefault(require("date-fns/fromUnixTime"));
 const safe_stable_stringify_1 = require("safe-stable-stringify");
 const valid_url_1 = require("valid-url");
 const isObjectWithTruthyKeys = (value, keys) => {
@@ -247,11 +248,12 @@ const toBigInt = (value) => {
 /** This function returns true if `value` is a variable of type `Date`, and false otherwise. */
 const isDate = (value) => (0, isDate_1.default)(value);
 /**
- * This function parses an ISO date if possible, or throws an error if the value provided
+ * This function parses an ISO date or UNIX epoch timestamp if possible, or throws an error if the value provided
  * cannot be coerced into a Date object.
  *
  * - `util.types.toDate(new Date('1995-12-17T03:24:00'))` will return `Date('1995-12-17T09:24:00.000Z')` since a `Date` object was passed in.
  * - `util.types.toDate('2021-03-20')` will return `Date('2021-03-20T05:00:00.000Z')` since a valid ISO date was passed in.
+ * - `util.types.toDate(1616198400) will return `Date('2021-03-20T00:00:00.000Z')` since a UNIX epoch timestamp was passed in.
  * - `parseISODate('2021-03-20-05')` will throw an error since `value` was not a valid ISO date.
  * @param value The value to turn into a date.
  * @returns The date equivalent of `value`.
@@ -260,6 +262,9 @@ const toDate = (value) => {
     if (isDate(value)) {
         return value;
     }
+    if (isNumber(value) && toNumber(value)) {
+        return (0, fromUnixTime_1.default)(toNumber(value));
+    }
     if (typeof value === "string") {
         const dt = (0, parseISO_1.default)(value);
         if ((0, isValid_1.default)(dt)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prismatic-io/spectral",
-  "version": "7.6.4",
+  "version": "7.6.6",
   "description": "Utility library for building Prismatic components",
   "keywords": [
     "prismatic"
@@ -40,7 +40,7 @@
     "@jsonforms/core": "3.0.0",
     "axios": "0.27.2",
     "axios-retry": "3.2.5",
-    "date-fns": "2.29.3",
+    "date-fns": "2.30.0",
     "form-data": "4.0.0",
     "jest-mock": "27.0.3",
     "soap": "1.0.0",