@websolutespa/bom-core 1.7.10 → 1.7.11

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @websolutespa/bom-core
 
+## 1.7.11
+
+### Patch Changes
+
+- Modified: JsonService where clauses, limit, sort
+- Added: JsonService tests
+
 ## 1.7.10
 
 ### Patch Changes

package/dist/index.d.ts

@@ -497,7 +497,22 @@ type IPaginationResult<T> = {
     docs: T[];
 } & Pagination;
 
-type Operator = 'equals' | 'contains' | 'not_equals' | 'in' | 'not_in' | 'exists' | 'greater_than' | 'greater_than_equal' | 'less_than' | 'less_than_equal' | 'like' | 'near';
+/**
+  equals	The value must be exactly equal.
+  not_equals	The query will return all documents where the value is not equal.
+  exists	Only return documents where the value either exists (true) or does not exist (false).
+  greater_than	For numeric or date-based fields.
+  greater_than_equal	For numeric or date-based fields.
+  less_than	For numeric or date-based fields.
+  less_than_equal	For numeric or date-based fields.
+  like	Case-insensitive string must be present. If string of words, all words must be present, in any order.
+  contains	Must contain the value entered, case-insensitive.
+  in	The value must be found within the provided comma-delimited list of values.
+  not_in	The value must NOT be within the provided comma-delimited list of values.
+  all	The value must contain all values provided in the comma-delimited list.
+  near	For distance related to a point field comma separated as <longitude>, <latitude>, <maxDistance in meters (nullable)>, <minDistance in meters (nullable)>.
+  */
+type Operator = 'equals' | 'not_equals' | 'exists' | 'greater_than' | 'greater_than_equal' | 'less_than' | 'less_than_equal' | 'like' | 'contains' | 'in' | 'not_in' | 'all' | 'near';
 type WhereField = {
     [key in Operator]?: unknown;
 };
