@futdevpro/fsm-dynamo 1.10.12 → 1.10.15

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

@@ -5,8 +5,8 @@ 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_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 type DyFM_DBĐFilter<T> = {
+    [K in keyof T]?: T[K] | T[K][] | DyFM_RangeValue<T[K]> | DyFM_SpecialSearch<T[K]> | DyFM_SpecialNestSearch;
 };
 export interface DyFM_SpecialSearch<T> {
     isSpecialSearch: true;
@@ -14,17 +14,20 @@ export interface DyFM_SpecialSearch<T> {
     type: DyFM_SpecialSearch_Type;
 }
 /**
- * searches for a nested property in the object
+ * searches for a nested properties in the object
+ */
+export interface DyFM_SpecialNestSearch {
+    isSpecialNestSearch: true;
+    nestedPropertySearches: DyFM_NestPropertySearch<any>[];
+}
+/**
  * 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 interface DyFM_NestPropertySearch<T> {
+    nestKeys: string[];
+    valueType: DyFM_BasicProperty_Type;
+    search: T | T[] | DyFM_RangeValue<T> | DyFM_SpecialSearch<T>;
 }
 export declare enum DyFM_SpecialSearch_Type {
     /**

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;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"}
+{"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,EAAG,CAAC,CAAC,CAAC,CAAC,GACJ,CAAC,CAAC,CAAC,CAAC,EAAE,GACN,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GACrB,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GACxB,sBAAsB;CACzC,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;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,mBAAmB,EAAE,IAAI,CAAC;IAC1B,sBAAsB,EAAE,uBAAuB,CAAC,GAAG,CAAC,EAAE,CAAC;CACxD;AAED;;;GAGG;AACH,MAAM,WAAW,uBAAuB,CAAC,CAAC;IACxC,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,EAAE,uBAAuB,CAAC;IACnC,MAAM,EAAE,CAAC,GACD,CAAC,EAAE,GACH,eAAe,CAAC,CAAC,CAAC,GAClB,kBAAkB,CAAC,CAAC,CAAC,CAAC;CAC/B;AAED,oBAAY,uBAAuB;IACjC;;SAEK;IACL,mBAAmB,wBAAwB;IAC3C;;SAEK;IACL,gBAAgB,qBAAqB;IACrC;;SAEK;IACL,uBAAuB,4BAA4B;CACpD"}

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

@@ -15,11 +15,5 @@ var DyFM_SpecialSearch_Type;
      * searches each word in the string, returns true if ALL words are found in the SAME order
      * */
     DyFM_SpecialSearch_Type["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:
-     * nestKeys: [ 'arrayProperty', '*', '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":";;;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"}
+{"version":3,"file":"db-đfilter.type.js","sourceRoot":"","sources":["../../../src/_models/types/db-đfilter.type.ts"],"names":[],"mappings":";;;AA6CA,IAAY,uBAaX;AAbD,WAAY,uBAAuB;IACjC;;SAEK;IACL,sEAA2C,CAAA;IAC3C;;SAEK;IACL,gEAAqC,CAAA;IACrC;;SAEK;IACL,8EAAmD,CAAA;AACrD,CAAC,EAbW,uBAAuB,uCAAvB,uBAAuB,QAalC"}

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

@@ -1,9 +1,17 @@
-export type DyFM_DBĐSort = {
+import { DyFM_BasicProperty_Type } from '../../_enums/basic-property-type.enum';
+export type DyFM_DBĐSort = DyFM_DBĐPropertySort | DyFM_DBĐNestedPropertySort;
+export interface DyFM_DBĐPropertySort {
+    key: string;
+    order: 1 | -1 | 'asc' | 'desc' | 'ascending' | 'descending';
+}
+export interface DyFM_DBĐNestedPropertySort {
+    isNestedPropertySort: true;
     /**
      * the key to sort by
      * (can be an array that is used for sorting by nested properties)
      */
-    key: string | string[];
+    nestKeys: string[];
+    valueType: DyFM_BasicProperty_Type;
     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;;;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"}
+{"version":3,"file":"db-đsort.type.d.ts","sourceRoot":"","sources":["../../../src/_models/types/db-đsort.type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAIhF,MAAM,MAAM,YAAY,GAAG,oBAAoB,GAAG,0BAA0B,CAAC;AAC7E,MAAM,WAAW,oBAAoB;IACnC,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,KAAK,GAAG,MAAM,GAAG,WAAW,GAAG,YAAY,CAAC;CAC7D;AAED,MAAM,WAAW,0BAA0B;IACzC,oBAAoB,EAAE,IAAI,CAAC;IAC3B;;;OAGG;IACH,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,EAAE,uBAAuB,CAAC;IACnC,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,KAAK,GAAG,MAAM,GAAG,WAAW,GAAG,YAAY,CAAC;CAC7D"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@futdevpro/fsm-dynamo",
-  "version": "01.10.12",
+  "version": "01.10.15",
   "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,13 +8,12 @@ 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_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 type DyFM_DBĐFilter<T> = {
+  [K in keyof T]?:  T[K] | 
+                    T[K][] | 
+                    DyFM_RangeValue<T[K]> | 
+                    DyFM_SpecialSearch<T[K]> |
+                    DyFM_SpecialNestSearch;
 };
 
 export interface DyFM_SpecialSearch<T> {
@@ -24,20 +23,24 @@ export interface DyFM_SpecialSearch<T> {
 }
 
 /**
- * searches for a nested property in the object
+ * searches for a nested properties in the object
+ */
+export interface DyFM_SpecialNestSearch {
+  isSpecialNestSearch: true;
+  nestedPropertySearches: DyFM_NestPropertySearch<any>[];
+}
+
+/**
  * 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 interface DyFM_NestPropertySearch<T> {
+  nestKeys: string[];
+  valueType: DyFM_BasicProperty_Type;
+  search: T | 
+          T[] | 
+          DyFM_RangeValue<T> |
+          DyFM_SpecialSearch<T>;
 }
 
 export enum DyFM_SpecialSearch_Type {
@@ -53,12 +56,6 @@ export 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:
-   * nestKeys: [ 'arrayProperty', '*', 'nestedPropertySearch' ]
-   */
-  /* nestedPropertySearch = 'nestedPropertySearch', */
 }
 
 

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

@@ -1,11 +1,21 @@
+import { DyFM_BasicProperty_Type } from '../../_enums/basic-property-type.enum';
 
 
-export type DyFM_DBĐSort = {
+
+export type DyFM_DBĐSort = DyFM_DBĐPropertySort | DyFM_DBĐNestedPropertySort;
+export interface DyFM_DBĐPropertySort {
+  key: string;
+  order: 1 | -1 | 'asc' | 'desc' | 'ascending' | 'descending';
+}
+
+export interface DyFM_DBĐNestedPropertySort {
+  isNestedPropertySort: true;
   /** 
    * the key to sort by   
    * (can be an array that is used for sorting by nested properties)
    */
-  key: string | string[];
+  nestKeys: string[];
+  valueType: DyFM_BasicProperty_Type;
   order: 1 | -1 | 'asc' | 'desc' | 'ascending' | 'descending';
 }