@futdevpro/fsm-dynamo 1.10.8 → 1.10.10

package/build/_models/types/db-/304/221filter.type.d.ts

@@ -5,15 +5,26 @@ import { DyFM_RangeValue } from '../control-models/range-value.control-model';
  *
  * it should be the value, a range or an array of the searching values
  */
-export type DyFM_DBĐFilter<T> = {
-    [K in keyof T]?: T[K] | T[K][] | DyFM_RangeValue<T[K]> | DyFM_SpecialSearch<T[K]>;
+export type DyFM_DBĐFilter<T_RootProperty> = {
+    [K in keyof T_RootProperty]?: T_RootProperty[K] | T_RootProperty[K][] | DyFM_RangeValue<T_RootProperty[K]> | DyFM_SpecialSearch<T_RootProperty> | DyFM_SpecialNestSearch<any>;
 };
 export interface DyFM_SpecialSearch<T> {
-    specialSearchConfig: true;
-    searchValue: T;
+    isSpecialSearch: true;
+    searchValue: T | T[];
     type: DyFM_SpecialSearch_Type;
-    /** only required when searching nested property */
-    propertyType?: DyFM_BasicProperty_Type;
+}
+/**
+ * searches for a nested property in the object
+ * can search for nested properties in arrays as well with the following syntax used in key:
+ * nestKeys: [ 'arrayProperty', '*', 'nestedPropertySearch' ]
+ */
+export interface DyFM_SpecialNestSearch<T_NestedProperty> {
+    isSpecialNestSearch: true;
+    nestedPropertySearches: {
+        nestKeys: string[];
+        propertyType: DyFM_BasicProperty_Type;
+        search: T_NestedProperty | T_NestedProperty[] | DyFM_RangeValue<T_NestedProperty> | DyFM_SpecialSearch<T_NestedProperty>;
+    }[];
 }
 export declare enum DyFM_SpecialSearch_Type {
     /**
@@ -27,12 +38,6 @@ export declare enum DyFM_SpecialSearch_Type {
     /**
      * searches each word in the string, returns true if ALL words are found in the SAME order
      * */
-    stringListSearchOrdered = "stringListSearchOrdered",
-    /**
-     * searches for a nested property in the object
-     * can search for nested properties in arrays as well with the following syntax used in key:
-     * 'arrayProperty[*].nestedPropertySearch'
-     */
-    nestedPropertySearch = "nestedPropertySearch"
+    stringListSearchOrdered = "stringListSearchOrdered"
 }
 //# sourceMappingURL=db-%C4%91filter.type.d.ts.map

package/build/_models/types/db-/304/221filter.type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"db-đfilter.type.d.ts","sourceRoot":"","sources":["../../../src/_models/types/db-đfilter.type.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAE9E;;;;GAIG;AACH,MAAM,MAAM,cAAc,CAAC,CAAC,IAAI;KAC7B,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAClF,CAAC;AAEF,MAAM,WAAW,kBAAkB,CAAC,CAAC;IACnC,mBAAmB,EAAE,IAAI,CAAC;IAC1B,WAAW,EAAE,CAAC,CAAC;IACf,IAAI,EAAE,uBAAuB,CAAC;IAC9B,mDAAmD;IACnD,YAAY,CAAC,EAAE,uBAAuB,CAAC;CACxC;AAED,oBAAY,uBAAuB;IACjC;;SAEK;IACL,mBAAmB,wBAAwB;IAC3C;;SAEK;IACL,gBAAgB,qBAAqB;IACrC;;SAEK;IACL,uBAAuB,4BAA4B;IACnD;;;;OAIG;IACH,oBAAoB,yBAAyB;CAC9C"}
+{"version":3,"file":"db-đfilter.type.d.ts","sourceRoot":"","sources":["../../../src/_models/types/db-đfilter.type.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAE9E;;;;GAIG;AACH,MAAM,MAAM,cAAc,CAAC,cAAc,IAAI;KAC1C,CAAC,IAAI,MAAM,cAAc,CAAC,CAAC,EAC1B,cAAc,CAAC,CAAC,CAAC,GACjB,cAAc,CAAC,CAAC,CAAC,EAAE,GACnB,eAAe,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,GAClC,kBAAkB,CAAC,cAAc,CAAC,GAClC,sBAAsB,CAAC,GAAG,CAAC;CAC9B,CAAC;AAEF,MAAM,WAAW,kBAAkB,CAAC,CAAC;IACnC,eAAe,EAAE,IAAI,CAAC;IACtB,WAAW,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC;IACrB,IAAI,EAAE,uBAAuB,CAAC;CAC/B;AAED;;;;GAIG;AACH,MAAM,WAAW,sBAAsB,CAAC,gBAAgB;IACtD,mBAAmB,EAAE,IAAI,CAAC;IAC1B,sBAAsB,EAAE;QACtB,QAAQ,EAAE,MAAM,EAAE,CAAC;QACnB,YAAY,EAAE,uBAAuB,CAAC;QACtC,MAAM,EAAE,gBAAgB,GACtB,gBAAgB,EAAE,GAClB,eAAe,CAAC,gBAAgB,CAAC,GACjC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;KACxC,EAAE,CAAC;CACL;AAED,oBAAY,uBAAuB;IACjC;;SAEK;IACL,mBAAmB,wBAAwB;IAC3C;;SAEK;IACL,gBAAgB,qBAAqB;IACrC;;SAEK;IACL,uBAAuB,4BAA4B;CAOpD"}

package/build/_models/types/db-/304/221filter.type.js

@@ -18,8 +18,8 @@ var DyFM_SpecialSearch_Type;
     /**
      * searches for a nested property in the object
      * can search for nested properties in arrays as well with the following syntax used in key:
-     * 'arrayProperty[*].nestedPropertySearch'
+     * nestKeys: [ 'arrayProperty', '*', 'nestedPropertySearch' ]
      */
-    DyFM_SpecialSearch_Type["nestedPropertySearch"] = "nestedPropertySearch";
+    /* nestedPropertySearch = 'nestedPropertySearch', */
 })(DyFM_SpecialSearch_Type || (exports.DyFM_SpecialSearch_Type = DyFM_SpecialSearch_Type = {}));
 //# sourceMappingURL=db-%C4%91filter.type.js.map

