@futdevpro/nts-dynamo 1.9.18 → 1.9.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@futdevpro/nts-dynamo",
-  "version": "01.09.18",
+  "version": "01.09.21",
   "description": "Dynamic NodeTS (NodeJS-Typescript), MongoDB Backend System Framework by Future Development Program Ltd.",
   "scripts": {
     "prep": "npm i rimraf nodemon -g",
@@ -31,29 +31,17 @@
       "types": "./build/index.d.ts",
       "typings": "./build/index.d.ts"
     },
-    "./constants": {
-      "default": "./build/_constants/index.js",
-      "module": "./build/_constants/index.js",
-      "types": "./build/_constants/index.d.ts",
-      "typings": "./build/_constants/index.d.ts"
-    },
-    "./enums": {
-      "default": "./build/_enums/index.js",
-      "module": "./build/_enums/index.js",
-      "types": "./build/_enums/index.d.ts",
-      "typings": "./build/_enums/index.d.ts"
-    },
-    "./models": {
-      "default": "./build/_models/index.js",
-      "module": "./build/_models/index.js",
-      "types": "./build/_models/index.d.ts",
-      "typings": "./build/_models/index.d.ts"
+    "./custom-data-module": {
+      "default": "./build/_modules/custom-data/index.js",
+      "module": "./build/_modules/custom-data/index.js",
+      "types": "./build/_modules/custom-data/index.d.ts",
+      "typings": "./build/_modules/custom-data/index.d.ts"
     },
-    "./services": {
-      "default": "./build/_services/index.js",
-      "module": "./build/_services/index.js",
-      "types": "./build/_services/index.d.ts",
-      "typings": "./build/_services/index.d.ts"
+    "./mock": {
+      "default": "./build/_mock/index.js",
+      "module": "./build/_mock/index.js",
+      "types": "./build/_mock/index.d.ts",
+      "typings": "./build/_mock/index.d.ts"
     },
     "./test-module": {
       "default": "./build/_modules/test/index.js",
@@ -61,18 +49,18 @@
       "types": "./build/_modules/test/index.d.ts",
       "typings": "./build/_modules/test/index.d.ts"
     },
-    "./custom-data-module": {
-      "default": "./build/_modules/custom-data/index.js",
-      "module": "./build/_modules/custom-data/index.js",
-      "types": "./build/_modules/custom-data/index.d.ts",
-      "typings": "./build/_modules/custom-data/index.d.ts"
-    },
     "./usage-module": {
       "default": "./build/_modules/usage/index.js",
       "module": "./build/_modules/usage/index.js",
       "types": "./build/_modules/usage/index.d.ts",
       "typings": "./build/_modules/usage/index.d.ts"
     },
+    "./api-service": {
+      "default": "./build/_modules/api-service.index.js",
+      "module": "./build/_modules/api-service.index.js",
+      "types": "./build/_modules/api-service.index.d.ts",
+      "typings": "./build/_modules/api-service.index.d.ts"
+    },
     "./app": {
       "default": "./build/_modules/app.index.js",
       "module": "./build/_modules/app.index.js",
@@ -91,24 +79,12 @@
       "types": "./build/_modules/auth.index.d.ts",
       "typings": "./build/_modules/auth.index.d.ts"
     },
-    "./api-service": {
-      "default": "./build/_modules/api-service.index.js",
-      "module": "./build/_modules/api-service.index.js",
-      "types": "./build/_modules/api-service.index.d.ts",
-      "typings": "./build/_modules/api-service.index.d.ts"
-    },
     "./controller": {
       "default": "./build/_modules/controller.index.js",
       "module": "./build/_modules/controller.index.js",
       "types": "./build/_modules/controller.index.d.ts",
       "typings": "./build/_modules/controller.index.d.ts"
     },
-    "./data-models": {
-      "default": "./build/_modules/data-models.index.js",
-      "module": "./build/_modules/data-models.index.js",
-      "types": "./build/_modules/data-models.index.d.ts",
-      "typings": "./build/_modules/data-models.index.d.ts"
-    },
     "./data-service": {
       "default": "./build/_modules/data-service.index.js",
       "module": "./build/_modules/data-service.index.js",
@@ -130,24 +106,15 @@
   },
   "typesVersions": {
     "*": {
-      "enums": [
-        "build/_enums/index.d.ts"
-      ],
-      "constants": [
-        "build/_constants/index.d.ts"
-      ],
-      "models": [
-        "build/_models/index.d.ts"
+      "custom-data-module": [
+        "build/_modules/custom-data/index.d.ts"
       ],
-      "services": [
-        "build/_services/index.d.ts"
+      "mock": [
+        "build/_modules/mock/index.d.ts"
       ],
       "test-module": [
         "build/_modules/test/index.d.ts"
       ],
-      "custom-data-module": [
-        "build/_modules/custom-data/index.d.ts"
-      ],
       "usage-module": [
         "build/_modules/usage/index.d.ts"
       ],
@@ -166,9 +133,6 @@
       "controller": [
         "build/_modules/controller.index.d.ts"
       ],
-      "data-models": [
-        "build/_modules/data-models.index.d.ts"
-      ],
       "data-service": [
         "build/_modules/data-service.index.d.ts"
       ],
@@ -202,35 +166,35 @@
     "emty": ""
   },
   "peerDependencies": {
-    "@futdevpro/fsm-dynamo": "~1.9.16",
-    "@types/express": "^4.17.17",
-    "@types/geoip-lite": "^1.4.1",
-    "@types/node": "^20.5.7",
-    "@types/nodemailer": "^6.4.9",
-    "axios": "^1.5.0",
-    "express": "^4.18.2",
-    "geoip-lite": "^1.4.7",
-    "mongoose": "^5.13.20",
-    "nodemailer": "^6.9.4",
-    "rxjs": "^7.8.1",
-    "ts-node": "^10.9.1",
-    "body-parser": "^1.20.2"
+    "@futdevpro/fsm-dynamo": "~1.9.18",
+    "@types/express": "~4.17.17",
+    "@types/geoip-lite": "~1.4.1",
+    "@types/node": "~20.5.7",
+    "@types/nodemailer": "~6.4.9",
+    "axios": "~1.5.0",
+    "express": "~4.18.2",
+    "geoip-lite": "~1.4.7",
+    "mongoose": "~5.13.20",
+    "nodemailer": "~6.9.4",
+    "rxjs": "~7.8.1",
+    "ts-node": "~10.9.1",
+    "body-parser": "~1.20.2"
   },
   "peerDevDependencies": {
   },
   "devDependencies": {
-    "@types/jasmine": "^4.3.5",
-    "@typescript-eslint/eslint-plugin": "^6.7.4",
-    "@typescript-eslint/parser": "^6.7.4",
-    "eslint": "^8.51.0",
-    "eslint-plugin-max-params-no-constructor": "^0.0.4",
-    "eslint-plugin-unused-imports": "^3.0.0",
-    "jasmine": "^5.0.2",
-    "jasmine-ts": "^0.4.0",
-    "nodemon": "^3.0.1",
-    "socket.io": "^4.5.2",
-    "socket.io-client": "^4.7.4",
-    "tslib": "^2.6.2",
-    "typescript": "^5.3.3"
+    "@types/jasmine": "~4.3.5",
+    "@typescript-eslint/eslint-plugin": "~6.7.4",
+    "@typescript-eslint/parser": "~6.7.4",
+    "eslint": "~8.51.0",
+    "eslint-plugin-max-params-no-constructor": "~0.0.4",
+    "eslint-plugin-unused-imports": "~3.0.0",
+    "jasmine": "~5.0.2",
+    "jasmine-ts": "~0.4.0",
+    "nodemon": "~3.0.1",
+    "socket.io": "~4.5.2",
+    "socket.io-client": "~4.7.4",
+    "tslib": "~2.6.2",
+    "typescript": "~5.3.3"
   }
 }

package/src/_models/control-models/endpoint-params.control-model.ts

@@ -5,7 +5,7 @@ import { Request, Response } from 'express';
 import { DyFM_Array, DyFM_Error, DyFM_Log } from '@futdevpro/fsm-dynamo';
 import { DyNTS_RouteSecurity } from '../../_enums/route-security.enum';
 import { DyNTS_HttpCallType } from '../../_enums/http/http-call-type.enum';
-import { DyNTS_globalSettings } from '../../_constants/global-settings.const';
+import { DyNTS_globalSettings } from '../../_collections/global-settings.const';
 import { DyNTS_GlobalService } from '../../_services/core/global.service';
 
 /**

package/src/_models/control-models/socket-event.control-model.ts

@@ -1,6 +1,6 @@
 
 import { DyFM_Array, DyFM_Log } from '@futdevpro/fsm-dynamo';
-import { DyNTS_globalSettings } from '../../_constants/global-settings.const';
+import { DyNTS_globalSettings } from '../../_collections/global-settings.const';
 import { DyNTS_SocketEventKey } from '../../_enums/http/socket-event-type.enum';
 
 

package/src/_models/control-models/socket-server-service-params.control-model.ts

@@ -1,5 +1,5 @@
 
-import { DyNTS_globalSettings } from '../../_constants/global-settings.const';
+import { DyNTS_globalSettings } from '../../_collections/global-settings.const';
 import { DyNTS_SocketSecurity } from '../../_enums/socket-security.enum';
 
 /**

package/src/_models/interfaces/routing-module-settings.interface.ts

@@ -1,5 +1,6 @@
-import { DyNTS_RouteSecurity } from '../../_enums';
-import { DyNTS_Controller } from '../../_services';
+import { DyNTS_RouteSecurity } from '../../_enums/route-security.enum';
+import { DyNTS_Controller } from '../../_services/route/controller.service';
+
 
 /**
  * This is a main route point handler, which collects a list of controllers for the API

package/src/_modules/app-extended.index.ts

@@ -23,6 +23,6 @@ export * from '../_models/control-models/socket-presence.control-model';
 // ENUMS
 export * from '../_enums/route-security.enum';
 
-// CONSTANTS
-export * from '../_constants/global-settings.const';
+// COLLECTIONS
+export * from '../_collections/global-settings.const';
 

package/src/_modules/app.index.ts

@@ -20,5 +20,5 @@ export * from '../_models/control-models/endpoint-params.control-model';
 export * from '../_enums/route-security.enum';
 
 // CONSTANTS
-export * from '../_constants/global-settings.const';
+export * from '../_collections/global-settings.const';
 

package/src/{_constants/mocks → _modules/mock}/app-extended-server.mock.ts

@@ -9,20 +9,20 @@ import {
   DyNTS_GlobalService_Settings 
 } from '../../_models/interfaces/global-service-settings.interface';
 import { DyNTS_Http_Settings } from '../../_models/control-models/http-settings.control-model';
-import { DyNTS_getTestRoutingModule } from '../../_modules/test';
-import { DyNTS_getUsageRoutingModule } from '../../_modules/usage';
-import { DyNTS_SingletonService } from '../../_services';
+import { DyNTS_getTestRoutingModule } from '../test';
+import { DyNTS_getUsageRoutingModule } from '../usage';
 import { DyNTS_RoutingModule } from '../../_services/route/routing-module.service';
 import { DyNTS_Controller_Mock } from './controller.mock';
 import { AuthService_Mock } from './auth-service.mock';
-import {
-  DyNTS_AppExtended, DyNTS_globalSettings, DyNTS_SocketServerService 
-} from '../../_modules/app-extended.index';
-import { DyNTS_SocketServer_Mock } from './socket-server.mock';
-import { SocketClient_Mock } from './socket-client.mock';
 import { dependency_mock_DataParams, dependent_mock_DataParams } from './data-model.mock';
 import { EmailServiceCollection_Mock } from './email-service-collection.mock';
-import { DyNTS_getCustomDataRoutingModule } from '../../_modules/custom-data';
+import { DyNTS_getCustomDataRoutingModule } from '../custom-data';
+import { DyNTS_SingletonService } from '../../_services/base/singleton.service';
+import { DyNTS_AppExtended } from '../../_services/server/app-extended.server';
+import { DyNTS_SocketServerService } from '../../_services/socket/socket-server.service';
+import { DyNTS_SocketServer_Mock } from './socket-server.mock';
+import { SocketClient_Mock } from './socket-client.mock';
+import { DyNTS_globalSettings } from '../../_collections/global-settings.const';
 
 /**
  * 
@@ -88,7 +88,7 @@ export class DyNTS_AppExtendedFull_Mock extends DyNTS_AppExtended {
 
         DyFM_usageSessionModel_params,
         DyFM_customDataModel_params,
-      ],      
+      ],
     };
   }
 

package/src/{_constants/mocks → _modules/mock}/app-params.mock.ts

@@ -1,5 +1,5 @@
+import { DyNTS_App_Params } from '../../_models/control-models/app-params.control-model';
 
-import { DyNTS_App_Params } from '../../_models';
 
 export const DyNTS_appParams_mock: DyNTS_App_Params = new DyNTS_App_Params({
   name: 'test',

package/src/{_constants/mocks → _modules/mock}/app-server.mock.ts

@@ -8,15 +8,15 @@ import {
   DyNTS_GlobalService_Settings 
 } from '../../_models/interfaces/global-service-settings.interface';
 import { DyNTS_Http_Settings } from '../../_models/control-models/http-settings.control-model';
-import { DyNTS_getTestRoutingModule } from '../../_modules/test';
-import { DyNTS_getUsageRoutingModule } from '../../_modules/usage';
-import { DyNTS_SingletonService } from '../../_services';
+import { DyNTS_getTestRoutingModule } from '../test';
+import { DyNTS_getUsageRoutingModule } from '../usage';
 import { DyNTS_RoutingModule } from '../../_services/route/routing-module.service';
 import { DyNTS_App } from '../../_services/server/app.server';
 import { DyNTS_Controller_Mock } from './controller.mock';
 import { AuthService_Mock } from './auth-service.mock';
 import { dependency_mock_DataParams, dependent_mock_DataParams } from './data-model.mock';
-import { DyNTS_getCustomDataRoutingModule } from '../../_modules/custom-data';
+import { DyNTS_getCustomDataRoutingModule } from '../custom-data';
+import { DyNTS_SingletonService } from '../../_services/base/singleton.service';
 
 /**
  * 

package/src/{_constants/mocks → _modules/mock}/auth-service.mock.ts

@@ -1,7 +1,7 @@
 
 
 import { NextFunction, Request, Response } from 'express';
-import { DyNTS_AuthService } from '../../_services';
+import { DyNTS_AuthService } from '../../_services/core/auth.service';
 
 
 export class AuthService_Mock extends DyNTS_AuthService {

package/src/{_constants/mocks → _modules/mock}/email-service-collection.mock.ts

@@ -1,4 +1,6 @@
-import { DyNTS_EmailService, DyNTS_Service_Collection } from '../../_services';
+
+import { DyNTS_EmailService } from '../../_services/core/email.service';
+import { DyNTS_Service_Collection } from '../../_services/core/service-collection.service';
 import { EmailService_Mock } from './email-service.mock';
 
 export class EmailServiceCollection_Mock extends 

package/src/{_constants/mocks → _modules/mock}/email-service.mock.ts

@@ -1,4 +1,5 @@
-import { DyNTS_EmailService } from '../../_services';
+import { DyNTS_EmailService } from '../../_services/core/email.service';
+
 
 export class EmailService_Mock extends DyNTS_EmailService {
 

package/src/{_constants/mocks → _modules/mock}/endpoint.mock.ts

@@ -1,6 +1,7 @@
+import { DyNTS_HttpCallType } from '../../_enums/http/http-call-type.enum';
+import { DyNTS_Endpoint_Params } from '../../_models/control-models/endpoint-params.control-model';
+
 
-import { DyNTS_HttpCallType } from '../../_enums';
-import { DyNTS_Endpoint_Params } from '../../_models';
 
 export const DyNTS_endpointBase_mock: DyNTS_Endpoint_Params = 
   new DyNTS_Endpoint_Params({

package/src/{_constants/mocks → _modules/mock}/socket-client.mock.ts

@@ -1,8 +1,8 @@
-import { DyNTS_SocketEventKey } from '../../_enums';
-import { DyNTS_SocketClientService_Params, DyNTS_SocketEvent } from '../../_models';
-import { DyNTS_SocketClientService } from '../../_modules/app-extended.index';
-
 
+import { DyNTS_SocketEventKey } from '../../_enums/http/socket-event-type.enum';
+import { DyNTS_SocketClientService_Params } from '../../_models/control-models/socket-client-service-params.control-model';
+import { DyNTS_SocketEvent } from '../../_models/control-models/socket-event.control-model';
+import { DyNTS_SocketClientService } from '../../_services/socket/socket-client.service';
 
 export class SocketClient_Mock extends DyNTS_SocketClientService {
 

package/src/_modules/test/index.ts

@@ -1,5 +1,4 @@
 
-// TEST MODULE
 export * from './test.controller';
 export * from './get-test-routing-module.util';
-export * from '@futdevpro/fsm-dynamo/test-module';
+export * from '@futdevpro/fsm-dynamo/test-module';

package/src/_services/base/data.service.ts

@@ -745,9 +745,9 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
   /**
    * permanently deletes data from database by data._id
    */
-  async deleteData(): Promise<void> {
+  async deleteData(id?: string): Promise<void> {
     try {
-      if (!this.data._id) {
+      if (!id && !this.data._id) {
         throw new DyFM_Error({ 
           ...this._getDefaultErrorSettings(
             'deleteData',
@@ -758,7 +758,7 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
         });
       }
           
-      await this.dataDBService.deleteDataById(this.data._id);
+      await this.dataDBService.deleteDataById(id ?? this.data._id);
     } catch (error) {
       if (error?.errorCode == 'NTS-DS0-DD1') {
         throw error;
@@ -777,17 +777,17 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
    */
   async validateForSave(): Promise<void> {
     try {
-      for (let i = 0; i < this.dataParams.properties.length; i++) {
+      for (const element of this.dataParams.properties) {
         // basic required validations
         if (
-          (this.dataParams.properties[i].required && 
-            (this.data[this.dataParams.properties[i].key] === null || 
-              this.data[this.dataParams.properties[i].key] === undefined
+          (element.required && 
+            (this.data[element.key] === null || 
+              this.data[element.key] === undefined
             )
           ) ||
-          (this.dataParams.properties[i].index && 
-            (this.data[this.dataParams.properties[i].key] === null || 
-              this.data[this.dataParams.properties[i].key] === undefined
+          (element.index && 
+            (this.data[element.key] === null || 
+              this.data[element.key] === undefined
             )
           )
         ) {
@@ -795,7 +795,7 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
             ...this._getDefaultErrorSettings(
               'validateForSave',
               new Error(
-                `validateForSave failed, ${this.dataParams.properties[i].key} is missing! ` +
+                `validateForSave failed, ${element.key} is missing! ` +
                 `(${this.dataParams.dataName})`
               )
             ),
@@ -807,14 +807,14 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
         }
 
         // specific Date validation
-        if (this.dataParams.properties[i].type === 'Date' && 
-          !(new Date(this.data[this.dataParams.properties[i].key]) instanceof Date)
+        if (element.type === 'Date' && 
+          !(new Date(this.data[element.key]) instanceof Date)
         ) {
           throw new DyFM_Error({
             ...this._getDefaultErrorSettings(
               'validateForSave',
               new Error(
-                `validateForSave failed, ${this.dataParams.properties[i].key} is not a date! ` +
+                `validateForSave failed, ${element.key} is not a date! ` +
                 `(${this.dataParams.dataName})`
               )
             ),
@@ -826,10 +826,10 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
         }
 
         // call additional validators
-        if (this.dataParams.properties[i].additionalValidators) {
-          for (let j = 0; j < this.dataParams.properties[i].additionalValidators.length; j++) {
-            this.dataParams.properties[i].additionalValidators[j](
-              this.data[this.dataParams.properties[i].key]
+        if (element.additionalValidators) {
+          for (let j = 0; j < element.additionalValidators.length; j++) {
+            element.additionalValidators[j](
+              this.data[element.key]
             );
           }
         }

package/src/_services/core/api.service.ts

@@ -9,7 +9,7 @@ import { DyNTS_HttpResponseType } from '../../_enums/http/http-response-type.enu
 import {
   DyNTS_ApiCall_Params
 } from '../../_models/control-models/api-call-params.control-model';
-import { DyNTS_globalSettings } from '../../_constants';
+import { DyNTS_globalSettings } from '../../_collections/global-settings.const';
 
 export interface DyNTS_ApiCallInput_Params<T_Body = any> {
   pathParams?: {

package/src/_services/core/global.service.ts

@@ -18,7 +18,7 @@ import { DyNTS_EmailService } from './email.service';
 import { DyNTS_Service_Collection } from './service-collection.service';
 /* import { DyNTS_EmailServiceCollection } from './email-service-collection.service'; */
 import { DyNTS_SingletonService } from '../base/singleton.service';
-import { DyNTS_globalSettings } from '../../_constants';
+import { DyNTS_globalSettings } from '../../_collections/global-settings.const';
 
 /**
  * This is the main Global/Core Service Collection used by DynamoBE, 
@@ -110,7 +110,7 @@ export class DyNTS_GlobalService extends DyNTS_SingletonService {
       DyNTS_GlobalService.globalErrorHandler = 
         set.errorHandler ?? 
         (async (error: any): Promise<void> => {
-          DyFM_Log.warn(`globalErrorHandler not set!`);
+          DyFM_Log.warn(`globalErrorHandler not set! (set in app.getGlobalServiceCollection)`);
 
           if (DyNTS_globalSettings.logDetailedErrors) {
             DyFM_Log.error(`ERROR:\n`, error);

package/src/_services/route/controller.service.ts

@@ -26,7 +26,7 @@ import { DyNTS_SingletonService } from '../base/singleton.service';
  *     this.endpoints = [
  *       new DyNTS_EndpointParams({
  *         name: 'getUserMatchStatistics',
- *         type: DynamoNX_HttpCallType.get,
+ *         type: DyNX_HttpCallType.get,
  *         endpoint: '/get/user-match-statistics/:userId',
  *         preProcesses: [ this.authService.authenticate_tokenSelf ],
  *         tasks: [ 
@@ -57,7 +57,7 @@ export abstract class DyNTS_Controller extends DyNTS_SingletonService {
    * this.endpoints = [
    *   new DyNTS_EndpointParams({
    *     name: 'getUserMatchStatistics',
-   *     type: DynamoNX_HttpCallType.get,
+   *     type: DyNX_HttpCallType.get,
    *     endpoint: '/get/user-match-statistics/:userId',
    *     preProcesses: [ this.authService.authenticate_tokenSelf ],
    *     tasks: [ 
@@ -105,7 +105,7 @@ export abstract class DyNTS_Controller extends DyNTS_SingletonService {
    *   this.endpoints = [
    *     new DyNTS_EndpointParams({
    *       name: 'getUserMatchStatistics',
-   *       type: DynamoNX_HttpCallType.get,
+   *       type: DyNX_HttpCallType.get,
    *       endpoint: '/get/user-match-statistics/:userId',
    *       preProcesses: [ this.authService.authenticate_tokenSelf ],
    *       tasks: [ 

package/src/_services/route/routing-module.service.ts

@@ -3,7 +3,7 @@ import { Router } from 'express';
 
 import { DyFM_AnyError, DyFM_Error, DyFM_ErrorLevel, DyFM_Error_Settings, DyFM_Log } from '@futdevpro/fsm-dynamo';
 
-import { DyNTS_globalSettings } from '../../_constants/global-settings.const';
+import { DyNTS_globalSettings } from '../../_collections/global-settings.const';
 import { DyNTS_RouteSecurity } from '../../_enums/route-security.enum';
 import { DyNTS_HttpCallType } from '../../_enums/http/http-call-type.enum';
 import { DyNTS_Controller } from './controller.service';

package/src/_services/server/app-extended.server.spec.ts

@@ -1,7 +1,5 @@
 import { DyFM_delay } from '@futdevpro/fsm-dynamo';
-import { 
-  DyNTS_AppExtendedBase_Mock, DyNTS_AppExtendedFull_Mock, DyNTS_AppWbMock_Mock 
-} from '../../_constants/mocks/app-extended-server.mock';
+import { DyNTS_AppExtendedBase_Mock, DyNTS_AppExtendedFull_Mock, DyNTS_AppWbMock_Mock } from '../../_modules/mock/app-extended-server.mock';
 
 describe('DyNTS_AppExtended;', (): void => {
   describe('a extended-base instance;', (): void => {

package/src/_services/server/app.server.spec.ts

@@ -1,8 +1,6 @@
 
 import { DyFM_Log, DyFM_delay } from '@futdevpro/fsm-dynamo';
-import { 
-  DyNTS_AppBase_Mock, DyNTS_AppFull_Mock 
-} from '../../_constants/mocks/app-server.mock';
+import { DyNTS_AppBase_Mock, DyNTS_AppFull_Mock } from '../../_modules/mock/app-server.mock';
 
 describe('DyNTS_App AND DyNTS_AppExtended?;', (): void => {
   // jasmine.DEFAULT_TIMEOUT_INTERVAL = 15 * second;

package/src/_services/server/app.server.ts

@@ -29,7 +29,6 @@ import {
 import { 
   DyNTS_GlobalService_Settings 
 } from '../../_models/interfaces/global-service-settings.interface';
-import { DyNTS_globalSettings } from '../../_constants/global-settings.const';
 import { DyNTS_App_Params } from '../../_models/control-models/app-params.control-model';
 import { 
   DyNTS_Endpoint_Params 
@@ -37,6 +36,7 @@ import {
 import { 
   DyNTS_AppSystemControls 
 } from '../../_models/control-models/app-system-controls.control-model';
+import { DyNTS_globalSettings } from '../../_collections/global-settings.const';
 
 
 /**

package/src/_services/socket/socket-client.service.ts

@@ -4,12 +4,11 @@
 import * as SocketIO from 'socket.io-client';
 
 import { DyNTS_SingletonService } from '../base/singleton.service';
-import { DyFM_Error, DyFM_Log } from '@futdevpro/fsm-dynamo';
-import { DyFM_delay, DyFM_Array } from '@futdevpro/fsm-dynamo/utils';
+import { DyFM_Error, DyFM_Log, DyFM_delay, DyFM_Array } from '@futdevpro/fsm-dynamo';
 import { 
   DyNTS_SocketClientService_Params 
 } from '../../_models/control-models/socket-client-service-params.control-model';
-import { DyNTS_globalSettings } from '../../_constants/global-settings.const';
+import { DyNTS_globalSettings } from '../../_collections/global-settings.const';
 import { DyNTS_SocketEvent } from '../../_models/control-models/socket-event.control-model';
 import { DyNTS_SocketEventKey } from '../../_enums/http/socket-event-type.enum';
 

package/src/_services/socket/socket-server.service.spec.ts

@@ -1,6 +1,6 @@
+import { DyNTS_SocketServer_Mock } from '../../_modules/mock/socket-server.mock';
 
 
-import { DyNTS_SocketServer_Mock } from '../../_constants/mocks/socket-server.mock';
 
 describe('DyNTS_SocketServerService', () => {
   it('should create an instance', () => {

package/src/_services/socket/socket-server.service.ts

@@ -6,7 +6,6 @@ import {
 } from '@futdevpro/fsm-dynamo';
 
 import { DyNTS_SingletonService } from '../base/singleton.service';
-import { DyNTS_globalSettings } from '../../_constants/global-settings.const';
 import { DyNTS_SocketEventKey } from '../../_enums/http/socket-event-type.enum';
 import { DyNTS_SocketSecurity } from '../../_enums/socket-security.enum';
 import { 
@@ -18,6 +17,7 @@ import {
 import { 
   DyNTS_SocketEvent, DyNTS_SocketEventPreprocessTask, DyNTS_SocketEventTask 
 } from '../../_models/control-models/socket-event.control-model';
+import { DyNTS_globalSettings } from '../../_collections/global-settings.const';
 
 /**
  * You need to define the following functions: