@0xpolygonid/js-sdk 1.27.1 → 1.27.3

package/dist/node/cjs/proof/provers/inputs-generator.js

@@ -319,6 +319,10 @@ class InputGenerator {
             circuitQueries.forEach((query) => {
                 this.checkOperatorSupport(proofReq.circuitId, query.operator);
             });
+            circuitQueries.forEach((query) => {
+                query.values = [circuits_1.Operators.SD, circuits_1.Operators.NOOP].includes(query.operator) ? [] : query.values;
+                query.valueProof = query.operator === circuits_1.Operators.NOOP ? new circuits_1.ValueProof() : query.valueProof;
+            });
             return circuitInputs.inputsMarshal();
         };
     }

package/dist/node/cjs/storage/filters/jsonQuery.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StandardJSONCredentialsQueryFilter = exports.FilterQuery = exports.resolvePath = exports.comparatorOptions = exports.SearchError = void 0;
+exports.StandardJSONCredentialsQueryFilter = exports.FilterQuery = exports.resolvePath = exports.comparatorOptions = exports.SupportedDataFormat = exports.SearchError = void 0;
 /**
  * search errors
  *
@@ -11,6 +11,19 @@ var SearchError;
     SearchError["NotDefinedQueryKey"] = "not defined query key";
     SearchError["NotDefinedComparator"] = "not defined comparator";
 })(SearchError = exports.SearchError || (exports.SearchError = {}));
+/**
+ * supported data formats
+ *
+ * @enum {number}
+ */
+var SupportedDataFormat;
+(function (SupportedDataFormat) {
+    SupportedDataFormat[SupportedDataFormat["BigInt"] = 0] = "BigInt";
+    SupportedDataFormat[SupportedDataFormat["Boolean"] = 1] = "Boolean";
+    SupportedDataFormat[SupportedDataFormat["Double"] = 2] = "Double";
+    SupportedDataFormat[SupportedDataFormat["DateTime"] = 3] = "DateTime";
+    SupportedDataFormat[SupportedDataFormat["String"] = 4] = "String";
+})(SupportedDataFormat = exports.SupportedDataFormat || (exports.SupportedDataFormat = {}));
 const truthyValues = [true, 1, 'true'];
 const falsyValues = [false, 0, 'false'];
 const equalsComparator = (a, b) => {
@@ -34,40 +47,38 @@ const equalsComparator = (a, b) => {
     return a === b;
 };
 const greaterThan = (a, b) => {
-    if (Array.isArray(a) && Array.isArray(b)) {
-        return a.every((val, index) => val > b[index]);
-    }
-    if (!Array.isArray(a) && Array.isArray(b)) {
-        return b.every((val) => a > val);
-    }
-    if (Array.isArray(a) && !Array.isArray(b)) {
-        return a.every((val) => val > b);
-    }
-    return a > b;
+    const predicate = (a, b) => {
+        const dataFormat = detectDataFormat(a.toString());
+        switch (dataFormat) {
+            case SupportedDataFormat.BigInt:
+            case SupportedDataFormat.Boolean:
+                return BigInt(a) > BigInt(b);
+            case SupportedDataFormat.DateTime:
+                return Date.parse(a.toString()) > Date.parse(b.toString()); /// nanoseconds won't be compared.
+            case SupportedDataFormat.Double:
+            case SupportedDataFormat.String:
+            default:
+                return a > b;
+        }
+    };
+    return operatorIndependentCheck(a, b, predicate);
 };
 const greaterThanOrEqual = (a, b) => {
-    if (Array.isArray(a) && Array.isArray(b)) {
-        return a.every((val, index) => val >= b[index]);
-    }
-    if (!Array.isArray(a) && Array.isArray(b)) {
-        return b.every((val) => a >= val);
-    }
-    if (Array.isArray(a) && !Array.isArray(b)) {
-        return a.every((val) => val >= b);
-    }
-    return a >= b;
-};
-const lessThanOrEqual = (a, b) => {
-    if (Array.isArray(a) && Array.isArray(b)) {
-        return a.every((val, index) => val <= b[index]);
-    }
-    if (!Array.isArray(a) && Array.isArray(b)) {
-        return b.every((val) => a <= val);
-    }
-    if (Array.isArray(a) && !Array.isArray(b)) {
-        return a.every((val) => val <= b);
-    }
-    return a <= b;
+    const predicate = (a, b) => {
+        const dataFormat = detectDataFormat(a.toString());
+        switch (dataFormat) {
+            case SupportedDataFormat.BigInt:
+            case SupportedDataFormat.Boolean:
+                return BigInt(a) >= BigInt(b);
+            case SupportedDataFormat.DateTime:
+                return Date.parse(a.toString()) >= Date.parse(b.toString()); /// nanoseconds won't be compared.
+            case SupportedDataFormat.Double:
+            case SupportedDataFormat.String:
+            default:
+                return a >= b;
+        }
+    };
+    return operatorIndependentCheck(a, b, predicate);
 };
 // a - field value
 // b - true / false (exists operator values)
@@ -116,7 +127,7 @@ exports.comparatorOptions = {
     $lt: (a, b) => !greaterThanOrEqual(a, b),
     $ne: (a, b) => !equalsComparator(a, b),
     $gte: (a, b) => greaterThanOrEqual(a, b),
-    $lte: (a, b) => lessThanOrEqual(a, b),
+    $lte: (a, b) => !greaterThan(a, b),
     $between: (a, b) => betweenOperator(a, b),
     $nonbetween: (a, b) => !betweenOperator(a, b)
 };
@@ -233,3 +244,32 @@ const StandardJSONCredentialsQueryFilter = (query) => {
     }, []);
 };
 exports.StandardJSONCredentialsQueryFilter = StandardJSONCredentialsQueryFilter;