package/build/_models/types/db-/304/221filter.type.js.map

@@ -1 +1 @@
-{"version":3,"file":"db-đfilter.type.js","sourceRoot":"","sources":["../../../src/_models/types/db-đfilter.type.ts"],"names":[],"mappings":";;;AAsBA,IAAY,uBAmBX;AAnBD,WAAY,uBAAuB;IACjC;;SAEK;IACL,sEAA2C,CAAA;IAC3C;;SAEK;IACL,gEAAqC,CAAA;IACrC;;SAEK;IACL,8EAAmD,CAAA;IACnD;;;;OAIG;IACH,wEAA6C,CAAA;AAC/C,CAAC,EAnBW,uBAAuB,uCAAvB,uBAAuB,QAmBlC"}
+{"version":3,"file":"db-đfilter.type.js","sourceRoot":"","sources":["../../../src/_models/types/db-đfilter.type.ts"],"names":[],"mappings":";;;AA0CA,IAAY,uBAmBX;AAnBD,WAAY,uBAAuB;IACjC;;SAEK;IACL,sEAA2C,CAAA;IAC3C;;SAEK;IACL,gEAAqC,CAAA;IACrC;;SAEK;IACL,8EAAmD,CAAA;IACnD;;;;OAIG;IACH,oDAAoD;AACtD,CAAC,EAnBW,uBAAuB,uCAAvB,uBAAuB,QAmBlC"}

package/build/_models/types/db-/304/221sort.type.d.ts

@@ -1,5 +1,9 @@
 export type DyFM_DBĐSort = {
-    key: string;
+    /**
+     * the key to sort by
+     * (can be an array that is used for sorting by nested properties)
+     */
+    key: string | string[];
     order: 1 | -1 | 'asc' | 'desc' | 'ascending' | 'descending';
 };
 //# sourceMappingURL=db-%C4%91sort.type.d.ts.map

