refactoring

Author: counters

src/app.module.ts

@@ -4,6 +4,8 @@ import {VersionCommand} from "./commands/VersionCommand";
 import {WalletCommand} from "./commands/wallet/WalletCommand";
 import {ConfigModule} from "@nestjs/config";
 import {ConfirmQuestion} from "./questions/ConfirmQuestion";
+import {ContentExporter} from "./services/ContentExporter";
+import {MagicPipConvert} from "./questions/MagicPipConvert";
 
 @Module({
     imports: [ConfigModule.forRoot()],
@@ -13,6 +15,8 @@ import {ConfirmQuestion} from "./questions/ConfirmQuestion";
         ...ApiCommand.registerWithSubCommands(),
         ...WalletCommand.registerWithSubCommands(),
         ConfirmQuestion,
+        ContentExporter,
+        MagicPipConvert,
     ],
 })
 export class AppModule {

src/commands/api/CandidateCommand.ts

@@ -1,11 +1,6 @@
 import {Option, CommandRunner, SubCommand} from 'nest-commander';
 import {MinterApiService} from '../../services/minter-api/minter-api.service';
-import {JsonPatches} from "../../utils/JsonPatches";
-
-import {search} from 'jmespath'
-import {MagicPipConvert} from "../../questions/MagicPipConvert";
-
-// import * as jmespath from 'jmespath'
+import {ContentExporter} from "../../services/ContentExporter";
 
 @SubCommand({
     name: 'candidate',
@@ -14,8 +9,9 @@ import {MagicPipConvert} from "../../questions/MagicPipConvert";
     description: 'Candidate returns candidate’s info by provided public key',
 })
 export class CandidateCommand extends CommandRunner {
+    private skip_pip2bip = false;
 
-    constructor() {
+    constructor(private contentExporter: ContentExporter) {
         super();
     }
 
@@ -36,29 +32,15 @@ export class CandidateCommand extends CommandRunner {
 
         minterApi.api().getCandidateGrpc(candidate, options.not_show_stakes, options.height).then((r) => {
                 const result = r.toObject()
-                let out: any;
-                // const mpc = new MagicPipConvert()
-                if (options.patches) {
-                    new JsonPatches().printPropertyNames(result)
-                } else if (options.patch && options.patch.length > 0) {
-                    // out=result[options.patch]
-                    out = search(result, options.patch)
-                } else {
-                    out = result
-                }
-                out = new MagicPipConvert().replaceLongNumericStrings(out)
-                if (!options.pretty) {
-                    process.stdout.write(JSON.stringify(out));
-                } else {
-                    console.warn((out))
-                    // console.warn(out)
-                }
+                this.contentExporter.print(result, this.skip_pip2bip, options)
             }
         )
             .catch(console.log);
         return Promise.resolve(undefined);
     }
 
+
+
     @Option({
         flags: '--height [number]',
         name: 'Height',
@@ -114,4 +96,16 @@ export class CandidateCommand extends CommandRunner {
     parsePretty(val: string): boolean {
         return JSON.parse(val);
     }
+
+    @Option({
+        flags: '--skip_pip2bip',
+        name: 'skip_pip2bip',
+        description: 'Skip convert PIP to BIP',
+        defaultValue: false,
+    })
+    parseSkipPip2Bip(val: string): boolean {
+        this.skip_pip2bip = true;
+        return JSON.parse(val);
+    }
+
 }

src/questions/MagicPipConvert.ts

@@ -1,23 +1,23 @@
 import {ConvertAmount} from "minter-typescript-sdk";
+import {Injectable} from "@nestjs/common";
 
+@Injectable()
 export class MagicPipConvert {
     private minLength = 12;
-
     private convertAmount = new ConvertAmount()
 
-    replaceLongNumericStrings(input: any): any {
+    mbPipToBip(input: any): any {
         if (Array.isArray(input)) {
-            return input.map(item => this.replaceLongNumericStrings(item));
+            return input.map(item => this.mbPipToBip(item));
         } else if (typeof input === 'object' && input !== null) {
             const result: { [key: string]: any } = {};
             for (const key in input) {
                 if (input.hasOwnProperty(key)) {
-                    result[key] = this.replaceLongNumericStrings(input[key]);
+                    result[key] = this.mbPipToBip(input[key]);
                 }
             }
             return result;
         } else if (typeof input === 'string') {
-
             if (/^\d+$/.test(input) && input.length >= this.minLength) {
                 return this.convertAmount.toBip(input);
             }

src/services/ContentExporter.ts

@@ -0,0 +1,32 @@
+import {Injectable} from "@nestjs/common";
+import {JsonPatches} from "../utils/JsonPatches";
+import {search} from "jmespath";
+import {MagicPipConvert} from "../questions/MagicPipConvert";
+
+@Injectable()
+export class ContentExporter {
+
+    print(
+        result: Record<string, any> | string,
+        skip_pip2bip: boolean,
+        options: {
+            patch?: string;
+            patches: boolean;
+            pretty: boolean
+        }) {
+        let out: any;
+        if (options.patches) {
+            new JsonPatches().printPropertyNames(result)
+        } else if (options.patch && options.patch.length > 0) {
+            out = search(result, options.patch)
+        } else {
+            out = result
+        }
+        if (!skip_pip2bip) out = new MagicPipConvert().mbPipToBip(out)
+        if (!options.pretty) {
+            process.stdout.write(JSON.stringify(out));
+        } else {
+            console.info((out))
+        }
+    }
+}

src/utils/JsonPatches.ts

@@ -2,7 +2,7 @@ export class JsonPatches {
 
     printPropertyNames(obj: any, prefix = ""): void {
         this.propertyNames(obj, prefix).forEach((propertyName) => {
-            console.log(propertyName);
+            console.info(propertyName);
         })
     }