@into-cps-association/libms 0.4.4 → 0.4.7

package/test/unit/files.resolver.unit.spec.ts

@@ -1,13 +1,18 @@
+import { describe, it, expect, jest } from '@jest/globals';
 import { Test, TestingModule } from '@nestjs/testing';
-import FilesResolver from '../../src/files/resolvers/files.resolver';
+import FilesResolver from '../../src/files/files.resolver';
 import {
   testDirectory,
   pathToTestDirectory,
   pathToTestFileContent,
   testFileContent,
 } from '../testUtil';
-import { IFilesService } from '../../src/files/interfaces/files.service.interface';
-import FilesServiceFactory from '../../src/files/services/files-service.factory';
+import {
+  FILE_SERVICE,
+  IFilesService,
+} from '../../src/files/interfaces/files.service.interface';
+import { Project } from 'src/types';
+import { CONFIG_MODE } from '../../src/enums/config-mode.enum';
 
 describe('Unit tests for FilesResolver', () => {
   let filesResolver: FilesResolver;
@@ -15,27 +20,29 @@ describe('Unit tests for FilesResolver', () => {
 
   beforeEach(async () => {
     const mockFilesService: IFilesService = {
-      listDirectory: jest.fn().mockImplementation(() => testDirectory),
-      readFile: jest.fn().mockImplementation(() => testFileContent),
+      listDirectory: jest
+        .fn<() => Promise<Project>>()
+        .mockResolvedValue(testDirectory),
+      readFile: jest
+        .fn<() => Promise<Project>>()
+        .mockImplementation(() => Promise.resolve(testFileContent)),
+      getMode: jest.fn<() => CONFIG_MODE>().mockReturnValue(CONFIG_MODE.LOCAL),
     };
 
     const module: TestingModule = await Test.createTestingModule({
       providers: [
         FilesResolver,
-        FilesServiceFactory,
         {
-          provide: FilesServiceFactory,
-          useValue: {
-            create: () => mockFilesService,
+          provide: FILE_SERVICE,
+          useFactory: () => {
+            return mockFilesService;
           },
         },
       ],
     }).compile();
 
     filesResolver = module.get<FilesResolver>(FilesResolver);
-    filesService = module
-      .get<FilesServiceFactory>(FilesServiceFactory)
-      .create();
+    filesService = module.get<IFilesService>(FILE_SERVICE);
   });
 
   it('should be defined', () => {

package/test/unit/local-files.service.unit.spec.ts

@@ -1,8 +1,9 @@
+import { describe, it, expect, jest } from '@jest/globals';
 import { Test, TestingModule } from '@nestjs/testing';
 import { ConfigService } from '@nestjs/config';
 import * as fs from 'fs';
 import { join } from 'path';
-import LocalFilesService from '../../src/files/services/local-files.service';
+import LocalFilesService from '../../src/files/local/local-files.service';
 import {
   fstestFileContent,
   pathToTestDirectory,
@@ -11,6 +12,7 @@ import {
   MockConfigService,
   testFileName,
 } from '../testUtil';
+import { Dirent } from 'fs';
 
 jest.mock('fs', () => ({
   promises: {
@@ -56,7 +58,7 @@ describe('LocalFilesService', () => {
 
     jest
       .spyOn(fs.promises, 'readdir')
-      .mockResolvedValue(testFileArray as unknown as Promise<[]>);
+      .mockResolvedValue(testFileArray as unknown as Dirent[]);
 
     jest.spyOn(fs.promises, 'lstat').mockImplementation((pathToDirectory) => {
       if (typeof pathToDirectory === 'string') {

package/tsconfig.json

@@ -4,28 +4,31 @@
     "baseUrl": "./",
     "declaration": true, //generate declaration '.d.ts' files
     "emitDecoratorMetadata": true,
+    "esModuleInterop": true,
     "experimentalDecorators": true, //allow experimental decorators for es7
     "forceConsistentCasingInFileNames": false,
     "incremental": true,
-    "module": "commonjs", //use node module system
+    "lib": [
+      "ES2022"
+    ],
+    "module": "ES2022", //use node module system
     "moduleResolution": "node", //use node module resolution strategy node
-    //"noImplicitAny": true, //raise error on any type
     "noImplicitReturns": true, //raise error on implicit returns
     "noUnusedLocals": true, //raise error on unused locals
     "noUnusedParameters": true, //raise no error on unused parameters
     "noFallthroughCasesInSwitch": false,
-    "outDir": "./dist",
+    "outDir": "dist",
     "removeComments": true, //remove comments from build
     "skipLibCheck": true,
     "sourceMap": true, //generate .map files
+    // "strict": true, //enable all strict type-checking options
     "strictBindCallApply": false,
-    //"strictNullChecks": true,
-    //"strict": true, //enable all strict type-checking options
-    "target": "es2022",
+    "target": "ES2022",
     "types": ["node", "jest"], //use node and jest types
     "typeRoots": [
       "node_modules/@types" //use node_modules/@types for type definitions
-    ]
+    ],
   },
+  "include": ["src/**/*.ts", "test/**/*.ts"],
   "exclude": ["**/node_modules/*", "./dist"]
 }

package/.env

@@ -1,6 +0,0 @@
-PORT='4001'
-MODE='local'
-LOCAL_PATH ='/home/dtaas/Documents/git/into-cps/DTaaS/files'
-LOG_LEVEL='debug'
-APOLLO_PATH='/lib'
-GRAPHQL_PLAYGROUND='true'

package/.eslintignore

@@ -1,6 +0,0 @@
-api/
-build/
-dist/
-node_modules/
-script/
-src/types.ts

package/.eslintrc

@@ -1,53 +0,0 @@
-{
-  "env": {
-    "jest": true,
-    "jest/globals": true,
-    "node": true
-  },
-  "extends": [
-    "eslint:recommended",
-    "airbnb-base",
-    "plugin:@typescript-eslint/recommended",
-    "prettier"
-  ],
-  "globals": {
-    "Atomics": "readonly",
-    "SharedArrayBuffer": "readonly"
-  },
-  "settings": {
-    "import/resolver": {
-      "node": {
-        "extensions": [".js"]
-      }
-    }
-  },
-  "parser": "@typescript-eslint/parser",
-  "parserOptions": {
-    "requireConfigFile": false,
-    "ecmaVersion": 2022,
-    "sourceType": "module" // Allows for the use of imports
-  },
-  "plugins": ["jest", "@typescript-eslint", "import"],
-  "rules": {
-    "import/no-extraneous-dependencies": ["error", { "devDependencies": true }],
-    "no-console": "error",
-    "import/first": "error",
-    "linebreak-style": 0, // disable linter linebreak rule, to allow for both unix and windows developement
-    "import/no-unresolved": "off", // Whatever IDE will pass an error if if the module is not found, so no reason for this..
-    "import/extensions": "off", // That includes the production build.. We use linter for code checking / clean code optimization..
-    "no-use-before-define": "off"
-  },
-  "root": true,
-
-  "overrides": [
-    {
-      "files": ["*.ts"],
-      "parser": "@typescript-eslint/parser",
-      "parserOptions": {
-        "requireConfigFile": false,
-        "project": ["./tsconfig.json"]
-      },
-      "plugins": ["@typescript-eslint"]
-    }
-  ]
-}

package/dist/src/files/resolvers/files.resolver.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"files.resolver.js","sourceRoot":"","sources":["../../../../src/files/resolvers/files.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,6CAAwD;AAExD,6EAAoE;AACpE,uCAAsC;AAGvB,IAAM,aAAa,GAAnB,MAAM,aAAa;IACf,YAAY,CAAgB;IAE7C,YAAY,mBAAwC;QAClD,IAAI,CAAC,YAAY,GAAG,mBAAmB,CAAC,MAAM,EAAE,CAAC;IACnD,CAAC;IAGK,AAAN,KAAK,CAAC,aAAa,CAAe,IAAY;QAC5C,OAAO,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAC/C,CAAC;IAGK,AAAN,KAAK,CAAC,QAAQ,CAAe,IAAY;QACvC,OAAO,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC1C,CAAC;CACF,CAAA;AARO;IADL,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,eAAO,CAAC;IACA,WAAA,IAAA,cAAI,EAAC,MAAM,CAAC,CAAA;;;;kDAEhC;AAGK;IADL,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,eAAO,CAAC;IACL,WAAA,IAAA,cAAI,EAAC,MAAM,CAAC,CAAA;;;;6CAE3B;AAfkB,aAAa;IADjC,IAAA,kBAAQ,GAAE;qCAIwB,+BAAmB;GAHjC,aAAa,CAgBjC;kBAhBoB,aAAa"}

package/dist/src/files/services/files-service.factory.d.ts

@@ -1,9 +0,0 @@
-import { ConfigService } from '@nestjs/config';
-import { IFilesService } from '../interfaces/files.service.interface';
-import LocalFilesService from './local-files.service';
-export default class FilesServiceFactory {
-    private configService;
-    private localFilesService;
-    constructor(configService: ConfigService, localFilesService: LocalFilesService);
-    create(): IFilesService;
-}

package/dist/src/files/services/files-service.factory.js

@@ -1,40 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-var __param = (this && this.__param) || function (paramIndex, decorator) {
-    return function (target, key) { decorator(target, key, paramIndex); }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const common_1 = require("@nestjs/common");
-const config_1 = require("@nestjs/config");
-const local_files_service_1 = require("./local-files.service");
-let FilesServiceFactory = class FilesServiceFactory {
-    configService;
-    localFilesService;
-    constructor(configService, localFilesService) {
-        this.configService = configService;
-        this.localFilesService = localFilesService;
-    }
-    create() {
-        const mode = this.configService.get('MODE');
-        if (mode === 'local') {
-            return this.localFilesService;
-        }
-        throw new Error(`Invalid MODE: ${mode}`);
-    }
-};
-FilesServiceFactory = __decorate([
-    (0, common_1.Injectable)(),
-    __param(1, (0, common_1.Inject)(local_files_service_1.default)),
-    __metadata("design:paramtypes", [config_1.ConfigService,
-        local_files_service_1.default])
-], FilesServiceFactory);
-exports.default = FilesServiceFactory;
-//# sourceMappingURL=files-service.factory.js.map

package/dist/src/files/services/files-service.factory.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"files-service.factory.js","sourceRoot":"","sources":["../../../../src/files/services/files-service.factory.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,2CAAoD;AACpD,2CAA+C;AAE/C,+DAAsD;AAGvC,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAG5B;IAC2B;IAFrC,YACU,aAA4B,EACD,iBAAoC;QAD/D,kBAAa,GAAb,aAAa,CAAe;QACD,sBAAiB,GAAjB,iBAAiB,CAAmB;IACtE,CAAC;IAGJ,MAAM;QACJ,MAAM,IAAI,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,MAAM,CAAC,CAAC;QACpD,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;YACrB,OAAO,IAAI,CAAC,iBAAiB,CAAC;QAChC,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,iBAAiB,IAAI,EAAE,CAAC,CAAC;IAC3C,CAAC;CACF,CAAA;AAfoB,mBAAmB;IADvC,IAAA,mBAAU,GAAE;IAKR,WAAA,IAAA,eAAM,EAAC,6BAAiB,CAAC,CAAA;qCADH,sBAAa;QACkB,6BAAiB;GAJtD,mBAAmB,CAevC;kBAfoB,mBAAmB"}

package/dist/src/files/services/local-files.service.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"local-files.service.js","sourceRoot":"","sources":["../../../../src/files/services/local-files.service.ts"],"names":[],"mappings":"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"}

package/jest.config.json

@@ -1,30 +0,0 @@
-{
-  "preset": "ts-jest",
-  "testEnvironment": "node",
-  "transform": {
-    "^.+\\.tsx?$": "ts-jest"
-  },
-  "transformIgnorePatterns": ["/node_modules/(?![d3-shape|recharts]).+\\.js$"],
-  "collectCoverage": true,
-  "coverageReporters": ["text", "cobertura", "clover", "lcov", "json"],
-  "collectCoverageFrom": ["src/**/*.{ts,js}"],
-  "coveragePathIgnorePatterns": [
-    "node_modules",
-    "./dist",
-    "../src/app.module.ts",
-    "../src/main.ts"
-  ],
-  "modulePathIgnorePatterns": ["config"],
-  "coverageDirectory": "<rootDir>/coverage/",
-  "coverageThreshold": {
-    "global": {
-      "branches": 20,
-      "functions": 30,
-      "lines": 50,
-      "statements": 50
-    }
-  },
-  "verbose": true,
-  "testRegex": "./test/.*\\.spec.tsx?$",
-  "modulePaths": ["<rootDir>/src/"]
-}

package/src/files/services/files-service.factory.ts

@@ -1,22 +0,0 @@
-import { Injectable, Inject } from '@nestjs/common';
-import { ConfigService } from '@nestjs/config';
-import { IFilesService } from '../interfaces/files.service.interface';
-import LocalFilesService from './local-files.service';
-
-@Injectable()
-export default class FilesServiceFactory {
-  /* eslint-disable no-useless-constructor, no-empty-function */
-  constructor(
-    private configService: ConfigService,
-    @Inject(LocalFilesService) private localFilesService: LocalFilesService,
-  ) {}
-  /* eslint-enable no-useless-constructor, no-empty-function */
-
-  create(): IFilesService {
-    const mode = this.configService.get<string>('MODE');
-    if (mode === 'local') {
-      return this.localFilesService;
-    }
-    throw new Error(`Invalid MODE: ${mode}`);
-  }
-}