@soratani-code/samtools 1.5.1 → 1.5.2

package/lib/tools.d.ts

@@ -1,9 +1,11 @@
 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): {
+export declare function parseTemplateToOptions(source: string, template: string, opts?: {
+    keepBraces?: boolean;
+}): {
     text: string;
-    options: any;
+    items: any[];
 };
 export declare function mergeTemplateToSource(source: string, template: string): string;
 export declare function replaceTemplateFromOptions(template: string, options: {

package/lib/tools.js

@@ -71,55 +71,40 @@ function insertArray(arr, index, item) {
     return clone;
 }
 exports.insertArray = insertArray;
-function parseTemplateToOptions(source, template) {
+function parseTemplateToOptions(source, template, opts) {
     var _a, _b;
+    const keepBraces = !!(opts === null || opts === void 0 ? void 0 : opts.keepBraces);
     if (!template)
-        return { text: template || '', options: [] };
+        return { text: '', items: [] };
     const normalizeOp = (ch) => (ch === '−' ? '-' : ch);
-    const cleanLabelPiece = (s) => (s || '').replace(/[()（）]/g, '').trim();
+    const cleanLabel = (s) => (s !== null && s !== void 0 ? s : '').replace(/[()（）]/g, '').trim();
     const valueTokens = [];
-    const valueRe = /\$\{\s*([^}]*)\s*\}/g;
+    const valRe = /\$\{\s*([^}]*)\s*\}/g;
     let m;
-    while ((m = valueRe.exec(template)) !== null) {
+    while ((m = valRe.exec(template)) !== null) {
         valueTokens.push(m[1]);
     }
-    const rawLabelPieces = source
-        ? source.split(/\s*[+\-−]\s*/).map((s) => cleanLabelPiece(s)).filter(Boolean)
-        : [];
-    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 parseToken = (tok) => {
-        if (tok == null)
-            return null;
-        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(valueTokens.length, rawLabelPieces.length);
-    const options = [];
+    const labelSegmentsRaw = source ? source.split(/[+\-−*/]/) : [];
+    const labelSegments = labelSegmentsRaw.map(s => cleanLabel(s));
+    const len = Math.max(valueTokens.length, labelSegments.length);
+    const items = [];
     for (let i = 0; i < len; i++) {
-        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 });
+        const raw = (_a = valueTokens[i]) !== null && _a !== void 0 ? _a : '';
+        const label = (_b = labelSegments[i]) !== null && _b !== void 0 ? _b : '';
+        const value = Number(raw);
+        items.push({ label, value: isNaN(value) ? null : value });
     }
-    let idx = 0;
+    let index = 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;
+        const mappedLabel = items[index] ? items[index].label : '';
+        index += 1;
         if (token === '' || token.toLowerCase() === 'null') {
-            return '${' + labelForThis + '}';
+            return keepBraces ? `\${${mappedLabel}}` : mappedLabel;
         }
         return match;
     });
-    return {
-        text,
-        options,
-    };
+    return { text, items };
 }
 exports.parseTemplateToOptions = parseTemplateToOptions;
 function mergeTemplateToSource(source, template) {

package/package.json

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