+const operatorIndependentCheck = (a, b, predicate) => {
+    if (Array.isArray(a) && Array.isArray(b)) {
+        return a.every((val, index) => predicate(val, b[index]));
+    }
+    if (!Array.isArray(a) && Array.isArray(b)) {
+        return b.every((val) => predicate(a, val));
+    }
+    if (Array.isArray(a) && !Array.isArray(b)) {
+        return a.every((val) => predicate(val, b));
+    }
+    // in this case a and b are not arrays
+    return predicate(a, b);
+};
+const regExBigInt = /^[+-]?\d+$/;
+const regExDouble = /^(-?)(0|([1-9][0-9]*))(\\.[0-9]+)?$/;
+const regExDateTimeRFC3339Nano = 
+/* eslint-disable-next-line */
+/^([0-9]+)-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])[Tt]([01][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9]|60)(\.[0-9]+)?(([Zz])|([\+|\-]([01][0-9]|2[0-3]):[0-5][0-9]))$/;
+const regExBoolean = /^(true)|(false)$/;
+const regExDateTimeYYYYMMDD = /^\d{4}-\d{2}-\d{2}$/;
+const detectDataFormat = (s) => regExBigInt.test(s)
+    ? SupportedDataFormat.BigInt
+    : regExDouble.test(s)
+        ? SupportedDataFormat.Double
+        : regExDateTimeRFC3339Nano.test(s) || regExDateTimeYYYYMMDD.test(s)
+            ? SupportedDataFormat.DateTime
+            : regExBoolean.test(s)
+                ? SupportedDataFormat.Boolean
+                : SupportedDataFormat.String;

package/dist/node/esm/proof/provers/inputs-generator.js

@@ -316,6 +316,10 @@ export class InputGenerator {
             circuitQueries.forEach((query) => {
                 this.checkOperatorSupport(proofReq.circuitId, query.operator);
             });
+            circuitQueries.forEach((query) => {
+                query.values = [Operators.SD, Operators.NOOP].includes(query.operator) ? [] : query.values;
+                query.valueProof = query.operator === Operators.NOOP ? new ValueProof() : query.valueProof;
+            });
             return circuitInputs.inputsMarshal();
         };
     }

package/dist/node/esm/storage/filters/jsonQuery.js

@@ -8,6 +8,19 @@ export var SearchError;
     SearchError["NotDefinedQueryKey"] = "not defined query key";
     SearchError["NotDefinedComparator"] = "not defined comparator";
 })(SearchError || (SearchError = {}));