package/build/_models/types/db-/304/221sort.type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"db-đsort.type.d.ts","sourceRoot":"","sources":["../../../src/_models/types/db-đsort.type.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,YAAY,GAAG;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,KAAK,GAAG,MAAM,GAAG,WAAW,GAAG,YAAY,CAAC;CAC7D,CAAA"}
+{"version":3,"file":"db-đsort.type.d.ts","sourceRoot":"","sources":["../../../src/_models/types/db-đsort.type.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,YAAY,GAAG;IACzB;;;OAGG;IACH,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACvB,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,KAAK,GAAG,MAAM,GAAG,WAAW,GAAG,YAAY,CAAC;CAC7D,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@futdevpro/fsm-dynamo",
-  "version": "01.10.08",
+  "version": "01.10.10",
   "description": "Full Stack Model Collection for Dynamic (NodeJS-Typescript) Framework called Dynamo, by Future Development Ltd.",
   "scripts": {
     "prep": "npm i pnpm -g && npm i rimraf nodemon -g",

package/src/_models/types/db-/304/221filter.type.ts

@@ -8,16 +8,36 @@ import { DyFM_RangeValue } from '../control-models/range-value.control-model';
  * 
  * it should be the value, a range or an array of the searching values
  */
-export type DyFM_DBĐFilter<T> = {
-  [K in keyof T]?: T[K] | T[K][] | DyFM_RangeValue<T[K]> | DyFM_SpecialSearch<T[K]>
+export type DyFM_DBĐFilter<T_RootProperty> = {
+  [K in keyof T_RootProperty]?: 
+    T_RootProperty[K] | 
+    T_RootProperty[K][] | 
+    DyFM_RangeValue<T_RootProperty[K]> | 
+    DyFM_SpecialSearch<T_RootProperty> |
+    DyFM_SpecialNestSearch<any>;
 };
 
 export interface DyFM_SpecialSearch<T> {
-  specialSearchConfig: true;
-  searchValue: T;
+  isSpecialSearch: true;
+  searchValue: T | T[];
   type: DyFM_SpecialSearch_Type;
-  /** only required when searching nested property */
-  propertyType?: DyFM_BasicProperty_Type;
+}
+
+/**
+ * searches for a nested property in the object
+ * can search for nested properties in arrays as well with the following syntax used in key:
+ * nestKeys: [ 'arrayProperty', '*', 'nestedPropertySearch' ]
+ */
+export interface DyFM_SpecialNestSearch<T_NestedProperty> {
+  isSpecialNestSearch: true;
+  nestedPropertySearches: {
+    nestKeys: string[];
+    propertyType: DyFM_BasicProperty_Type;
+    search: T_NestedProperty | 
+      T_NestedProperty[] | 
+      DyFM_RangeValue<T_NestedProperty> |
+      DyFM_SpecialSearch<T_NestedProperty>;
+  }[];
 }
 
 export enum DyFM_SpecialSearch_Type {
@@ -36,9 +56,9 @@ export enum DyFM_SpecialSearch_Type {
   /**
    * searches for a nested property in the object
    * can search for nested properties in arrays as well with the following syntax used in key:
-   * 'arrayProperty[*].nestedPropertySearch'
+   * nestKeys: [ 'arrayProperty', '*', 'nestedPropertySearch' ]
    */
-  nestedPropertySearch = 'nestedPropertySearch',
+  /* nestedPropertySearch = 'nestedPropertySearch', */
 }
 
 

package/src/_models/types/db-/304/221sort.type.ts

@@ -1,7 +1,11 @@
 
 
 export type DyFM_DBĐSort = {
-  key: string;
+  /** 
+   * the key to sort by   
+   * (can be an array that is used for sorting by nested properties)
+   */
+  key: string | string[];
   order: 1 | -1 | 'asc' | 'desc' | 'ascending' | 'descending';
 }