@@ -636,31 +651,38 @@ declare class JsonService<T extends IEntity = IEntity> implements IQuerable<T> {
     protected decorateOne_<B extends T = T>(item: B, params?: QueryParams): Promise<B>;
     protected decorateMany_<B extends T = T>(items: B[], params?: QueryParams): Promise<B[]>;
     protected newUUID_(): number;
-    protected evaluateValue_(value: unknown): unknown;
-    /**
-    equals	            The value must be exactly equal.
-    not_equals	        The query will return all documents where the value is not equal.
-    greater_than	      For numeric or date-based fields.
-    greater_than_equal	For numeric or date-based fields.
-    less_than	          For numeric or date-based fields.
-    less_than_equal	    For numeric or date-based fields.
-    like	              Case-insensitive string must be present. If string of words, all words must be present, in any order.
-    contains	          Must contain the value entered, case-insensitive.
-    in	                The value must be found within the provided comma-delimited list of values.
-    not_in	            The value must NOT be within the provided comma-delimited list of values.
-    all	                The value must contain all values provided in the comma-delimited list.
-    exists	            Only return documents where the value either exists (true) or does not exist (false).
-    near	              For distance related to a point field comma separated as <longitude>, <latitude>, <maxDistance in meters (nullable)>, <minDistance in meters (nullable)>.
-    */
-    protected existsClause_(value: unknown, exists?: boolean): boolean;
     protected equalsClause_(value: unknown, equals?: unknown): boolean;
-    protected inClause_(value: unknown, values?: unknown[]): boolean;
-    protected notInClause_(value: unknown, values?: unknown[]): boolean;
+    protected notEqualsClause_(value: unknown, not_equals?: unknown): boolean;
+    protected existsClause_(value: unknown, exists?: boolean): boolean;
+    protected greaterThanClause_(value: unknown, greater_than?: unknown): boolean;
+    protected greaterThanEqualClause_(value: unknown, greater_than_equal?: unknown): boolean;
+    protected lessThanClause_(value: unknown, less_than?: unknown): boolean;
+    protected lessThanEqualClause_(value: unknown, less_than_equal?: unknown): boolean;
     protected likeClause_(value: unknown, query?: string): boolean;
     protected containsClause_(value: unknown, contains?: IEquatable): boolean;
+    protected inClause_(value: unknown, values?: unknown[]): boolean;
+    protected notInClause_(value: unknown, values?: unknown[]): boolean;
+    protected allClause_(value: unknown, values?: unknown[]): boolean;
+    protected nearClause_(value: unknown, near?: unknown[]): boolean;
     protected whereItem_<B extends T = T>(item: B, where?: Where): boolean;
-    protected whereItems_<B extends T = T>(items: B[], where?: Where): B[];
+    /**
+    equals	The value must be exactly equal.
+    not_equals	The query will return all documents where the value is not equal.
+    exists	Only return documents where the value either exists (true) or does not exist (false).
+    greater_than	For numeric or date-based fields.
+    greater_than_equal	For numeric or date-based fields.
+    less_than	For numeric or date-based fields.
+    less_than_equal	For numeric or date-based fields.
+    like	Case-insensitive string must be present. If string of words, all words must be present, in any order.
+    contains	Must contain the value entered, case-insensitive.
+    in	The value must be found within the provided comma-delimited list of values.
+    not_in	The value must NOT be within the provided comma-delimited list of values.
+    all	The value must contain all values provided in the comma-delimited list.
+    near	For distance related to a point field comma separated as <longitude>, <latitude>, <maxDistance in meters (nullable)>, <minDistance in meters (nullable)>.
+    */
+    protected whereItems_<B extends T = T>(items: B[], where?: Where, limit?: number): B[];
     protected sortCollection_<B extends T = T>(items: B[], sort?: string): B[];
+    protected limitCollection_<B extends T = T>(items: B[], limit?: number): B[];
     protected paginatedItems_<B extends T = T>(items: B[], page?: number, limit?: number): ({
         docs: B[];
     } & Pagination);

package/dist/index.js

@@ -636,11 +636,14 @@ var JsonService = class {
     params.pagination = false;
     let items = await this.getItems();
     if (params.where) {
-      items = this.whereItems_(items, params.where);
+      items = this.whereItems_(items, params.where, params.limit);
     }
     if (params.sort) {
       items = this.sortCollection_(items, params.sort);
     }
+    if (params.limit && !params.where) {
+      items = this.limitCollection_(items, params.limit);
+    }
     return await this.decorateMany_(items, params);
   }
   async findPaged(params = {}) {
@@ -700,49 +703,45 @@ var JsonService = class {
     return (/* @__PURE__ */ new Date()).getTime();
   }
   // where
-  evaluateValue_(value) {
-    if (typeof value === "object" && value) {
-      return value.id;
-    } else {
-      return value;
+  equalsClause_(value, equals) {
+    if (typeof equals !== "undefined") {
+      return value === equals;
     }
+    return true;
+  }
+  notEqualsClause_(value, not_equals) {
+    if (typeof not_equals !== "undefined") {
+      return value != not_equals;
+    }
+    return true;
   }
-  /**
-  equals	            The value must be exactly equal.
-  not_equals	        The query will return all documents where the value is not equal.
-  greater_than	      For numeric or date-based fields.
-  greater_than_equal	For numeric or date-based fields.
-  less_than	          For numeric or date-based fields.
-  less_than_equal	    For numeric or date-based fields.
-  like	              Case-insensitive string must be present. If string of words, all words must be present, in any order.
-  contains	          Must contain the value entered, case-insensitive.
-  in	                The value must be found within the provided comma-delimited list of values.
-  not_in	            The value must NOT be within the provided comma-delimited list of values.
-  all	                The value must contain all values provided in the comma-delimited list.
-  exists	            Only return documents where the value either exists (true) or does not exist (false).
-  near	              For distance related to a point field comma separated as <longitude>, <latitude>, <maxDistance in meters (nullable)>, <minDistance in meters (nullable)>.
-  */
   existsClause_(value, exists) {
     if (typeof exists === "boolean") {
       return value != null === exists;
     }
     return true;
   }
-  equalsClause_(value, equals) {
-    if (typeof equals !== "undefined") {
-      return this.evaluateValue_(value) === equals;
+  greaterThanClause_(value, greater_than) {
+    if (typeof greater_than === "number") {
+      return typeof value === "number" && value > greater_than;
     }
     return true;
   }
-  inClause_(value, values) {
-    if (Array.isArray(values)) {
-      return values.indexOf(this.evaluateValue_(value)) !== -1;
+  greaterThanEqualClause_(value, greater_than_equal) {
+    if (typeof greater_than_equal === "number") {
+      return typeof value === "number" && value >= greater_than_equal;
     }
     return true;
   }
-  notInClause_(value, values) {
-    if (Array.isArray(values)) {
-      return values.indexOf(this.evaluateValue_(value)) === -1;
+  lessThanClause_(value, less_than) {
+    if (typeof less_than === "number") {
+      return typeof value === "number" && value < less_than;
+    }
+    return true;
+  }
+  lessThanEqualClause_(value, less_than_equal) {
+    if (typeof less_than_equal === "number") {
+      return typeof value === "number" && value <= less_than_equal;
     }
     return true;
   }
@@ -765,6 +764,49 @@ var JsonService = class {
     }
     return true;
   }
+  inClause_(value, values) {
+    if (Array.isArray(values) && values.length > 0) {
+      return values.indexOf(value) !== -1;
+    }
+    return true;
+  }
+  notInClause_(value, values) {
+    if (Array.isArray(values) && values.length > 0) {
+      return values.indexOf(value) === -1;
+    }
+    return true;
+  }
+  allClause_(value, values) {
+    if (Array.isArray(values) && values.length > 0) {
+      return Array.isArray(value) ? values.reduce((p, c) => p && value.includes(c), true) : false;
+    }
+    return true;
+  }
+  nearClause_(value, near) {
+    if (Array.isArray(near) && near.reduce((p, c) => p && typeof c === "number", true)) {
+      if (!Array.isArray(value)) {
+        return false;
+      }
+      const itemLongitude = value[0];
+      if (typeof itemLongitude !== "number") {
+        return false;
+      }
+      const itemLatitude = value[1];
+      if (typeof itemLatitude !== "number") {
+        return false;
+      }
+      const [longitude, latitude, maxDistance, minDistance] = near;
+      const distance = calculateDistanceInMeters_(itemLongitude, itemLatitude, longitude, latitude);
+      if (typeof maxDistance === "number" && typeof minDistance === "number") {
+        return distance <= maxDistance && distance >= minDistance;
+      } else if (typeof maxDistance === "number") {
+        return distance <= maxDistance;
+      } else if (typeof minDistance === "number") {
+        return distance >= minDistance;
+      }
+    }
+    return true;
+  }
   whereItem_(item, where) {
     let has = true;
     if (typeof where === "object") {
@@ -787,22 +829,53 @@ var JsonService = class {
           default:
             if (Array.isArray(v)) {
             } else if (typeof v === "object") {
-              const value = item[k];
-              has = has && this.existsClause_(value, v.exists);
+              const value = getValue(item, k);
               has = has && this.equalsClause_(value, v.equals);
-              has = has && this.inClause_(value, v.in);
-              has = has && this.notInClause_(value, v.not_in);
+              has = has && this.notEqualsClause_(value, v.not_equals);
+              has = has && this.existsClause_(value, v.exists);
+              has = has && this.greaterThanClause_(value, v.greater_than);
+              has = has && this.greaterThanEqualClause_(value, v.greater_than_equal);
+              has = has && this.lessThanClause_(value, v.less_than);
+              has = has && this.lessThanEqualClause_(value, v.less_than_equal);
               has = has && this.likeClause_(value, v.like);
               has = has && this.containsClause_(value, v.contains);
+              has = has && this.inClause_(value, v.in);
+              has = has && this.notInClause_(value, v.not_in);
+              has = has && this.allClause_(value, v.all);
+              has = has && this.nearClause_(value, v.near);
             }
         }
       });
     }
     return has;
   }
-  whereItems_(items, where) {
+  /**
+  equals	The value must be exactly equal.
+  not_equals	The query will return all documents where the value is not equal.
+  exists	Only return documents where the value either exists (true) or does not exist (false).
+  greater_than	For numeric or date-based fields.
+  greater_than_equal	For numeric or date-based fields.
+  less_than	For numeric or date-based fields.
+  less_than_equal	For numeric or date-based fields.
+  like	Case-insensitive string must be present. If string of words, all words must be present, in any order.
+  contains	Must contain the value entered, case-insensitive.
+  in	The value must be found within the provided comma-delimited list of values.
+  not_in	The value must NOT be within the provided comma-delimited list of values.
+  all	The value must contain all values provided in the comma-delimited list.
+  near	For distance related to a point field comma separated as <longitude>, <latitude>, <maxDistance in meters (nullable)>, <minDistance in meters (nullable)>.
+  */
+  whereItems_(items, where, limit = -1) {
     if (typeof where === "object") {
-      items = items.filter((item) => this.whereItem_(item, where));
+      const whereItems = [];
+      for (const item of items) {
+        if (limit > -1 && whereItems.length >= limit) {
+          return whereItems;
+        }
+        if (this.whereItem_(item, where)) {
+          whereItems.push(item);
+        }
+      }
+      return whereItems;
     }
     return items;
   }
@@ -828,14 +901,12 @@ var JsonService = class {
   }
   // ^ sort
   // limit
-  /*
-  protected limitCollection_<B extends T = T>(items: B[], limit?: number): B[] {
+  limitCollection_(items, limit) {
     if (limit) {
       items = items.slice(0, Math.min(limit, items.length));
     }
     return items;
   }
-  */
   // ^ limit
   // pagination
   paginatedItems_(items, page = 1, limit = 10) {
@@ -865,6 +936,29 @@ var JsonService = class {
   }
   // ^ sort
 };
+function getValue(item, key) {
+  const keys = key.split(".");
+  const value = keys.reduce((p, c) => {
+    if (isObject(p)) {
+      return p[c];
+    } else {
+      return void 0;
+    }
+  }, item);
+  return value;
+}
+function calculateDistanceInMeters_(lon1, lat1, lon2, lat2) {
+  const R = 6371;
+  const dLat = deg2rad_(lat2 - lat1);
+  const dLon = deg2rad_(lon2 - lon1);
+  const a = Math.sin(dLat / 2) * Math.sin(dLat / 2) + Math.cos(deg2rad_(lat1)) * Math.cos(deg2rad_(lat2)) * Math.sin(dLon / 2) * Math.sin(dLon / 2);
+  const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+  const distance = R * c * 1e3;
+  return distance;
+}
+function deg2rad_(deg) {
+  return deg * (Math.PI / 180);
+}
 
 // src/locale/locale.ts
 function getDefaultLocale() {

package/dist/index.mjs

@@ -503,11 +503,14 @@ var JsonService = class {
     params.pagination = false;
     let items = await this.getItems();
     if (params.where) {
-      items = this.whereItems_(items, params.where);
+      items = this.whereItems_(items, params.where, params.limit);
     }
     if (params.sort) {
       items = this.sortCollection_(items, params.sort);
     }
+    if (params.limit && !params.where) {
+      items = this.limitCollection_(items, params.limit);
+    }
     return await this.decorateMany_(items, params);
   }
   async findPaged(params = {}) {
@@ -567,49 +570,45 @@ var JsonService = class {
     return (/* @__PURE__ */ new Date()).getTime();
   }
   // where
-  evaluateValue_(value) {
-    if (typeof value === "object" && value) {
-      return value.id;
-    } else {
-      return value;
+  equalsClause_(value, equals) {
+    if (typeof equals !== "undefined") {
+      return value === equals;
     }
+    return true;
+  }
+  notEqualsClause_(value, not_equals) {
+    if (typeof not_equals !== "undefined") {
+      return value != not_equals;
+    }
+    return true;
   }
-  /**
-  equals	            The value must be exactly equal.
-  not_equals	        The query will return all documents where the value is not equal.
-  greater_than	      For numeric or date-based fields.
-  greater_than_equal	For numeric or date-based fields.
-  less_than	          For numeric or date-based fields.
-  less_than_equal	    For numeric or date-based fields.
-  like	              Case-insensitive string must be present. If string of words, all words must be present, in any order.
-  contains	          Must contain the value entered, case-insensitive.
-  in	                The value must be found within the provided comma-delimited list of values.
-  not_in	            The value must NOT be within the provided comma-delimited list of values.
-  all	                The value must contain all values provided in the comma-delimited list.
-  exists	            Only return documents where the value either exists (true) or does not exist (false).
-  near	              For distance related to a point field comma separated as <longitude>, <latitude>, <maxDistance in meters (nullable)>, <minDistance in meters (nullable)>.
-  */
   existsClause_(value, exists) {
     if (typeof exists === "boolean") {
       return value != null === exists;
     }
     return true;
   }
-  equalsClause_(value, equals) {
-    if (typeof equals !== "undefined") {
-      return this.evaluateValue_(value) === equals;
+  greaterThanClause_(value, greater_than) {
+    if (typeof greater_than === "number") {
+      return typeof value === "number" && value > greater_than;
     }
     return true;
   }
-  inClause_(value, values) {
-    if (Array.isArray(values)) {
-      return values.indexOf(this.evaluateValue_(value)) !== -1;
+  greaterThanEqualClause_(value, greater_than_equal) {
+    if (typeof greater_than_equal === "number") {
+      return typeof value === "number" && value >= greater_than_equal;
     }
     return true;
   }
-  notInClause_(value, values) {
-    if (Array.isArray(values)) {
-      return values.indexOf(this.evaluateValue_(value)) === -1;
+  lessThanClause_(value, less_than) {
+    if (typeof less_than === "number") {
+      return typeof value === "number" && value < less_than;
+    }
+    return true;
+  }
+  lessThanEqualClause_(value, less_than_equal) {
+    if (typeof less_than_equal === "number") {
+      return typeof value === "number" && value <= less_than_equal;
     }
     return true;
   }
@@ -632,6 +631,49 @@ var JsonService = class {
     }
     return true;
   }
+  inClause_(value, values) {
+    if (Array.isArray(values) && values.length > 0) {
+      return values.indexOf(value) !== -1;
+    }
+    return true;
+  }
+  notInClause_(value, values) {
+    if (Array.isArray(values) && values.length > 0) {
+      return values.indexOf(value) === -1;
+    }
+    return true;
+  }
+  allClause_(value, values) {
+    if (Array.isArray(values) && values.length > 0) {
+      return Array.isArray(value) ? values.reduce((p, c) => p && value.includes(c), true) : false;
+    }
+    return true;
+  }
+  nearClause_(value, near) {
+    if (Array.isArray(near) && near.reduce((p, c) => p && typeof c === "number", true)) {
+      if (!Array.isArray(value)) {
+        return false;
+      }
+      const itemLongitude = value[0];
+      if (typeof itemLongitude !== "number") {
+        return false;
+      }
+      const itemLatitude = value[1];
+      if (typeof itemLatitude !== "number") {
+        return false;
+      }
+      const [longitude, latitude, maxDistance, minDistance] = near;
+      const distance = calculateDistanceInMeters_(itemLongitude, itemLatitude, longitude, latitude);
+      if (typeof maxDistance === "number" && typeof minDistance === "number") {
+        return distance <= maxDistance && distance >= minDistance;
+      } else if (typeof maxDistance === "number") {
+        return distance <= maxDistance;
+      } else if (typeof minDistance === "number") {
+        return distance >= minDistance;
+      }
+    }
+    return true;
+  }
   whereItem_(item, where) {
     let has = true;
     if (typeof where === "object") {
@@ -654,22 +696,53 @@ var JsonService = class {
           default:
             if (Array.isArray(v)) {
             } else if (typeof v === "object") {
-              const value = item[k];
-              has = has && this.existsClause_(value, v.exists);
+              const value = getValue(item, k);
               has = has && this.equalsClause_(value, v.equals);
-              has = has && this.inClause_(value, v.in);
-              has = has && this.notInClause_(value, v.not_in);
+              has = has && this.notEqualsClause_(value, v.not_equals);
+              has = has && this.existsClause_(value, v.exists);
+              has = has && this.greaterThanClause_(value, v.greater_than);
+              has = has && this.greaterThanEqualClause_(value, v.greater_than_equal);
+              has = has && this.lessThanClause_(value, v.less_than);
+              has = has && this.lessThanEqualClause_(value, v.less_than_equal);
               has = has && this.likeClause_(value, v.like);
               has = has && this.containsClause_(value, v.contains);
+              has = has && this.inClause_(value, v.in);
+              has = has && this.notInClause_(value, v.not_in);
+              has = has && this.allClause_(value, v.all);
+              has = has && this.nearClause_(value, v.near);
             }
         }
       });
     }
     return has;
   }
-  whereItems_(items, where) {
+  /**
+  equals	The value must be exactly equal.
+  not_equals	The query will return all documents where the value is not equal.
+  exists	Only return documents where the value either exists (true) or does not exist (false).
+  greater_than	For numeric or date-based fields.
+  greater_than_equal	For numeric or date-based fields.
+  less_than	For numeric or date-based fields.
+  less_than_equal	For numeric or date-based fields.
+  like	Case-insensitive string must be present. If string of words, all words must be present, in any order.
+  contains	Must contain the value entered, case-insensitive.
+  in	The value must be found within the provided comma-delimited list of values.
+  not_in	The value must NOT be within the provided comma-delimited list of values.
+  all	The value must contain all values provided in the comma-delimited list.
+  near	For distance related to a point field comma separated as <longitude>, <latitude>, <maxDistance in meters (nullable)>, <minDistance in meters (nullable)>.
+  */
+  whereItems_(items, where, limit = -1) {
     if (typeof where === "object") {
-      items = items.filter((item) => this.whereItem_(item, where));
+      const whereItems = [];
+      for (const item of items) {
+        if (limit > -1 && whereItems.length >= limit) {
+          return whereItems;
+        }
+        if (this.whereItem_(item, where)) {
+          whereItems.push(item);
+        }
+      }
+      return whereItems;
     }
     return items;
   }
@@ -695,14 +768,12 @@ var JsonService = class {
   }
   // ^ sort
   // limit
-  /*
-  protected limitCollection_<B extends T = T>(items: B[], limit?: number): B[] {
+  limitCollection_(items, limit) {
     if (limit) {
       items = items.slice(0, Math.min(limit, items.length));
     }
     return items;
   }
-  */
   // ^ limit
   // pagination
   paginatedItems_(items, page = 1, limit = 10) {
@@ -732,6 +803,29 @@ var JsonService = class {
   }
   // ^ sort
 };
+function getValue(item, key) {
+  const keys = key.split(".");
+  const value = keys.reduce((p, c) => {
+    if (isObject(p)) {
+      return p[c];
+    } else {
+      return void 0;
+    }
+  }, item);
+  return value;
+}
+function calculateDistanceInMeters_(lon1, lat1, lon2, lat2) {
+  const R = 6371;
+  const dLat = deg2rad_(lat2 - lat1);
+  const dLon = deg2rad_(lon2 - lon1);
+  const a = Math.sin(dLat / 2) * Math.sin(dLat / 2) + Math.cos(deg2rad_(lat1)) * Math.cos(deg2rad_(lat2)) * Math.sin(dLon / 2) * Math.sin(dLon / 2);
+  const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+  const distance = R * c * 1e3;
+  return distance;
+}
+function deg2rad_(deg) {
+  return deg * (Math.PI / 180);
+}
 
 // src/locale/locale.ts
 function getDefaultLocale() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@websolutespa/bom-core",
-  "version": "1.7.10",
+  "version": "1.7.11",
   "description": "Core module of the BOM Repository",
   "keywords": [
     "bom",
@@ -15,7 +15,7 @@
   "scripts": {
     "lint": "eslint *.ts*",
     "test": "jest",
-    "test-watch": "npm test -- --watch",
+    "test-watch": "npm test -- --watch --silent=false",
     "coverage:integration": "npm run test -- --coverage",
     "coverage": "run-s -c --silent coverage:*",
     "compile": "tsup ./src/index.ts --format esm,cjs --dts --external react",