@cenk1cenk2/oclif-common 6.1.0 → 6.2.0

package/dist/index.d.ts

@@ -236,7 +236,7 @@ interface UnlockData extends CommonLockerData {
 }
 interface LockerServiceOptions {
     file: string;
-    parser: GenericParser;
+    parser: ClassType<GenericParser>;
     root?: string[];
     context?: string;
     token?: InjectionToken;
@@ -245,11 +245,12 @@ interface LockerServiceOptions {
 declare class LockerService<LockFile extends LockableData = LockableData> {
     private readonly logger;
     private readonly fs;
+    private readonly parser;
     private readonly options;
     readonly op: typeof op;
     private toLock;
     private toUnlock;
-    constructor(logger: LoggerService, fs: FileSystemService, options: LockerServiceOptions);
+    constructor(logger: LoggerService, fs: FileSystemService, parser: ParserService, options: LockerServiceOptions);
     hasLock(): boolean;
     hasUnlock(): boolean;
     addLock<T extends LockableData = LockableData>(...data: LockData<T>[]): void;

package/dist/index.js

@@ -991,8 +991,12 @@ ConfigModule = _ts_decorate9([
 ], ConfigModule);
 
 // src/lib/locker/locker.service.ts
-import { Injectable as Injectable6 } from "@nestjs/common";
+import { Injectable as Injectable9 } from "@nestjs/common";
 import op2 from "object-path-immutable";
+
+// src/lib/parser/fts/env-parser.service.ts
+import { Injectable as Injectable6 } from "@nestjs/common";
+import { EOL as EOL2 } from "os";
 function _ts_decorate10(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")
@@ -1010,16 +1014,172 @@ function _ts_metadata6(k, v) {
 }
 __name(_ts_metadata6, "_ts_metadata");
 var _a10;
-var LockerService = (_a10 = class {
-  constructor(logger, fs2, options) {
+var EnvironmentVariableParser = (_a10 = class {
+  constructor(logger) {
+    __publicField(this, "logger");
+    __publicField(this, "LINE");
+    this.logger = logger;
+    this.LINE = /(?:^|^)\s*(?:export\s+)?([\w.-]+)(?:\s*=\s*?|:\s+?)(\s*'(?:\\'|[^'])*'|\s*"(?:\\"|[^"])*"|\s*`(?:\\`|[^`])*`|[^#\r\n]+)?\s*(?:#.*)?(?:$|$)/gm;
+    this.logger.setup(this.constructor.name);
+  }
+  parse(data) {
+    try {
+      return data.toString().split(EOL2).reduce((o, line) => {
+        const match = this.LINE.exec(line);
+        const key = match[1];
+        const value = match[2] ?? "";
+        return {
+          ...o,
+          [key]: value
+        };
+      }, {});
+    } catch (e) {
+      this.logger.trace("Error during parsing environment file: %s", e.message);
+      throw e;
+    }
+  }
+  stringify(data) {
+    return Object.entries(data).map(([k, v]) => `${k}=${v}`).join(EOL2) + EOL2;
+  }
+}, __name(_a10, "EnvironmentVariableParser"), __publicField(_a10, "extensions", [
+  "env"
+]), _a10);
+EnvironmentVariableParser = _ts_decorate10([
+  Injectable6(),
+  _ts_metadata6("design:type", Function),
+  _ts_metadata6("design:paramtypes", [
+    typeof LoggerService === "undefined" ? Object : LoggerService
+  ])
+], EnvironmentVariableParser);
+
+// src/lib/parser/fts/json-parser.service.ts
+import { Injectable as Injectable7 } from "@nestjs/common";
+function _ts_decorate11(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;
+}
+__name(_ts_decorate11, "_ts_decorate");
+function _ts_metadata7(k, v) {
+  if (typeof Reflect === "object" && typeof Reflect.metadata === "function")
+    return Reflect.metadata(k, v);
+}
+__name(_ts_metadata7, "_ts_metadata");
+var _a11;
+var JsonParser = (_a11 = class {
+  constructor(logger) {
+    __publicField(this, "logger");
+    this.logger = logger;
+    this.logger.setup(this.constructor.name);
+  }
+  parse(data) {
+    try {
+      return JSON.parse(data.toString());
+    } catch (e) {
+      this.logger.trace("Error during parsing JSON file: %s", e.message);
+      throw e;
+    }
+  }
+  stringify(data) {
+    return JSON.stringify(data, null, 2);
+  }
+}, __name(_a11, "JsonParser"), __publicField(_a11, "extensions", [
+  "json"
+]), _a11);
+JsonParser = _ts_decorate11([
+  Injectable7(),
+  _ts_metadata7("design:type", Function),
+  _ts_metadata7("design:paramtypes", [
+    typeof LoggerService === "undefined" ? Object : LoggerService
+  ])
+], JsonParser);
+
+// src/lib/parser/fts/yaml-parser.service.ts
+import { Injectable as Injectable8 } from "@nestjs/common";
+import { parse, stringify } from "yaml";
+function _ts_decorate12(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;
+}
+__name(_ts_decorate12, "_ts_decorate");
+function _ts_metadata8(k, v) {
+  if (typeof Reflect === "object" && typeof Reflect.metadata === "function")
+    return Reflect.metadata(k, v);
+}
+__name(_ts_metadata8, "_ts_metadata");
+var _a12;
+var YamlParser = (_a12 = class {
+  constructor(logger) {
+    __publicField(this, "logger");
+    this.logger = logger;
+    this.logger.setup(this.constructor.name);
+  }
+  parse(data) {
+    try {
+      return parse(data.toString());
+    } catch (e) {
+      this.logger.trace("Error during parsing YAML file: %s", e.message);
+      throw e;
+    }
+  }
+  stringify(data) {
+    return stringify(data, {
+      prettyErrors: true
+    });
+  }
+}, __name(_a12, "YamlParser"), __publicField(_a12, "extensions", [
+  "yaml",
+  "yml"
+]), _a12);
+YamlParser = _ts_decorate12([
+  Injectable8(),
+  _ts_metadata8("design:type", Function),
+  _ts_metadata8("design:paramtypes", [
+    typeof LoggerService === "undefined" ? Object : LoggerService
+  ])
+], YamlParser);
+
+// src/lib/locker/locker.service.ts
+function _ts_decorate13(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;
+}
+__name(_ts_decorate13, "_ts_decorate");
+function _ts_metadata9(k, v) {
+  if (typeof Reflect === "object" && typeof Reflect.metadata === "function")
+    return Reflect.metadata(k, v);
+}
+__name(_ts_metadata9, "_ts_metadata");
+var _a13;
+var LockerService = (_a13 = class {
+  constructor(logger, fs2, parser, options) {
     __publicField(this, "logger");
     __publicField(this, "fs");
+    __publicField(this, "parser");
     __publicField(this, "options");
     __publicField(this, "op");
     __publicField(this, "toLock");
     __publicField(this, "toUnlock");
     this.logger = logger;
     this.fs = fs2;
+    this.parser = parser;
     this.options = options;
     this.op = op2;
     this.toLock = [];
@@ -1118,11 +1278,11 @@ var LockerService = (_a10 = class {
     await this.write(lock ?? {});
   }
   async read() {
-    return this.options.parser.parse(await this.fs.read(this.options.file));
+    return this.parser.fetch(this.options.parser).parse(await this.fs.read(this.options.file));
   }
   async tryRead() {
     try {
-      return this.options.parser.parse(await this.fs.read(this.options.file));
+      return this.parser.fetch(this.options.parser).parse(await this.fs.read(this.options.file));
     } catch {
       this.logger.trace("Can not read lockfile: %s", this.options.file);
     }
@@ -1132,7 +1292,7 @@ var LockerService = (_a10 = class {
       this.logger.trace("Trying to write empty lock file, deleting it instead: %s", this.options.file);
       return this.fs.remove(this.options.file);
     }
-    return this.fs.write(this.options.file, await this.options.parser.stringify(data));
+    return this.fs.write(this.options.file, await this.parser.fetch(this.options.parser).stringify(data));
   }
   buildPath(d) {
     if (d?.root !== true && this.options.root?.length) {
@@ -1151,20 +1311,21 @@ var LockerService = (_a10 = class {
     }
     return [];
   }
-}, __name(_a10, "LockerService"), _a10);
-LockerService = _ts_decorate10([
-  Injectable6(),
-  _ts_metadata6("design:type", Function),
-  _ts_metadata6("design:paramtypes", [
+}, __name(_a13, "LockerService"), _a13);
+LockerService = _ts_decorate13([
+  Injectable9(),
+  _ts_metadata9("design:type", Function),
+  _ts_metadata9("design:paramtypes", [
     typeof LoggerService === "undefined" ? Object : LoggerService,
     typeof FileSystemService === "undefined" ? Object : FileSystemService,
+    typeof ParserService === "undefined" ? Object : ParserService,
     typeof LockerServiceOptions === "undefined" ? Object : LockerServiceOptions
   ])
 ], LockerService);
 
 // src/lib/locker/locker.module.ts
 import { Module as Module5 } from "@nestjs/common";
-function _ts_decorate11(decorators, target, key, desc) {
+function _ts_decorate14(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);
@@ -1174,27 +1335,28 @@ function _ts_decorate11(decorators, target, key, desc) {
         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;
 }
-__name(_ts_decorate11, "_ts_decorate");
-var _a11;
-var LockerModule = (_a11 = class {
+__name(_ts_decorate14, "_ts_decorate");
+var _a14;
+var LockerModule = (_a14 = class {
   static forFeature(options) {
     const token = options.token ?? LockerService;
     return {
-      module: _a11,
+      module: _a14,
       providers: [
         {
           provide: token,
-          useFactory: (logger, fs2) => new LockerService(logger, fs2, options),
+          useFactory: (logger, fs2, parser) => new LockerService(logger, fs2, parser, options),
           inject: [
             LoggerService,
-            FileSystemService
+            FileSystemService,
+            ParserService
           ]
         }
       ]
     };
   }
-}, __name(_a11, "LockerModule"), _a11);
-LockerModule = _ts_decorate11([
+}, __name(_a14, "LockerModule"), _a14);
+LockerModule = _ts_decorate14([
   Module5({})
 ], LockerModule);
 
@@ -1205,10 +1367,10 @@ var TOKEN_LOGO_GENERATOR = Symbol("TOKEN_LOGO_GENERATOR");
 import { Module as Module6 } from "@nestjs/common";
 
 // src/lib/logo/logo.service.ts
-import { Injectable as Injectable7 } from "@nestjs/common";
+import { Injectable as Injectable10 } from "@nestjs/common";
 import { ModuleRef as ModuleRef2 } from "@nestjs/core";
-import { EOL as EOL2 } from "os";
-function _ts_decorate12(decorators, target, key, desc) {
+import { EOL as EOL3 } from "os";
+function _ts_decorate15(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);
@@ -1218,14 +1380,14 @@ function _ts_decorate12(decorators, target, key, desc) {
         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;
 }
-__name(_ts_decorate12, "_ts_decorate");
-function _ts_metadata7(k, v) {
+__name(_ts_decorate15, "_ts_decorate");
+function _ts_metadata10(k, v) {
   if (typeof Reflect === "object" && typeof Reflect.metadata === "function")
     return Reflect.metadata(k, v);
 }
-__name(_ts_metadata7, "_ts_metadata");
-var _a12;
-var LogoService = (_a12 = class {
+__name(_ts_metadata10, "_ts_metadata");
+var _a15;
+var LogoService = (_a15 = class {
   constructor(cs, moduleRef) {
     __publicField(this, "cs");
     __publicField(this, "generator");
@@ -1250,20 +1412,20 @@ var LogoService = (_a12 = class {
     return this.cs.isJson || this.cs.isSilent;
   }
   write(...data) {
-    process.stdout.write(data.join(" ") + EOL2);
+    process.stdout.write(data.join(" ") + EOL3);
   }
-}, __name(_a12, "LogoService"), _a12);
-LogoService = _ts_decorate12([
-  Injectable7(),
-  _ts_metadata7("design:type", Function),
-  _ts_metadata7("design:paramtypes", [
+}, __name(_a15, "LogoService"), _a15);
+LogoService = _ts_decorate15([
+  Injectable10(),
+  _ts_metadata10("design:type", Function),
+  _ts_metadata10("design:paramtypes", [
     typeof ConfigService === "undefined" ? Object : ConfigService,
     typeof ModuleRef2 === "undefined" ? Object : ModuleRef2
   ])
 ], LogoService);
 
 // src/lib/logo/logo.module.ts
-function _ts_decorate13(decorators, target, key, desc) {
+function _ts_decorate16(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);
@@ -1273,11 +1435,11 @@ function _ts_decorate13(decorators, target, key, desc) {
         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;
 }
-__name(_ts_decorate13, "_ts_decorate");
-var _a13;
-var LogoModule = (_a13 = class {
-}, __name(_a13, "LogoModule"), _a13);
-LogoModule = _ts_decorate13([
+__name(_ts_decorate16, "_ts_decorate");
+var _a16;
+var LogoModule = (_a16 = class {
+}, __name(_a16, "LogoModule"), _a16);
+LogoModule = _ts_decorate16([
   Module6({
     providers: [
       LogoService
@@ -1288,162 +1450,6 @@ LogoModule = _ts_decorate13([
   })
 ], LogoModule);
 
-// src/lib/parser/fts/env-parser.service.ts
-import { Injectable as Injectable8 } from "@nestjs/common";
-import { EOL as EOL3 } from "os";
-function _ts_decorate14(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;
-}
-__name(_ts_decorate14, "_ts_decorate");
-function _ts_metadata8(k, v) {
-  if (typeof Reflect === "object" && typeof Reflect.metadata === "function")
-    return Reflect.metadata(k, v);
-}
-__name(_ts_metadata8, "_ts_metadata");
-var _a14;
-var EnvironmentVariableParser = (_a14 = class {
-  constructor(logger) {
-    __publicField(this, "logger");
-    __publicField(this, "LINE");
-    this.logger = logger;
-    this.LINE = /(?:^|^)\s*(?:export\s+)?([\w.-]+)(?:\s*=\s*?|:\s+?)(\s*'(?:\\'|[^'])*'|\s*"(?:\\"|[^"])*"|\s*`(?:\\`|[^`])*`|[^#\r\n]+)?\s*(?:#.*)?(?:$|$)/gm;
-    this.logger.setup(this.constructor.name);
-  }
-  parse(data) {
-    try {
-      return data.toString().split(EOL3).reduce((o, line) => {
-        const match = this.LINE.exec(line);
-        const key = match[1];
-        const value = match[2] ?? "";
-        return {
-          ...o,
-          [key]: value
-        };
-      }, {});
-    } catch (e) {
-      this.logger.trace("Error during parsing environment file: %s", e.message);
-      throw e;
-    }
-  }
-  stringify(data) {
-    return Object.entries(data).map(([k, v]) => `${k}=${v}`).join(EOL3) + EOL3;
-  }
-}, __name(_a14, "EnvironmentVariableParser"), __publicField(_a14, "extensions", [
-  "env"
-]), _a14);
-EnvironmentVariableParser = _ts_decorate14([
-  Injectable8(),
-  _ts_metadata8("design:type", Function),
-  _ts_metadata8("design:paramtypes", [
-    typeof LoggerService === "undefined" ? Object : LoggerService
-  ])
-], EnvironmentVariableParser);
-
-// src/lib/parser/fts/json-parser.service.ts
-import { Injectable as Injectable9 } from "@nestjs/common";
-function _ts_decorate15(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;
-}
-__name(_ts_decorate15, "_ts_decorate");
-function _ts_metadata9(k, v) {
-  if (typeof Reflect === "object" && typeof Reflect.metadata === "function")
-    return Reflect.metadata(k, v);
-}
-__name(_ts_metadata9, "_ts_metadata");
-var _a15;
-var JsonParser = (_a15 = class {
-  constructor(logger) {
-    __publicField(this, "logger");
-    this.logger = logger;
-    this.logger.setup(this.constructor.name);
-  }
-  parse(data) {
-    try {
-      return JSON.parse(data.toString());
-    } catch (e) {
-      this.logger.trace("Error during parsing JSON file: %s", e.message);
-      throw e;
-    }
-  }
-  stringify(data) {
-    return JSON.stringify(data, null, 2);
-  }
-}, __name(_a15, "JsonParser"), __publicField(_a15, "extensions", [
-  "json"
-]), _a15);
-JsonParser = _ts_decorate15([
-  Injectable9(),
-  _ts_metadata9("design:type", Function),
-  _ts_metadata9("design:paramtypes", [
-    typeof LoggerService === "undefined" ? Object : LoggerService
-  ])
-], JsonParser);
-
-// src/lib/parser/fts/yaml-parser.service.ts
-import { Injectable as Injectable10 } from "@nestjs/common";
-import { parse, stringify } from "yaml";
-function _ts_decorate16(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;
-}
-__name(_ts_decorate16, "_ts_decorate");
-function _ts_metadata10(k, v) {
-  if (typeof Reflect === "object" && typeof Reflect.metadata === "function")
-    return Reflect.metadata(k, v);
-}
-__name(_ts_metadata10, "_ts_metadata");
-var _a16;
-var YamlParser = (_a16 = class {
-  constructor(logger) {
-    __publicField(this, "logger");
-    this.logger = logger;
-    this.logger.setup(this.constructor.name);
-  }
-  parse(data) {
-    try {
-      return parse(data.toString());
-    } catch (e) {
-      this.logger.trace("Error during parsing YAML file: %s", e.message);
-      throw e;
-    }
-  }
-  stringify(data) {
-    return stringify(data, {
-      prettyErrors: true
-    });
-  }
-}, __name(_a16, "YamlParser"), __publicField(_a16, "extensions", [
-  "yaml",
-  "yml"
-]), _a16);
-YamlParser = _ts_decorate16([
-  Injectable10(),
-  _ts_metadata10("design:type", Function),
-  _ts_metadata10("design:paramtypes", [
-    typeof LoggerService === "undefined" ? Object : LoggerService
-  ])
-], YamlParser);
-
 // src/lib/validator/validator.constants.ts
 var TOKEN_VALIDATOR_SERVICE_OPTIONS = Symbol("TOKEN_VALIDATOR_SERVICE_OPTIONS");
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cenk1cenk2/oclif-common",
-  "version": "6.1.0",
+  "version": "6.2.0",
   "description": "Oclif common package for oclif2 projects.",
   "repository": "https://gitlab.kilic.dev/libraries/oclif-tools",
   "type": "module",