@cenk1cenk2/oclif-common 6.2.0 → 6.2.2

package/dist/index.d.ts

@@ -35,9 +35,9 @@ interface ConfigModuleOptions {
 }
 
 declare class GenericParser {
-    static extensions: string[];
-    parse<T = unknown>(data: string | Buffer): T | Promise<T>;
-    stringify<T = any>(data: T): string | Promise<string>;
+    readonly extensions: string[];
+    parse<T = unknown>(data: string | Buffer): T;
+    stringify<T = any>(data: T): string;
 }
 
 declare function pipeProcessThroughListr(task: ListrTaskWrapper<any, any, any>, instance: ExecaChildProcess): ExecaChildProcess;
@@ -126,7 +126,7 @@ declare class LoggerModule {
 
 declare class EnvironmentVariableParser implements GenericParser {
     private readonly logger;
-    static extensions: string[];
+    readonly extensions: string[];
     private readonly LINE;
     constructor(logger: LoggerService);
     parse<T = unknown>(data: string | Buffer): T;
@@ -135,7 +135,7 @@ declare class EnvironmentVariableParser implements GenericParser {
 
 declare class JsonParser implements GenericParser {
     private readonly logger;
-    static extensions: string[];
+    readonly extensions: string[];
     constructor(logger: LoggerService);
     parse<T = unknown>(data: string | Buffer): T;
     stringify<T = any>(data: T): string;
@@ -143,7 +143,7 @@ declare class JsonParser implements GenericParser {
 
 declare class YamlParser implements GenericParser {
     private readonly logger;
-    static extensions: string[];
+    readonly extensions: string[];
     constructor(logger: LoggerService);
     parse<T = unknown>(data: string | Buffer): T;
     stringify<T = any>(data: T): string;
@@ -183,7 +183,7 @@ declare class ParserService {
     private moduleRef;
     private fs;
     private readonly logger;
-    parsers: ClassType<GenericParser>[];
+    private readonly instances;
     constructor(moduleRef: ModuleRef, fs: FileSystemService, logger: LoggerService);
     byFt(file: string): GenericParser;
     fetch<T extends GenericParser>(Parser: ClassType<T>): T;
@@ -191,8 +191,10 @@ declare class ParserService {
     register(...parsers: ClassType<GenericParser>[]): Promise<void>;
     read<T = unknown>(file: string): Promise<T>;
     write<T = LockableData>(file: string, data: T): Promise<void>;
-    parse<T = unknown>(file: string, data: string | Buffer): Promise<T>;
-    stringify<T = any>(file: string, data: T): Promise<string>;
+    parse<T = unknown>(file: string, data: string | Buffer): T;
+    parseWith<T = unknown>(Parser: ClassType<GenericParser>, data: string | Buffer): T;
+    stringify<T = any>(file: string, data: T): string;
+    stringifyWith<T = any>(Parser: ClassType<GenericParser>, data: T): string;
 }
 
 type SetCtxDefaultsOptions<T extends ListrContext = ListrContext> = Partial<T>;

package/dist/index.js

@@ -611,49 +611,63 @@ var ParserService = (_a6 = class {
     __publicField(this, "moduleRef");
     __publicField(this, "fs");
     __publicField(this, "logger");
-    __publicField(this, "parsers");
+    __publicField(this, "instances");
     this.moduleRef = moduleRef;
     this.fs = fs2;
     this.logger = logger;
-    this.parsers = [];
+    this.instances = [];
     this.logger.setup(this.constructor.name);
   }
   byFt(file) {
     const ext = (file.includes(".") ? this.fs.extname(file) : file).replace(/^\./, "");
-    const Parser = this.parsers.find((parser) => parser.extensions.includes(ext));
+    const Parser = this.instances.find((parser) => parser.extensions.includes(ext));
     if (!Parser) {
       throw new Error(`Parser for the extension is not configured: ${ext}`);
     }
-    return this.fetch(Parser);
+    return Parser;
   }
   fetch(Parser) {
-    return this.moduleRef.get(Parser);
+    const parser = this.instances.find((instance) => instance instanceof Parser);
+    if (!parser) {
+      throw new Error(`Specified parser has not been initiated: ${Parser.name}`);
+    }
+    return parser;
   }
   async inject(Parser) {
     const parser = await this.moduleRef.create(Parser);
+    this.instances.push(parser);
     return parser;
   }
   async register(...parsers) {
-    this.parsers.push(...parsers);
     await Promise.all(parsers.map(async (parser) => this.inject(parser)));
-    this.logger.trace("Registered parsers: %o", this.parsers.map((p) => p.name));
+    this.logger.trace("Registered parsers: %o", parsers.map((p) => p.name));
   }
   async read(file) {
     return this.parse(file, await this.fs.read(file));
   }
   async write(file, data) {
-    return this.fs.write(file, await this.stringify(file, data));
+    return this.fs.write(file, this.stringify(file, data));
   }
-  async parse(file, data) {
+  parse(file, data) {
     const parser = this.byFt(file);
     this.logger.trace("Parsing file: %s -> %s", file, parser.constructor.name);
     return parser.parse(data);
   }
-  async stringify(file, data) {
+  parseWith(Parser, data) {
+    const parser = this.fetch(Parser);
+    this.logger.trace("Parsing data with: %s", parser.constructor.name);
+    return parser.parse(data);
+  }
+  stringify(file, data) {
     const parser = this.byFt(file);
     this.logger.trace("Stringifying file: %s -> %s", file, parser.constructor.name);
     return parser.stringify(data);
   }
+  stringifyWith(Parser, data) {
+    const parser = this.fetch(Parser);
+    this.logger.trace("Stringifying data: %s", parser.constructor.name);
+    return parser.stringify(data);
+  }
 }, __name(_a6, "ParserService"), _a6);
 ParserService = _ts_decorate6([
   Injectable4(),
@@ -1017,8 +1031,12 @@ var _a10;
 var EnvironmentVariableParser = (_a10 = class {
   constructor(logger) {
     __publicField(this, "logger");
+    __publicField(this, "extensions");
     __publicField(this, "LINE");
     this.logger = logger;
+    this.extensions = [
+      "env"
+    ];
     this.LINE = /(?:^|^)\s*(?:export\s+)?([\w.-]+)(?:\s*=\s*?|:\s+?)(\s*'(?:\\'|[^'])*'|\s*"(?:\\"|[^"])*"|\s*`(?:\\`|[^`])*`|[^#\r\n]+)?\s*(?:#.*)?(?:$|$)/gm;
     this.logger.setup(this.constructor.name);
   }
@@ -1041,9 +1059,7 @@ var EnvironmentVariableParser = (_a10 = class {
   stringify(data) {
     return Object.entries(data).map(([k, v]) => `${k}=${v}`).join(EOL2) + EOL2;
   }
-}, __name(_a10, "EnvironmentVariableParser"), __publicField(_a10, "extensions", [
-  "env"
-]), _a10);
+}, __name(_a10, "EnvironmentVariableParser"), _a10);
 EnvironmentVariableParser = _ts_decorate10([
   Injectable6(),
   _ts_metadata6("design:type", Function),
@@ -1074,7 +1090,11 @@ var _a11;
 var JsonParser = (_a11 = class {
   constructor(logger) {
     __publicField(this, "logger");
+    __publicField(this, "extensions");
     this.logger = logger;
+    this.extensions = [
+      "json"
+    ];
     this.logger.setup(this.constructor.name);
   }
   parse(data) {
@@ -1088,9 +1108,7 @@ var JsonParser = (_a11 = class {
   stringify(data) {
     return JSON.stringify(data, null, 2);
   }
-}, __name(_a11, "JsonParser"), __publicField(_a11, "extensions", [
-  "json"
-]), _a11);
+}, __name(_a11, "JsonParser"), _a11);
 JsonParser = _ts_decorate11([
   Injectable7(),
   _ts_metadata7("design:type", Function),
@@ -1122,7 +1140,12 @@ var _a12;
 var YamlParser = (_a12 = class {
   constructor(logger) {
     __publicField(this, "logger");
+    __publicField(this, "extensions");
     this.logger = logger;
+    this.extensions = [
+      "yaml",
+      "yml"
+    ];
     this.logger.setup(this.constructor.name);
   }
   parse(data) {
@@ -1138,10 +1161,7 @@ var YamlParser = (_a12 = class {
       prettyErrors: true
     });
   }
-}, __name(_a12, "YamlParser"), __publicField(_a12, "extensions", [
-  "yaml",
-  "yml"
-]), _a12);
+}, __name(_a12, "YamlParser"), _a12);
 YamlParser = _ts_decorate12([
   Injectable8(),
   _ts_metadata8("design:type", Function),
@@ -1292,7 +1312,7 @@ var LockerService = (_a13 = 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.parser.fetch(this.options.parser).stringify(data));
+    return this.fs.write(this.options.file, this.parser.fetch(this.options.parser).stringify(data));
   }
   buildPath(d) {
     if (d?.root !== true && this.options.root?.length) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cenk1cenk2/oclif-common",
-  "version": "6.2.0",
+  "version": "6.2.2",
   "description": "Oclif common package for oclif2 projects.",
   "repository": "https://gitlab.kilic.dev/libraries/oclif-tools",
   "type": "module",
@@ -70,7 +70,7 @@
   },
   "devDependencies": {
     "@listr2/manager": "^1.0.2",
-    "@oclif/core": "^3.9.2",
+    "@oclif/core": "^3.10.0",
     "@types/fs-extra": "^11.0.3",
     "@types/through": "^0.0.32",
     "@types/update-notifier": "^6.0.6",