+/**
+ * supported data formats
+ *
+ * @enum {number}
+ */
+export var SupportedDataFormat;
+(function (SupportedDataFormat) {
+    SupportedDataFormat[SupportedDataFormat["BigInt"] = 0] = "BigInt";
+    SupportedDataFormat[SupportedDataFormat["Boolean"] = 1] = "Boolean";
+    SupportedDataFormat[SupportedDataFormat["Double"] = 2] = "Double";
+    SupportedDataFormat[SupportedDataFormat["DateTime"] = 3] = "DateTime";
+    SupportedDataFormat[SupportedDataFormat["String"] = 4] = "String";
+})(SupportedDataFormat || (SupportedDataFormat = {}));
 const truthyValues = [true, 1, 'true'];
 const falsyValues = [false, 0, 'false'];
 const equalsComparator = (a, b) => {
@@ -31,40 +44,38 @@ const equalsComparator = (a, b) => {
     return a === b;
 };
 const greaterThan = (a, b) => {
-    if (Array.isArray(a) && Array.isArray(b)) {
-        return a.every((val, index) => val > b[index]);
-    }
-    if (!Array.isArray(a) && Array.isArray(b)) {
-        return b.every((val) => a > val);
-    }
-    if (Array.isArray(a) && !Array.isArray(b)) {
-        return a.every((val) => val > b);
-    }
-    return a > b;
+    const predicate = (a, b) => {
+        const dataFormat = detectDataFormat(a.toString());
+        switch (dataFormat) {
+            case SupportedDataFormat.BigInt:
+            case SupportedDataFormat.Boolean:
+                return BigInt(a) > BigInt(b);
+            case SupportedDataFormat.DateTime:
+                return Date.parse(a.toString()) > Date.parse(b.toString()); /// nanoseconds won't be compared.
+            case SupportedDataFormat.Double:
+            case SupportedDataFormat.String:
+            default:
+                return a > b;
+        }
+    };
+    return operatorIndependentCheck(a, b, predicate);
 };
 const greaterThanOrEqual = (a, b) => {
-    if (Array.isArray(a) && Array.isArray(b)) {
-        return a.every((val, index) => val >= b[index]);
-    }
-    if (!Array.isArray(a) && Array.isArray(b)) {
-        return b.every((val) => a >= val);
-    }
-    if (Array.isArray(a) && !Array.isArray(b)) {
-        return a.every((val) => val >= b);
-    }
-    return a >= b;
-};
-const lessThanOrEqual = (a, b) => {
-    if (Array.isArray(a) && Array.isArray(b)) {
-        return a.every((val, index) => val <= b[index]);
-    }
-    if (!Array.isArray(a) && Array.isArray(b)) {
-        return b.every((val) => a <= val);
-    }
-    if (Array.isArray(a) && !Array.isArray(b)) {
-        return a.every((val) => val <= b);
-    }
-    return a <= b;
+    const predicate = (a, b) => {
+        const dataFormat = detectDataFormat(a.toString());
+        switch (dataFormat) {
+            case SupportedDataFormat.BigInt:
+            case SupportedDataFormat.Boolean:
+                return BigInt(a) >= BigInt(b);
+            case SupportedDataFormat.DateTime:
+                return Date.parse(a.toString()) >= Date.parse(b.toString()); /// nanoseconds won't be compared.
+            case SupportedDataFormat.Double:
+            case SupportedDataFormat.String:
+            default:
+                return a >= b;
+        }
+    };
+    return operatorIndependentCheck(a, b, predicate);
 };
 // a - field value
 // b - true / false (exists operator values)
@@ -113,7 +124,7 @@ export const comparatorOptions = {
     $lt: (a, b) => !greaterThanOrEqual(a, b),
     $ne: (a, b) => !equalsComparator(a, b),
     $gte: (a, b) => greaterThanOrEqual(a, b),
-    $lte: (a, b) => lessThanOrEqual(a, b),
+    $lte: (a, b) => !greaterThan(a, b),
     $between: (a, b) => betweenOperator(a, b),
     $nonbetween: (a, b) => !betweenOperator(a, b)
 };
@@ -227,3 +238,32 @@ export const StandardJSONCredentialsQueryFilter = (query) => {
         }
     }, []);
 };
+const operatorIndependentCheck = (a, b, predicate) => {
+    if (Array.isArray(a) && Array.isArray(b)) {
+        return a.every((val, index) => predicate(val, b[index]));
+    }
+    if (!Array.isArray(a) && Array.isArray(b)) {
+        return b.every((val) => predicate(a, val));
+    }
+    if (Array.isArray(a) && !Array.isArray(b)) {
+        return a.every((val) => predicate(val, b));
+    }
+    // in this case a and b are not arrays
+    return predicate(a, b);
+};
+const regExBigInt = /^[+-]?\d+$/;
+const regExDouble = /^(-?)(0|([1-9][0-9]*))(\\.[0-9]+)?$/;
+const regExDateTimeRFC3339Nano = 
+/* eslint-disable-next-line */
+/^([0-9]+)-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])[Tt]([01][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9]|60)(\.[0-9]+)?(([Zz])|([\+|\-]([01][0-9]|2[0-3]):[0-5][0-9]))$/;
+const regExBoolean = /^(true)|(false)$/;
+const regExDateTimeYYYYMMDD = /^\d{4}-\d{2}-\d{2}$/;
+const detectDataFormat = (s) => regExBigInt.test(s)
+    ? SupportedDataFormat.BigInt
+    : regExDouble.test(s)
+        ? SupportedDataFormat.Double
+        : regExDateTimeRFC3339Nano.test(s) || regExDateTimeYYYYMMDD.test(s)
+            ? SupportedDataFormat.DateTime
+            : regExBoolean.test(s)
+                ? SupportedDataFormat.Boolean
+                : SupportedDataFormat.String;

package/dist/types/storage/filters/jsonQuery.d.ts

@@ -8,6 +8,18 @@ export declare enum SearchError {
     NotDefinedQueryKey = "not defined query key",
     NotDefinedComparator = "not defined comparator"
 }
+/**
+ * supported data formats
+ *
+ * @enum {number}
+ */
+export declare enum SupportedDataFormat {
+    BigInt = 0,
+    Boolean = 1,
+    Double = 2,
+    DateTime = 3,
+    String = 4
+}
 /** allowed operators to search */
 export type FilterOperatorMethod = '$noop' | '$eq' | '$in' | '$nin' | '$gt' | '$lt' | '$ne' | '$gte' | '$lte' | '$sd' | '$exists' | '$between' | '$nonbetween';
 /** filter function type */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xpolygonid/js-sdk",
-  "version": "1.27.1",
+  "version": "1.27.3",
   "description": "SDK to work with Polygon ID",
   "main": "dist/node/cjs/index.js",
   "module": "dist/node/esm/index.js",