hybridtm 0.8.0 → 0.9.1

package/dist/cli/importCommand.js

@@ -2,7 +2,7 @@
  * Copyright (c) 2025-2026 Maxprograms.
  *
  * This program and the accompanying materials
- * are made available under the terms of the Eclipse   License 1.0
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/org/documents/epl-v10.html
  *
@@ -12,92 +12,91 @@
 import { extname } from "node:path";
 import { HybridTMFactory } from '../index.js';
 import { CliUtils } from './cliUtils.js';
-export function usage() {
-    console.log('Usage: hybridtm import -name <name> -file <path> [-type xliff|tmx|sdltm]');
-    console.log('                        [-minState initial|translated|reviewed|final]');
-    console.log('                        [-keepEmpty] [-noMetadata]');
-    console.log();
-    console.log('  -name             Instance to import into (required)');
-    console.log('  -file             File to import (required)');
-    console.log('  -type             Import format; inferred from the file extension when omitted');
-    console.log('  -minState         Minimum segment state to import (default: translated)');
-    console.log('  -keepEmpty        Import segments with an empty target (default: skipped)');
-    console.log('  -noMetadata       Skip extracting notes/metadata/extension attributes');
-}
-export async function runImportCommand(args) {
-    if (CliUtils.hasFlag(args, '-help')) {
-        usage();
-        return;
-    }
-    const name = CliUtils.getFlag(args, '-name');
-    const rawFile = CliUtils.getFlag(args, '-file');
-    if (!name || !rawFile) {
-        usage();
-        CliUtils.fail('Missing required -name or -file.');
+export class ImportCommand {
+    static usage() {
+        console.log('Usage: hybridtm import -name <name> -file <path> [-type xliff|tmx|sdltm]');
+        console.log('                        [-minState initial|translated|reviewed|final]');
+        console.log('                        [-noMetadata]');
+        console.log();
+        console.log('  -name             Instance to import into (required)');
+        console.log('  -file             File to import (required)');
+        console.log('  -type             Import format; inferred from the file extension when omitted');
+        console.log('  -minState         Minimum segment state to import (default: translated)');
+        console.log('  -noMetadata       Skip extracting notes/metadata/extension attributes');
     }
-    const filePath = CliUtils.requireExistingFile(rawFile, 'Import file');
-    const type = resolveImportType(CliUtils.getFlag(args, '-type'), filePath);
-    const options = buildImportOptions(args);
-    const tm = HybridTMFactory.getInstance(name);
-    if (!tm) {
-        CliUtils.fail('No instance named "' + name + '". Run "hybridtm create" or "hybridtm list" first.');
+    static async run(args) {
+        if (CliUtils.hasFlag(args, '-help')) {
+            ImportCommand.usage();
+            return;
+        }
+        const name = CliUtils.getFlag(args, '-name');
+        const rawFile = CliUtils.getFlag(args, '-file');
+        if (!name || !rawFile) {
+            ImportCommand.usage();
+            CliUtils.fail('Missing required -name or -file.');
+        }
+        const filePath = CliUtils.requireExistingFile(rawFile, 'Import file');
+        const options = ImportCommand.buildImportOptions(args);
+        const tm = HybridTMFactory.getInstance(name);
+        if (!tm) {
+            CliUtils.fail('No instance named "' + name + '". Run "hybridtm create" or "hybridtm list" first.');
+        }
+        try {
+            const type = ImportCommand.resolveImportType(CliUtils.getFlag(args, '-type'), filePath);
+            const count = await ImportCommand.importFile(tm, filePath, type, options);
+            console.log('Imported ' + count + ' entries from ' + filePath + ' into "' + name + '".');
+        }
+        catch (error) {
+            CliUtils.fail(error instanceof Error ? error.message : String(error));
+        }
+        finally {
+            await tm.close();
+        }
     }
-    try {
-        let count;
+    static async importFile(tm, filePath, type, options) {
         switch (type) {
             case 'xliff':
-                count = await tm.importXLIFF(filePath, options);
-                break;
+                return await tm.importXLIFF(filePath, options);
             case 'tmx':
-                count = await tm.importTMX(filePath, options);
-                break;
+                return await tm.importTMX(filePath, options);
             case 'sdltm':
-                count = await tm.importSDLTM(filePath, options);
-                break;
+                return await tm.importSDLTM(filePath, options);
         }
-        console.log('Imported ' + count + ' entries from ' + filePath + ' into "' + name + '".');
-    }
-    catch (error) {
-        CliUtils.fail(error instanceof Error ? error.message : String(error));
     }
-    finally {
-        await tm.close();
-    }
-}
-function resolveImportType(explicit, filePath) {
-    if (explicit === 'xliff' || explicit === 'tmx' || explicit === 'sdltm') {
-        return explicit;
-    }
-    if (explicit !== undefined) {
-        CliUtils.fail('Unknown -type value "' + explicit + '". Expected xliff, tmx, or sdltm.');
-    }
-    const ext = extname(filePath).toLowerCase();
-    if (ext === '.xlf' || ext === '.xliff') {
-        return 'xliff';
-    }
-    if (ext === '.tmx') {
-        return 'tmx';
+    static resolveImportType(explicit, filePath) {
+        if (explicit === 'xliff' || explicit === 'tmx' || explicit === 'sdltm') {
+            return explicit;
+        }
+        if (explicit !== undefined) {
+            throw new Error('Unknown import type "' + explicit + '". Expected xliff, tmx, or sdltm.');
+        }
+        const ext = extname(filePath).toLowerCase();
+        if (ext === '.xlf' || ext === '.xliff') {
+            return 'xliff';
+        }
+        if (ext === '.tmx') {
+            return 'tmx';
+        }
+        if (ext === '.sdltm') {
+            return 'sdltm';
+        }
+        throw new Error('Could not infer import type from "' + filePath + '". Pass an explicit type.');
     }
-    if (ext === '.sdltm') {
-        return 'sdltm';
+    static isTranslationState(value) {
+        return value === 'initial' || value === 'translated' || value === 'reviewed' || value === 'final';
     }
-    CliUtils.fail('Could not infer import type from "' + filePath + '". Pass -type explicitly.');
-}
-function buildImportOptions(args) {
-    const options = {
-        skipEmpty: !CliUtils.hasFlag(args, '-keepEmpty'),
-        extractMetadata: !CliUtils.hasFlag(args, '-noMetadata')
-    };
-    const minState = CliUtils.getFlag(args, '-minState');
-    if (minState !== undefined) {
-        if (!isTranslationState(minState)) {
-            CliUtils.fail('Unknown -minState value "' + minState + '". Expected initial, translated, reviewed, or final.');
+    static buildImportOptions(args) {
+        const options = {
+            extractMetadata: !CliUtils.hasFlag(args, '-noMetadata')
+        };
+        const minState = CliUtils.getFlag(args, '-minState');
+        if (minState !== undefined) {
+            if (!ImportCommand.isTranslationState(minState)) {
+                CliUtils.fail('Unknown -minState value "' + minState + '". Expected initial, translated, reviewed, or final.');
+            }
+            options.minState = minState;
         }
-        options.minState = minState;
+        return options;
     }
-    return options;
-}
-function isTranslationState(value) {
-    return value === 'initial' || value === 'translated' || value === 'reviewed' || value === 'final';
 }
 //# sourceMappingURL=importCommand.js.map

package/dist/cli/importCommand.js.map

@@ -1 +1 @@
-{"version":3,"file":"importCommand.js","sourceRoot":"","sources":["../../ts/cli/importCommand.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"importCommand.js","sourceRoot":"","sources":["../../ts/cli/importCommand.ts"],"names":[],"mappings":"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"}

package/dist/cli/matchCommand.d.ts

@@ -2,12 +2,26 @@
  * Copyright (c) 2025-2026 Maxprograms.
  *
  * This program and the accompanying materials
- * are made available under the terms of the Eclipse   License 1.0
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/org/documents/epl-v10.html
  *
  * Contributors:
  *     Maxprograms - initial API and implementation
  *******************************************************************************/
-export declare function usage(): void;
-export declare function runMatchCommand(args: string[]): Promise<void>;
+import { HybridTM } from '../index.js';
+export interface MatchResult {
+    segmentsProcessed: number;
+    segmentsWithMatches: number;
+    totalMatches: number;
+    outputPath: string;
+}
+export declare class MatchCommand {
+    static usage(): void;
+    static run(args: string[]): Promise<void>;
+    static matchXliffFile(tm: HybridTM, filePath: string, outputPath: string, similarity: number, limit?: number): Promise<MatchResult>;
+    static resolveOutputPath(explicit: string | undefined, inputPath: string): string;
+    private static collectUnits;
+    private static declareMatchesNamespace;
+    private static parseIntOption;
+}

package/dist/cli/matchCommand.js

@@ -2,7 +2,7 @@
  * Copyright (c) 2025-2026 Maxprograms.
  *
  * This program and the accompanying materials
- * are made available under the terms of the Eclipse   License 1.0
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/org/documents/epl-v10.html
  *
@@ -10,68 +10,75 @@
  *     Maxprograms - initial API and implementation
  *******************************************************************************/
 import { basename, dirname, extname, join } from "node:path";
-import { XliffData, XliffGroup, XliffMatch, XliffMatches, XliffMrk, XliffOriginalData, XliffParser, XliffPc, XliffPh, XliffSegment, XliffSource, XliffTarget } from 'typesxliff';
-import { TextNode, XMLElement } from "typesxml";
+import { XliffGroup, XliffMatches, XliffParser, XliffSegment } from 'typesxliff';
 import { HybridTMFactory, Utils } from '../index.js';
 import { CliUtils } from './cliUtils.js';
-const MATCHES_NAMESPACE = 'urn:oasis:names:tc:xliff:matches:2.0';
-const DEFAULT_PREFIX = 'mtc';
-const DEFAULT_LIMIT = 5;
-const DEFAULT_SIMILARITY = 60;
-const PLACEHOLDER_TAGS = new Set(['ph', 'bpt', 'ept', 'it', 'sc', 'ec', 'cp']);
-export function usage() {
-    console.log('Usage: hybridtm match -name <name> -file <path> [-output <path>]');
-    console.log('                       [-limit N] [-similarity N] [-all]');
-    console.log();
-    console.log('  -name        TM instance to search against (required)');
-    console.log('  -file        XLIFF file to enrich with match candidates (required)');
-    console.log('  -output      Output path (default: <file-without-ext>.matches.xlf)');
-    console.log('  -limit       Max candidates per segment (default: ' + DEFAULT_LIMIT + ')');
-    console.log('  -similarity  Minimum hybrid match score 0-100 (default: ' + DEFAULT_SIMILARITY + ')');
-    console.log('  -all         Consider every segment, not just untranslated ones');
-    console.log();
-    console.log('Never modifies <target>. Adds spec Translation Candidates module');
-    console.log('(<mtc:matches>/<mtc:match>) entries and writes the result to a new file.');
-}
-export async function runMatchCommand(args) {
-    if (CliUtils.hasFlag(args, '-help')) {
-        usage();
-        return;
-    }
-    const name = CliUtils.getFlag(args, '-name');
-    const rawFile = CliUtils.getFlag(args, '-file');
-    if (!name || !rawFile) {
-        usage();
-        CliUtils.fail('Missing required -name or -file.');
-    }
-    const filePath = CliUtils.requireExistingFile(rawFile, 'XLIFF file');
-    const limit = parseIntOption(CliUtils.getFlag(args, '-limit'), DEFAULT_LIMIT, '-limit', 1);
-    const similarity = parseIntOption(CliUtils.getFlag(args, '-similarity'), DEFAULT_SIMILARITY, '-similarity', 0, 100);
-    const processAll = CliUtils.hasFlag(args, '-all');
-    const outputPath = resolveOutputPath(CliUtils.getFlag(args, '-output'), filePath);
-    const tm = HybridTMFactory.getInstance(name);
-    if (!tm) {
-        CliUtils.fail('No instance named "' + name + '". Run "hybridtm create" or "hybridtm list" first.');
+export class MatchCommand {
+    static usage() {
+        console.log('Usage: hybridtm match -name <name> -file <path> -similarity N [-output <path>]');
+        console.log('                       [-limit N]');
+        console.log();
+        console.log('  -name        TM instance to search against (required)');
+        console.log('  -file        XLIFF file to enrich with match candidates (required)');
+        console.log('  -similarity  Minimum hybrid match score 0-100 (required)');
+        console.log('  -output      Output path (default: <file-without-ext>.matches.xlf)');
+        console.log('  -limit       Max candidates per segment (default: HybridTM.semanticTranslationSearch\'s own default)');
+        console.log();
+    }
+    static async run(args) {
+        if (CliUtils.hasFlag(args, '-help')) {
+            MatchCommand.usage();
+            return;
+        }
+        const name = CliUtils.getFlag(args, '-name');
+        const rawFile = CliUtils.getFlag(args, '-file');
+        const rawSimilarity = CliUtils.getFlag(args, '-similarity');
+        if (!name || !rawFile || !rawSimilarity) {
+            MatchCommand.usage();
+            CliUtils.fail('Missing required -name, -file, or -similarity.');
+        }
+        const filePath = CliUtils.requireExistingFile(rawFile, 'XLIFF file');
+        const rawLimit = CliUtils.getFlag(args, '-limit');
+        const limit = rawLimit !== undefined ? MatchCommand.parseIntOption(rawLimit, '-limit', 1) : undefined;
+        const similarity = MatchCommand.parseIntOption(rawSimilarity, '-similarity', 0, 100);
+        const outputPath = MatchCommand.resolveOutputPath(CliUtils.getFlag(args, '-output'), filePath);
+        const tm = HybridTMFactory.getInstance(name);
+        if (!tm) {
+            CliUtils.fail('No instance named "' + name + '". Run "hybridtm create" or "hybridtm list" first.');
+        }
+        try {
+            const result = await MatchCommand.matchXliffFile(tm, filePath, outputPath, similarity, limit);
+            console.log('Segments processed: ' + result.segmentsProcessed);
+            console.log('Segments with matches: ' + result.segmentsWithMatches);
+            console.log('Total match candidates: ' + result.totalMatches);
+            console.log('Output: ' + result.outputPath);
+        }
+        catch (error) {
+            CliUtils.fail(error instanceof Error ? error.message : String(error));
+        }
+        finally {
+            await tm.close();
+        }
     }
-    try {
+    static async matchXliffFile(tm, filePath, outputPath, similarity, limit) {
         const parser = new XliffParser();
         parser.parseFile(filePath);
         const document = parser.getXliffDocument();
         if (!document) {
-            CliUtils.fail('Unable to parse "' + filePath + '".');
+            throw new Error('Unable to parse "' + filePath + '".');
         }
         const rawSrcLang = document.getSrcLang();
         const srcLang = Utils.normalizeLanguage(rawSrcLang);
         if (!srcLang) {
-            CliUtils.fail('"' + filePath + '" has an invalid @srcLang value "' + rawSrcLang + '".');
+            throw new Error('"' + filePath + '" has an invalid @srcLang value "' + rawSrcLang + '".');
         }
         const rawTgtLang = document.getTrgLang();
         if (!rawTgtLang) {
-            CliUtils.fail('"' + filePath + '" is missing @trgLang; nothing to match against.');
+            throw new Error('"' + filePath + '" is missing @trgLang; nothing to match against.');
         }
         const tgtLang = Utils.normalizeLanguage(rawTgtLang);
         if (!tgtLang) {
-            CliUtils.fail('"' + filePath + '" has an invalid @trgLang value "' + rawTgtLang + '".');
+            throw new Error('"' + filePath + '" has an invalid @trgLang value "' + rawTgtLang + '".');
         }
         let segmentsProcessed = 0;
         let segmentsWithMatches = 0;
@@ -79,7 +86,7 @@ export async function runMatchCommand(args) {
         let usedModule = false;
         for (const file of document.getFiles()) {
             const fileId = file.getId();
-            for (const unit of collectUnits(file.getEntries())) {
+            for (const unit of MatchCommand.collectUnits(file.getEntries())) {
                 const unitMatches = [];
                 const unitId = unit.getId();
                 // shared so <ph>/<data> ids stay unique across the whole unit
@@ -88,27 +95,27 @@ export async function runMatchCommand(args) {
                     if (!(item instanceof XliffSegment)) {
                         continue;
                     }
-                    if (!processAll && !needsMatches(item)) {
+                    if (item.getState() === 'final') {
                         continue;
                     }
                     const source = item.getSource();
-                    const pureSource = source ? getPureText(source.getContent()) : '';
+                    const pureSource = source ? Utils.getPureText(source.toElement()) : '';
                     if (pureSource.trim().length === 0) {
                         continue;
                     }
                     segmentsProcessed++;
-                    const results = dedupeMatches(await tm.semanticTranslationSearch(pureSource, srcLang, tgtLang, similarity, limit));
+                    const results = Utils.dedupeMatches(await tm.semanticTranslationSearch(pureSource, srcLang, tgtLang, similarity, limit));
                     if (results.length === 0) {
                         continue;
                     }
                     segmentsWithMatches++;
                     totalMatches += results.length;
-                    const ref = '#/f=' + fileId + '/u=' + unitId + (item.getId() ? '/' + item.getId() : '');
-                    results.forEach((match) => unitMatches.push(buildXliffMatch(ref, match, dataCounter)));
+                    const ref = item.getId() ? '#' + item.getId() : '#/f=' + fileId + '/u=' + unitId;
+                    results.forEach((match) => unitMatches.push(Utils.buildXliffMatch(ref, match, dataCounter)));
                 }
                 if (unitMatches.length > 0) {
                     const matches = new XliffMatches();
-                    matches.setNamespacePrefix(DEFAULT_PREFIX);
+                    matches.setNamespacePrefix(Utils.MTC_PREFIX);
                     unitMatches.forEach((match) => matches.addMatch(match));
                     unit.setMatches(matches);
                     usedModule = true;
@@ -116,196 +123,43 @@ export async function runMatchCommand(args) {
             }
         }
         if (usedModule) {
-            declareMatchesNamespace(document);
+            MatchCommand.declareMatchesNamespace(document);
         }
         document.writeDocument(outputPath, true);
-        console.log('Segments processed: ' + segmentsProcessed);
-        console.log('Segments with matches: ' + segmentsWithMatches);
-        console.log('Total match candidates: ' + totalMatches);
-        console.log('Output: ' + outputPath);
-    }
-    catch (error) {
-        CliUtils.fail(error instanceof Error ? error.message : String(error));
+        return { segmentsProcessed, segmentsWithMatches, totalMatches, outputPath };
     }
-    finally {
-        await tm.close();
-    }
-}
-function dedupeMatches(matches) {
-    const seen = new Set();
-    return matches.filter((match) => {
-        const key = extractElementText(match.source).trim() + '\u00A0' + extractElementText(match.target).trim();
-        if (seen.has(key)) {
-            return false;
+    static resolveOutputPath(explicit, inputPath) {
+        if (explicit) {
+            return CliUtils.resolvePath(explicit);
         }
-        seen.add(key);
-        return true;
-    });
-}
-function collectUnits(entries) {
-    const units = [];
-    entries.forEach((entry) => {
-        if (entry instanceof XliffGroup) {
-            units.push(...collectUnits(entry.getEntries()));
-        }
-        else {
-            units.push(entry);
-        }
-    });
-    return units;
-}
-function needsMatches(segment) {
-    const state = segment.getState();
-    if (state === undefined || state === 'initial') {
-        return true;
-    }
-    const target = segment.getTarget();
-    if (!target) {
-        return true;
-    }
-    return getPureText(target.getContent()).trim().length === 0;
-}
-function buildXliffMatch(ref, match, dataCounter) {
-    const xliffMatch = new XliffMatch(ref);
-    xliffMatch.setNamespacePrefix(DEFAULT_PREFIX);
-    xliffMatch.setType('tm');
-    xliffMatch.setOrigin(match.origin);
-    // @similarity is source-text similarity; @matchQuality is the overall match rating
-    xliffMatch.setSimilarity(String(match.fuzzy));
-    xliffMatch.setMatchQuality(String(match.similarity));
-    const originalData = new XliffOriginalData();
-    const correlations = new Map();
-    const source = new XliffSource();
-    source.setContent(trimInlineContent(convertInlineContent(match.source, originalData, dataCounter, correlations, collectBptAnchors(match.source))));
-    xliffMatch.setSource(source);
-    const target = new XliffTarget();
-    target.setContent(trimInlineContent(convertInlineContent(match.target, originalData, dataCounter, correlations, collectBptAnchors(match.target))));
-    xliffMatch.setTarget(target);
-    if (originalData.getDataItems().length > 0) {
-        xliffMatch.setOriginalData(originalData);
-    }
-    return xliffMatch;
-}
-function collectBptAnchors(element) {
-    const anchors = new Map();
-    const walk = (node) => {
-        node.getContent().forEach((child) => {
-            if (!(child instanceof XMLElement)) {
-                return;
-            }
-            if (child.getName() === 'bpt') {
-                const i = child.getAttribute('i')?.getValue();
-                const x = child.getAttribute('x')?.getValue();
-                if (i && x) {
-                    anchors.set(i, x);
-                }
-            }
-            walk(child);
-        });
-    };
-    walk(element);
-    return anchors;
-}
-function convertInlineContent(element, originalData, counter, correlations, bptAnchors) {
-    const result = [];
-    element.getContent().forEach((node) => {
-        if (node instanceof TextNode) {
-            result.push(node.getValue());
-        }
-        else if (node instanceof XMLElement) {
-            const name = node.getName();
-            if (PLACEHOLDER_TAGS.has(name)) {
-                let anchor = node.getAttribute('x')?.getValue() ?? node.getAttribute('id')?.getValue();
-                if (!anchor && name === 'ept') {
-                    const i = node.getAttribute('i')?.getValue();
-                    anchor = i ? bptAnchors.get(i) : undefined;
-                }
-                const key = anchor ? name + ':' + anchor : undefined;
-                let ref = key ? correlations.get(key) : undefined;
-                if (!ref) {
-                    counter.value++;
-                    ref = { phId: 'mtcph' + counter.value, dataId: 'mtcd' + counter.value };
-                    const data = new XliffData(ref.dataId);
-                    data.addText(extractElementText(node));
-                    originalData.addData(data);
-                    if (key) {
-                        correlations.set(key, ref);
-                    }
-                }
-                const ph = new XliffPh(ref.phId);
-                ph.setDataRef(ref.dataId);
-                result.push(ph);
+        const ext = extname(inputPath);
+        const stem = basename(inputPath, ext);
+        return join(dirname(inputPath), stem + '.matches.xlf');
+    }
+    static collectUnits(entries) {
+        const units = [];
+        entries.forEach((entry) => {
+            if (entry instanceof XliffGroup) {
+                units.push(...MatchCommand.collectUnits(entry.getEntries()));
             }
             else {
-                result.push(...convertInlineContent(node, originalData, counter, correlations, bptAnchors));
+                units.push(entry);
             }
-        }
-    });
-    return result;
-}
-function trimInlineContent(content) {
-    const trimmed = [...content];
-    while (trimmed.length > 0 && typeof trimmed[0] === 'string' && trimmed[0].trim().length === 0) {
-        trimmed.shift();
-    }
-    while (trimmed.length > 0 && typeof trimmed[trimmed.length - 1] === 'string' && trimmed[trimmed.length - 1].trim().length === 0) {
-        trimmed.pop();
-    }
-    if (trimmed.length > 0 && typeof trimmed[0] === 'string') {
-        trimmed[0] = trimmed[0].replace(/^\s+/, '');
-    }
-    if (trimmed.length > 0 && typeof trimmed[trimmed.length - 1] === 'string') {
-        trimmed[trimmed.length - 1] = trimmed[trimmed.length - 1].replace(/\s+$/, '');
-    }
-    return trimmed;
-}
-function declareMatchesNamespace(document) {
-    const alreadyDeclared = document.getOtherAttributes().some((attribute) => attribute.getName().startsWith('xmlns:') && attribute.getValue() === MATCHES_NAMESPACE);
-    if (!alreadyDeclared) {
-        document.setOtherAttribute('xmlns:' + DEFAULT_PREFIX, MATCHES_NAMESPACE);
-    }
-}
-function resolveOutputPath(explicit, inputPath) {
-    if (explicit) {
-        return CliUtils.resolvePath(explicit);
-    }
-    const ext = extname(inputPath);
-    const stem = basename(inputPath, ext);
-    return join(dirname(inputPath), stem + '.matches.xlf');
-}
-function parseIntOption(raw, fallback, flag, min, max) {
-    if (raw === undefined) {
-        return fallback;
-    }
-    const parsed = Number(raw);
-    if (!Number.isInteger(parsed) || parsed < min || (max !== undefined && parsed > max)) {
-        const range = max !== undefined ? 'an integer between ' + min + ' and ' + max : 'an integer of at least ' + min;
-        CliUtils.fail('Invalid ' + flag + ' value "' + raw + '"; expected ' + range + '.');
+        });
+        return units;
     }
-    return parsed;
-}
-function extractElementText(element) {
-    let text = '';
-    element.getContent().forEach((node) => {
-        if (node instanceof TextNode) {
-            text += node.getValue();
-        }
-        else if (node instanceof XMLElement) {
-            text += extractElementText(node);
-        }
-    });
-    return text;
-}
-function getPureText(content) {
-    let text = '';
-    content.forEach((item) => {
-        if (typeof item === 'string') {
-            text += item;
+    static declareMatchesNamespace(document) {
+        if (!Utils.isNamespaceDeclared(document.getOtherAttributes(), Utils.MATCHES_NAMESPACE)) {
+            document.setOtherAttribute('xmlns:' + Utils.MTC_PREFIX, Utils.MATCHES_NAMESPACE);
         }
-        else if (item instanceof XliffPc || item instanceof XliffMrk) {
-            text += getPureText(item.getContent());
+    }
+    static parseIntOption(raw, flag, min, max) {
+        const parsed = Number(raw);
+        if (!Number.isInteger(parsed) || parsed < min || (max !== undefined && parsed > max)) {
+            const range = max !== undefined ? 'an integer between ' + min + ' and ' + max : 'an integer of at least ' + min;
+            CliUtils.fail('Invalid ' + flag + ' value "' + raw + '"; expected ' + range + '.');
         }
-    });
-    return text;
+        return parsed;
+    }
 }
 //# sourceMappingURL=matchCommand.js.map