@soratani-code/samtools 1.3.21 → 1.5.0

package/lib/tools.d.ts

@@ -1,5 +1,12 @@
 export declare function isDeepEqual(a: any, b: any): any;
 export declare function deepDelete(data: any, path: string): any;
 export declare function insertArray(arr: any[], index: number, item: any): any[];
-export declare function parseTemplateToOptions(source: string, template: string): Record<string, any>[];
+export declare function parseTemplateToOptions(source: string, template: string): {
+    text: string;
+    options: any;
+};
 export declare function mergeTemplateToSource(source: string, template: string): string;
+export declare function replaceTemplateFromOptions(template: string, options: {
+    label: string;
+    value: any;
+}[]): string;

package/lib/tools.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergeTemplateToSource = exports.parseTemplateToOptions = exports.insertArray = exports.deepDelete = exports.isDeepEqual = void 0;
+exports.replaceTemplateFromOptions = exports.mergeTemplateToSource = exports.parseTemplateToOptions = exports.insertArray = exports.deepDelete = exports.isDeepEqual = void 0;
 const lodash_1 = require("lodash");
 const type_1 = require("./type");
 function isDeepEqual(a, b) {
@@ -72,39 +72,54 @@ function insertArray(arr, index, item) {
 }
 exports.insertArray = insertArray;
 function parseTemplateToOptions(source, template) {
-    var _a;
+    var _a, _b;
+    if (!template)
+        return { text: template || '', options: [] };
+    const normalizeOp = (ch) => (ch === '−' ? '-' : ch);
+    const cleanLabelPiece = (s) => (s || '').replace(/[()（）]/g, '').trim();
     const valueTokens = [];
     const valueRe = /\$\{\s*([^}]*)\s*\}/g;
     let m;
-    while ((m = valueRe.exec(template !== null && template !== void 0 ? template : '')) !== null) {
+    while ((m = valueRe.exec(template)) !== null) {
         valueTokens.push(m[1]);
     }
-    const rawLabels = source
-        ? source.split(/\s*[+-]\s*/).map(s => s.trim()).filter(Boolean)
+    const rawLabelPieces = source
+        ? source.split(/\s*[+\-−]\s*/).map((s) => cleanLabelPiece(s)).filter(Boolean)
         : [];
-    const cleanLabel = (s) => s.replace(/[()（）]/g, '').trim();
-    const labels = rawLabels.map(cleanLabel);
-    const opsFromLabel = source ? (source.match(/[+-]/g) || []) : [];
-    const opsFromValue = template ? (template.match(/[+-]/g) || []) : [];
+    const opsFromLabel = source ? Array.from(source.matchAll(/[+\-−]/g)).map(x => normalizeOp(x[0])) : [];
+    const opsFromValue = template ? Array.from(template.matchAll(/[+\-−]/g)).map(x => normalizeOp(x[0])) : [];
     const ops = opsFromLabel.length ? opsFromLabel : opsFromValue;
-    const parseValue = (token) => {
-        if (token == null)
+    const parseToken = (tok) => {
+        if (tok == null)
             return null;
-        const t = token.trim();
+        const t = String(tok).trim();
         if (t === '' || t.toLowerCase() === 'null')
             return null;
         const n = Number(t);
         return Number.isFinite(n) ? n : null;
     };
-    const len = Math.max(labels.length, valueTokens.length);
-    const result = [];
+    const len = Math.max(valueTokens.length, rawLabelPieces.length);
+    const options = [];
     for (let i = 0; i < len; i++) {
-        const label = (_a = labels[i]) !== null && _a !== void 0 ? _a : '';
-        const raw = valueTokens[i];
-        const value = parseValue(raw);
-        result.push({ label, value });
+        const label = (_a = rawLabelPieces[i]) !== null && _a !== void 0 ? _a : '';
+        const raw = (_b = valueTokens[i]) !== null && _b !== void 0 ? _b : '';
+        const value = parseToken(raw);
+        options.push({ label, raw, value });
     }
-    return result;
+    let idx = 0;
+    const text = template.replace(/\$\{\s*([^}]*)\s*\}/g, (match, inner) => {
+        const token = inner == null ? '' : String(inner).trim();
+        const labelForThis = options[idx] ? (options[idx].label || '') : '';
+        idx += 1;
+        if (token === '' || token.toLowerCase() === 'null') {
+            return '${' + labelForThis + '}';
+        }
+        return match;
+    });
+    return {
+        text,
+        options,
+    };
 }
 exports.parseTemplateToOptions = parseTemplateToOptions;
 function mergeTemplateToSource(source, template) {
@@ -130,3 +145,12 @@ function mergeTemplateToSource(source, template) {
     return replaced;
 }
 exports.mergeTemplateToSource = mergeTemplateToSource;
+function replaceTemplateFromOptions(template, options) {
+    return (0, lodash_1.reduce)(options, (tpl, opt) => {
+        const has = template.includes('${' + opt.value + '}');
+        if (has)
+            tpl;
+        return tpl.replace('${' + opt.label + '}', '${' + opt.value + '}');
+    }, (0, lodash_1.cloneDeep)(template));
+}
+exports.replaceTemplateFromOptions = replaceTemplateFromOptions;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@soratani-code/samtools",
-  "version": "1.3.21",
+  "version": "1.5.0",
   "description": "",
   "typings": "lib/index.d.ts",
   "main": "lib/index.js",