@futdevpro/fsm-dynamo 1.10.11 → 1.10.14

package/build/_models/control-models/service-endpoint-settings-base.control-model.d.ts

@@ -1,20 +1,20 @@
 import { DyFM_HttpCallType } from '../../_enums/http-call-type.enum';
-export interface DyFM_EndpointTypesContainer<T_Result, T_Inputs extends Array<any>, T_Body> {
+export interface DyFM_EndpointTypesContainer<T_Result, T_Inputs extends Array<any> = [], T_Body = undefined> {
     resultType: T_Result;
     inputTypes: T_Inputs;
     bodyType: T_Body;
 }
-export type DyFM_ServiceEndpointTypesSetting = {
+export type DyFM_ServiceEndpointTypesSettings = {
     [key: string]: DyFM_EndpointTypesContainer<unknown, any, unknown>;
 };
 export declare class DyFM_Endpoint_SettingsBase<T_Result, I_Inputs, T_Body> {
     name?: string;
     type?: DyFM_HttpCallType;
-    endPoint?: string;
+    endpoint?: string;
     pathParamKeys?: string[];
     constructor(set: DyFM_Endpoint_SettingsBase<T_Result, I_Inputs, T_Body>);
 }
-export type DyFM_ServiceEndpoint_SettingsBase<T extends DyFM_ServiceEndpointTypesSetting> = {
+export type DyFM_ServiceEndpoint_SettingsBase<T extends DyFM_ServiceEndpointTypesSettings> = {
     [K in keyof T]: DyFM_Endpoint_SettingsBase<T[K]['resultType'], T[K]['inputTypes'], T[K]['bodyType']>;
 };
 //# sourceMappingURL=service-endpoint-settings-base.control-model.d.ts.map

package/build/_models/control-models/service-endpoint-settings-base.control-model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service-endpoint-settings-base.control-model.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/service-endpoint-settings-base.control-model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAgBrE,MAAM,WAAW,2BAA2B,CAAC,QAAQ,EAAC,QAAQ,SAAS,KAAK,CAAC,GAAG,CAAC,EAAC,MAAM;IACtF,UAAU,EAAE,QAAQ,CAAC;IACrB,UAAU,EAAE,QAAQ,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;CAClB;AACD,MAAM,MAAM,gCAAgC,GAAG;IAC7C,CAAC,GAAG,EAAE,MAAM,GAAG,2BAA2B,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;CACnE,CAAA;AAED,qBAAa,0BAA0B,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM;IAChE,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,iBAAiB,CAAC;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAM;gBAG5B,GAAG,EAAE,0BAA0B,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC;CAI9D;AACD,MAAM,MAAM,iCAAiC,CAAC,CAAC,SAAS,gCAAgC,IAAI;KACzF,CAAC,IAAI,MAAM,CAAC,GAAG,0BAA0B,CACxC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CACzD;CACF,CAAA"}
+{"version":3,"file":"service-endpoint-settings-base.control-model.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/service-endpoint-settings-base.control-model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAgBrE,MAAM,WAAW,2BAA2B,CAC1C,QAAQ,EACR,QAAQ,SAAS,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,EAChC,MAAM,GAAG,SAAS;IAElB,UAAU,EAAE,QAAQ,CAAC;IACrB,UAAU,EAAE,QAAQ,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;CAClB;AACD,MAAM,MAAM,iCAAiC,GAAG;IAC9C,CAAC,GAAG,EAAE,MAAM,GAAG,2BAA2B,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;CACnE,CAAA;AAED,qBAAa,0BAA0B,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM;IAChE,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,iBAAiB,CAAC;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAM;gBAG5B,GAAG,EAAE,0BAA0B,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC;CAkB9D;AACD,MAAM,MAAM,iCAAiC,CAAC,CAAC,SAAS,iCAAiC,IAAI;KAC1F,CAAC,IAAI,MAAM,CAAC,GAAG,0BAA0B,CACxC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CACzD;CACF,CAAA"}

package/build/_models/control-models/service-endpoint-settings-base.control-model.js

@@ -4,10 +4,16 @@ exports.DyFM_Endpoint_SettingsBase = void 0;
 class DyFM_Endpoint_SettingsBase {
     name;
     type;
-    endPoint;
+    endpoint;
     pathParamKeys = [];
     constructor(set) {
+        if (set.endpoint.includes('{')) {
+            console.warn(`using {param} brackets in endpoint definitions will be deprecated... ` +
+                `\nuse :param instead ({pathParam} --> :pathParam) (${set.name})`);
+            set.endpoint = set.endpoint.replace(/{/g, ':').replace(/}/g, '');
+        }
         Object.assign(this, set);
+        this.pathParamKeys = this.endpoint.split('/').filter((part) => part.startsWith(':')).map((part) => part.replace(':', ''));
     }
 }
 exports.DyFM_Endpoint_SettingsBase = DyFM_Endpoint_SettingsBase;

package/build/_models/control-models/service-endpoint-settings-base.control-model.js.map

@@ -1 +1 @@
-{"version":3,"file":"service-endpoint-settings-base.control-model.js","sourceRoot":"","sources":["../../../src/_models/control-models/service-endpoint-settings-base.control-model.ts"],"names":[],"mappings":";;;AAyBA,MAAa,0BAA0B;IACrC,IAAI,CAAU;IACd,IAAI,CAAqB;IACzB,QAAQ,CAAU;IAElB,aAAa,GAAc,EAAE,CAAC;IAE9B,YACE,GAA2D;QAE3D,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC3B,CAAC;CACF;AAZD,gEAYC;AAOD;;;;;;;;;;;;;;;;;;;;;;IAsBI;AAIJ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA0CI"}
+{"version":3,"file":"service-endpoint-settings-base.control-model.js","sourceRoot":"","sources":["../../../src/_models/control-models/service-endpoint-settings-base.control-model.ts"],"names":[],"mappings":";;;AA6BA,MAAa,0BAA0B;IACrC,IAAI,CAAU;IACd,IAAI,CAAqB;IACzB,QAAQ,CAAU;IAElB,aAAa,GAAc,EAAE,CAAC;IAE9B,YACE,GAA2D;QAE3D,IAAI,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAC/B,OAAO,CAAC,IAAI,CACV,uEAAuE;gBACvE,sDAAsD,GAAG,CAAC,IAAI,GAAG,CAClE,CAAC;YACF,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACnE,CAAC;QAED,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAEzB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAClD,CAAC,IAAY,EAAW,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAChD,CAAC,GAAG,CACH,CAAC,IAAY,EAAU,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAChD,CAAC;IACJ,CAAC;CACF;AA1BD,gEA0BC;AAOD;;;;;;;;;;;;;;;;;;;;;;IAsBI;AAIJ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA0CI"}

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

@@ -6,7 +6,7 @@ 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>;
+    [K in keyof T_RootProperty]?: T_RootProperty[K] | T_RootProperty[K][] | DyFM_RangeValue<T_RootProperty[K]> | DyFM_SpecialSearch<T_RootProperty[K]> | DyFM_SpecialNestSearch<any>;
 };
 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
- * can search for nested properties in arrays as well with the following syntax used in key:
- * nestKeys: [ 'arrayProperty', '*', 'nestedPropertySearch' ]
+ * searches for a nested properties in the object
  */
 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>;
-    }[];
+    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_NestPropertySearch<T_NestedProperty> {
+    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 {
     /**

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;KAC1C,CAAC,IAAI,MAAM,cAAc,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC,GACjB,cAAc,CAAC,CAAC,CAAC,EAAE,GACnB,eAAe,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,GAClC,kBAAkB,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,GACrC,sBAAsB,CAAC,GAAG,CAAC;CAC1D,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,CAAC,gBAAgB;IACtD,mBAAmB,EAAE,IAAI,CAAC;IAC1B,sBAAsB,EAAE,uBAAuB,CAAC,GAAG,CAAC,EAAE,CAAC;CACxD;AACD;;;GAGG;AACH,MAAM,WAAW,uBAAuB,CAAC,gBAAgB;IACvD,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,YAAY,EAAE,uBAAuB,CAAC;IACtC,MAAM,EAAE,gBAAgB,GAChB,gBAAgB,EAAE,GAClB,eAAe,CAAC,gBAAgB,CAAC,GACjC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;CAC9C;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.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":";;;AA4CA,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,9 +1,15 @@
-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[];
     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":"AAGA,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,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,KAAK,GAAG,MAAM,GAAG,WAAW,GAAG,YAAY,CAAC;CAC7D"}

package/build/_modules/test/_collections/tst-module-settings.const.d.ts

@@ -1,3 +1,4 @@
+import { DyFM_EndpointTypesContainer, DyFM_ServiceEndpointTypesSettings } from '../../../_models/control-models/service-endpoint-settings-base.control-model';
 import { DyFM_Route_Settings } from '../../../_models/interfaces/route-settings.interface';
 export declare enum DyFM_TestRoute {
     testGet = "testGet",
@@ -12,4 +13,20 @@ export declare const DyFM_fullTestRoute: {
     testDelete: string;
     getServerStatus: string;
 };
+export interface DyFM_Test_EndpointTypeSettings extends DyFM_ServiceEndpointTypesSettings {
+    [DyFM_TestRoute.testGet]: DyFM_EndpointTypesContainer<DyFM_Test_Result>;
+    [DyFM_TestRoute.testPost]: DyFM_EndpointTypesContainer<DyFM_Test_Result, any, any>;
+    [DyFM_TestRoute.testDelete]: DyFM_EndpointTypesContainer<DyFM_Test_Result>;
+    [DyFM_TestRoute.getServerStatus]: DyFM_EndpointTypesContainer<{
+        status: 'ready';
+        version: string;
+        upTime: number;
+    }>;
+}
+interface DyFM_Test_Result {
+    url: string;
+    result: string;
+    request: any;
+}
+export {};
 //# sourceMappingURL=tst-module-settings.const.d.ts.map

package/build/_modules/test/_collections/tst-module-settings.const.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tst-module-settings.const.d.ts","sourceRoot":"","sources":["../../../../src/_modules/test/_collections/tst-module-settings.const.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,sDAAsD,CAAC;AAE3F,oBAAY,cAAc;IACxB,OAAO,YAAY;IACnB,QAAQ,aAAa;IACrB,UAAU,eAAe;IACzB,eAAe,oBAAoB;CACpC;AAED,eAAO,MAAM,wBAAwB,EAAE,mBAAmB,CAAC,cAAc,CAQxE,CAAC;AAEF,eAAO,MAAM,kBAAkB;;;;;CAS9B,CAAC"}
+{"version":3,"file":"tst-module-settings.const.d.ts","sourceRoot":"","sources":["../../../../src/_modules/test/_collections/tst-module-settings.const.ts"],"names":[],"mappings":"AACA,OAAO,EACL,2BAA2B,EAC3B,iCAAiC,EAClC,MAAM,8EAA8E,CAAC;AACtF,OAAO,EAAE,mBAAmB,EAAE,MAAM,sDAAsD,CAAC;AAE3F,oBAAY,cAAc;IACxB,OAAO,YAAY;IACnB,QAAQ,aAAa;IACrB,UAAU,eAAe;IACzB,eAAe,oBAAoB;CACpC;AAED,eAAO,MAAM,wBAAwB,EAAE,mBAAmB,CAAC,cAAc,CAQxE,CAAC;AAEF,eAAO,MAAM,kBAAkB;;;;;CAS9B,CAAC;AAEF,MAAM,WAAW,8BAA+B,SAAQ,iCAAiC;IACvF,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,2BAA2B,CAAC,gBAAgB,CAAC,CAAC;IACxE,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,2BAA2B,CAAC,gBAAgB,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IACnF,CAAC,cAAc,CAAC,UAAU,CAAC,EAAE,2BAA2B,CAAC,gBAAgB,CAAC,CAAC;IAC3E,CAAC,cAAc,CAAC,eAAe,CAAC,EAAE,2BAA2B,CAAC;QAC5D,MAAM,EAAE,OAAO,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC,CAAC;CACJ;AAED,UAAU,gBAAgB;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,GAAG,CAAC;CACd"}

package/build/_modules/test/_collections/tst-module-settings.const.js.map

@@ -1 +1 @@
-{"version":3,"file":"tst-module-settings.const.js","sourceRoot":"","sources":["../../../../src/_modules/test/_collections/tst-module-settings.const.ts"],"names":[],"mappings":";;;AAGA,IAAY,cAKX;AALD,WAAY,cAAc;IACxB,qCAAmB,CAAA;IACnB,uCAAqB,CAAA;IACrB,2CAAyB,CAAA;IACzB,qDAAmC,CAAA;AACrC,CAAC,EALW,cAAc,8BAAd,cAAc,QAKzB;AAEY,QAAA,wBAAwB,GAAwC;IAC3E,SAAS,EAAE,OAAO;IAClB,SAAS,EAAE;QACT,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,WAAW;QACrC,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,YAAY;QACvC,CAAC,cAAc,CAAC,UAAU,CAAC,EAAE,cAAc;QAC3C,CAAC,cAAc,CAAC,eAAe,CAAC,EAAE,gBAAgB;KACnD;CACF,CAAC;AAEW,QAAA,kBAAkB,GAAG;IAChC,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,gCAAwB,CAAC,SAAS;QAC1D,gCAAwB,CAAC,SAAS,CAAC,cAAc,CAAC,OAAO,CAAC;IAC5D,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,gCAAwB,CAAC,SAAS;QAC3D,gCAAwB,CAAC,SAAS,CAAC,cAAc,CAAC,QAAQ,CAAC;IAC7D,CAAC,cAAc,CAAC,UAAU,CAAC,EAAE,gCAAwB,CAAC,SAAS;QAC7D,gCAAwB,CAAC,SAAS,CAAC,cAAc,CAAC,UAAU,CAAC;IAC/D,CAAC,cAAc,CAAC,eAAe,CAAC,EAAE,gCAAwB,CAAC,SAAS;QAClE,gCAAwB,CAAC,SAAS,CAAC,cAAc,CAAC,eAAe,CAAC;CACrE,CAAC"}
+{"version":3,"file":"tst-module-settings.const.js","sourceRoot":"","sources":["../../../../src/_modules/test/_collections/tst-module-settings.const.ts"],"names":[],"mappings":";;;AAOA,IAAY,cAKX;AALD,WAAY,cAAc;IACxB,qCAAmB,CAAA;IACnB,uCAAqB,CAAA;IACrB,2CAAyB,CAAA;IACzB,qDAAmC,CAAA;AACrC,CAAC,EALW,cAAc,8BAAd,cAAc,QAKzB;AAEY,QAAA,wBAAwB,GAAwC;IAC3E,SAAS,EAAE,OAAO;IAClB,SAAS,EAAE;QACT,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,WAAW;QACrC,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,YAAY;QACvC,CAAC,cAAc,CAAC,UAAU,CAAC,EAAE,cAAc;QAC3C,CAAC,cAAc,CAAC,eAAe,CAAC,EAAE,gBAAgB;KACnD;CACF,CAAC;AAEW,QAAA,kBAAkB,GAAG;IAChC,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,gCAAwB,CAAC,SAAS;QAC1D,gCAAwB,CAAC,SAAS,CAAC,cAAc,CAAC,OAAO,CAAC;IAC5D,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,gCAAwB,CAAC,SAAS;QAC3D,gCAAwB,CAAC,SAAS,CAAC,cAAc,CAAC,QAAQ,CAAC;IAC7D,CAAC,cAAc,CAAC,UAAU,CAAC,EAAE,gCAAwB,CAAC,SAAS;QAC7D,gCAAwB,CAAC,SAAS,CAAC,cAAc,CAAC,UAAU,CAAC;IAC/D,CAAC,cAAc,CAAC,eAAe,CAAC,EAAE,gCAAwB,CAAC,SAAS;QAClE,gCAAwB,CAAC,SAAS,CAAC,cAAc,CAAC,eAAe,CAAC;CACrE,CAAC"}

package/build/_modules/usage/_collections/usg-module-settings.const.d.ts

@@ -1,4 +1,9 @@
+import { DyFM_RelativeDate } from '../../../_enums/time/relative-date.enum';
+import { DyFM_EndpointTypesContainer, DyFM_ServiceEndpointTypesSettings } from '../../../_models/control-models/service-endpoint-settings-base.control-model';
 import { DyFM_Route_Settings } from '../../../_models/interfaces/route-settings.interface';
+import { DyFM_DailyUsageData } from '../_models/usg-daily-usage-data.control-model';
+import { DyFM_UsageData } from '../_models/usg-data.control-model';
+import { DyFM_UsageSession } from '../_models/usg-session.data-model';
 export declare enum DyFM_UsageRoute {
     newSession = "newSession",
     closeSession = "closeSession",
@@ -6,4 +11,10 @@ export declare enum DyFM_UsageRoute {
     getUsageData = "getUsageData"
 }
 export declare const DyFM_usageModule_settings: DyFM_Route_Settings<DyFM_UsageRoute>;
+export interface DyFM_Usage_EndpointTypeSettings extends DyFM_ServiceEndpointTypesSettings {
+    [DyFM_UsageRoute.newSession]: DyFM_EndpointTypesContainer<DyFM_UsageSession>;
+    [DyFM_UsageRoute.closeSession]: DyFM_EndpointTypesContainer<DyFM_UsageSession, [string]>;
+    [DyFM_UsageRoute.updateUsage]: DyFM_EndpointTypesContainer<DyFM_UsageSession, [string, DyFM_UsageData[], DyFM_UsageData[]]>;
+    [DyFM_UsageRoute.getUsageData]: DyFM_EndpointTypesContainer<DyFM_DailyUsageData[], [DyFM_RelativeDate]>;
+}
 //# sourceMappingURL=usg-module-settings.const.d.ts.map

package/build/_modules/usage/_collections/usg-module-settings.const.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"usg-module-settings.const.d.ts","sourceRoot":"","sources":["../../../../src/_modules/usage/_collections/usg-module-settings.const.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,sDAAsD,CAAC;AAE3F,oBAAY,eAAe;IACzB,UAAU,eAAe;IACzB,YAAY,iBAAiB;IAC7B,WAAW,gBAAgB;IAC3B,YAAY,iBAAiB;CAC9B;AAED,eAAO,MAAM,yBAAyB,EAAE,mBAAmB,CAAC,eAAe,CAQ1E,CAAC"}
+{"version":3,"file":"usg-module-settings.const.d.ts","sourceRoot":"","sources":["../../../../src/_modules/usage/_collections/usg-module-settings.const.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EACL,2BAA2B,EAAE,iCAAiC,EAC/D,MAAM,8EAA8E,CAAC;AACtF,OAAO,EAAE,mBAAmB,EAAE,MAAM,sDAAsD,CAAC;AAC3F,OAAO,EAAE,mBAAmB,EAAE,MAAM,+CAA+C,CAAC;AACpF,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAEtE,oBAAY,eAAe;IACzB,UAAU,eAAe;IACzB,YAAY,iBAAiB;IAC7B,WAAW,gBAAgB;IAC3B,YAAY,iBAAiB;CAC9B;AAED,eAAO,MAAM,yBAAyB,EAAE,mBAAmB,CAAC,eAAe,CAQ1E,CAAC;AAEF,MAAM,WAAW,+BAAgC,SAAQ,iCAAiC;IACxF,CAAC,eAAe,CAAC,UAAU,CAAC,EAAE,2BAA2B,CAAC,iBAAiB,CAAC,CAAC;IAC7E,CAAC,eAAe,CAAC,YAAY,CAAC,EAAE,2BAA2B,CAAC,iBAAiB,EAAE,CAAE,MAAM,CAAE,CAAC,CAAC;IAC3F,CAAC,eAAe,CAAC,WAAW,CAAC,EAAE,2BAA2B,CAAC,iBAAiB,EAAE,CAAE,MAAM,EAAE,cAAc,EAAE,EAAE,cAAc,EAAE,CAAE,CAAC,CAAC;IAC9H,CAAC,eAAe,CAAC,YAAY,CAAC,EAAE,2BAA2B,CAAC,mBAAmB,EAAE,EAAE,CAAE,iBAAiB,CAAE,CAAC,CAAC;CAC3G"}

package/build/_modules/usage/_collections/usg-module-settings.const.js.map

@@ -1 +1 @@
-{"version":3,"file":"usg-module-settings.const.js","sourceRoot":"","sources":["../../../../src/_modules/usage/_collections/usg-module-settings.const.ts"],"names":[],"mappings":";;;AAGA,IAAY,eAKX;AALD,WAAY,eAAe;IACzB,4CAAyB,CAAA;IACzB,gDAA6B,CAAA;IAC7B,8CAA2B,CAAA;IAC3B,gDAA6B,CAAA;AAC/B,CAAC,EALW,eAAe,+BAAf,eAAe,QAK1B;AAEY,QAAA,yBAAyB,GAAyC;IAC7E,SAAS,EAAE,QAAQ;IACnB,SAAS,EAAE;QACT,CAAC,eAAe,CAAC,UAAU,CAAC,EAAE,cAAc;QAC5C,CAAC,eAAe,CAAC,YAAY,CAAC,EAAE,2BAA2B;QAC3D,CAAC,eAAe,CAAC,WAAW,CAAC,EAAG,oBAAoB;QACpD,CAAC,eAAe,CAAC,YAAY,CAAC,EAAE,aAAa;KAC9C;CACF,CAAC"}
+{"version":3,"file":"usg-module-settings.const.js","sourceRoot":"","sources":["../../../../src/_modules/usage/_collections/usg-module-settings.const.ts"],"names":[],"mappings":";;;AAUA,IAAY,eAKX;AALD,WAAY,eAAe;IACzB,4CAAyB,CAAA;IACzB,gDAA6B,CAAA;IAC7B,8CAA2B,CAAA;IAC3B,gDAA6B,CAAA;AAC/B,CAAC,EALW,eAAe,+BAAf,eAAe,QAK1B;AAEY,QAAA,yBAAyB,GAAyC;IAC7E,SAAS,EAAE,QAAQ;IACnB,SAAS,EAAE;QACT,CAAC,eAAe,CAAC,UAAU,CAAC,EAAE,cAAc;QAC5C,CAAC,eAAe,CAAC,YAAY,CAAC,EAAE,2BAA2B;QAC3D,CAAC,eAAe,CAAC,WAAW,CAAC,EAAG,oBAAoB;QACpD,CAAC,eAAe,CAAC,YAAY,CAAC,EAAE,aAAa;KAC9C;CACF,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@futdevpro/fsm-dynamo",
-  "version": "01.10.11",
+  "version": "01.10.14",
   "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/control-models/service-endpoint-settings-base.control-model.ts

@@ -14,29 +14,47 @@ class SomethingElse {
  */
 
 
-export interface DyFM_EndpointTypesContainer<T_Result,T_Inputs extends Array<any>,T_Body> {
+export interface DyFM_EndpointTypesContainer<
+  T_Result,
+  T_Inputs extends Array<any> = [],
+  T_Body = undefined
+> {
   resultType: T_Result;
   inputTypes: T_Inputs;
   bodyType: T_Body;
 }
-export type DyFM_ServiceEndpointTypesSetting = {
+export type DyFM_ServiceEndpointTypesSettings = {
   [key: string]: DyFM_EndpointTypesContainer<unknown, any, unknown>;
 }
 
 export class DyFM_Endpoint_SettingsBase<T_Result, I_Inputs, T_Body> {
   name?: string;
   type?: DyFM_HttpCallType;
-  endPoint?: string;
+  endpoint?: string;
 
   pathParamKeys?: string[] = [];
 
   constructor(
     set: DyFM_Endpoint_SettingsBase<T_Result, I_Inputs, T_Body>
   ) {
+    if (set.endpoint.includes('{')) {
+      console.warn(
+        `using {param} brackets in endpoint definitions will be deprecated... ` +
+        `\nuse :param instead ({pathParam} --> :pathParam) (${set.name})`
+      );
+      set.endpoint = set.endpoint.replace(/{/g, ':').replace(/}/g, '');
+    }
+
     Object.assign(this, set);
+    
+    this.pathParamKeys = this.endpoint.split('/').filter(
+      (part: string): boolean => part.startsWith(':')
+    ).map(
+      (part: string): string => part.replace(':', '')
+    );
   }
 }
-export type DyFM_ServiceEndpoint_SettingsBase<T extends DyFM_ServiceEndpointTypesSetting> = {
+export type DyFM_ServiceEndpoint_SettingsBase<T extends DyFM_ServiceEndpointTypesSettings> = {
   [K in keyof T]: DyFM_Endpoint_SettingsBase<
     T[K]['resultType'], T[K]['inputTypes'], T[K]['bodyType']
   >;

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

@@ -9,12 +9,11 @@ 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>;
+  [K in keyof T_RootProperty]?: T_RootProperty[K] | 
+                                T_RootProperty[K][] | 
+                                DyFM_RangeValue<T_RootProperty[K]> | 
+                                DyFM_SpecialSearch<T_RootProperty[K]> |
+                                DyFM_SpecialNestSearch<any>;
 };
 
 export interface DyFM_SpecialSearch<T> {
@@ -24,20 +23,23 @@ export interface DyFM_SpecialSearch<T> {
 }
 
 /**
- * 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' ]
+ * searches for a nested properties in the object
  */
 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>;
-  }[];
+  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_NestPropertySearch<T_NestedProperty> {
+  nestKeys: string[];
+  propertyType: DyFM_BasicProperty_Type;
+  search: T_NestedProperty | 
+          T_NestedProperty[] | 
+          DyFM_RangeValue<T_NestedProperty> |
+          DyFM_SpecialSearch<T_NestedProperty>;
 }
 
 export enum DyFM_SpecialSearch_Type {

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

@@ -1,11 +1,19 @@
 
 
-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[];
   order: 1 | -1 | 'asc' | 'desc' | 'ascending' | 'descending';
 }
 

package/src/_modules/test/_collections/tst-module-settings.const.ts

@@ -1,4 +1,8 @@
 
+import {
+  DyFM_EndpointTypesContainer,
+  DyFM_ServiceEndpointTypesSettings
+} from '../../../_models/control-models/service-endpoint-settings-base.control-model';
 import { DyFM_Route_Settings } from '../../../_models/interfaces/route-settings.interface';
 
 export enum DyFM_TestRoute {
@@ -29,3 +33,20 @@ export const DyFM_fullTestRoute = {
     DyFM_testModule_settings.endPoints[DyFM_TestRoute.getServerStatus],
 };
 
+export interface DyFM_Test_EndpointTypeSettings extends DyFM_ServiceEndpointTypesSettings {
+  [DyFM_TestRoute.testGet]: DyFM_EndpointTypesContainer<DyFM_Test_Result>;
+  [DyFM_TestRoute.testPost]: DyFM_EndpointTypesContainer<DyFM_Test_Result, any, any>;
+  [DyFM_TestRoute.testDelete]: DyFM_EndpointTypesContainer<DyFM_Test_Result>;
+  [DyFM_TestRoute.getServerStatus]: DyFM_EndpointTypesContainer<{
+    status: 'ready',
+    version: string,
+    upTime: number,
+  }>;
+}
+
+interface DyFM_Test_Result {
+  url: string;
+  result: string;
+  request: any;
+}
+

package/src/_modules/usage/_collections/usg-module-settings.const.ts

@@ -1,5 +1,12 @@
 
+import { DyFM_RelativeDate } from '../../../_enums/time/relative-date.enum';
+import {
+  DyFM_EndpointTypesContainer, DyFM_ServiceEndpointTypesSettings
+} from '../../../_models/control-models/service-endpoint-settings-base.control-model';
 import { DyFM_Route_Settings } from '../../../_models/interfaces/route-settings.interface';
+import { DyFM_DailyUsageData } from '../_models/usg-daily-usage-data.control-model';
+import { DyFM_UsageData } from '../_models/usg-data.control-model';
+import { DyFM_UsageSession } from '../_models/usg-session.data-model';
 
 export enum DyFM_UsageRoute {
   newSession = 'newSession',
@@ -17,3 +24,10 @@ export const DyFM_usageModule_settings: DyFM_Route_Settings<DyFM_UsageRoute> = {
     [DyFM_UsageRoute.getUsageData]: '/get/:range',
   },
 };
+
+export interface DyFM_Usage_EndpointTypeSettings extends DyFM_ServiceEndpointTypesSettings {
+  [DyFM_UsageRoute.newSession]: DyFM_EndpointTypesContainer<DyFM_UsageSession>;
+  [DyFM_UsageRoute.closeSession]: DyFM_EndpointTypesContainer<DyFM_UsageSession, [ string ]>;
+  [DyFM_UsageRoute.updateUsage]: DyFM_EndpointTypesContainer<DyFM_UsageSession, [ string, DyFM_UsageData[], DyFM_UsageData[] ]>;
+  [DyFM_UsageRoute.getUsageData]: DyFM_EndpointTypesContainer<DyFM_DailyUsageData[], [ DyFM_RelativeDate ]>;
+}