@gadmin2n/cli 0.0.105 → 0.0.107

package/lib/template-merge/materialize.d.ts

@@ -0,0 +1,18 @@
+export interface MaterializedBase {
+    /** Absolute path to the directory containing the template's files. */
+    dir: string;
+    /** Idempotent cleanup of any temp dirs created. */
+    cleanup: () => void;
+}
+/**
+ * Materialize a base reference for 3-way merge.
+ *
+ * Sources, in priority order:
+ *   1. `GADMIN2_LOCAL_REGISTRY_DIR/<version>/<templateName>/` — used by tests
+ *      and local development. Files are copied into a fresh tmp dir.
+ *   2. `npm pack @gadmin2n/schematics@<version>` — production. Tarball is
+ *      extracted into a fresh tmp dir; the inner template subdir is returned.
+ *
+ * Returned `cleanup()` removes any tmp dir we created.
+ */
+export declare function materializeBase(schematicsVersion: string, templateName: string): MaterializedBase;

package/lib/template-merge/materialize.js

@@ -0,0 +1,129 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.materializeBase = void 0;
+// cli/lib/template-merge/materialize.ts
+const fs = require("fs");
+const os = require("os");
+const path = require("path");
+const child_process_1 = require("child_process");
+const SCHEMATICS_PKG = '@gadmin2n/schematics';
+/**
+ * Materialize a base reference for 3-way merge.
+ *
+ * Sources, in priority order:
+ *   1. `GADMIN2_LOCAL_REGISTRY_DIR/<version>/<templateName>/` — used by tests
+ *      and local development. Files are copied into a fresh tmp dir.
+ *   2. `npm pack @gadmin2n/schematics@<version>` — production. Tarball is
+ *      extracted into a fresh tmp dir; the inner template subdir is returned.
+ *
+ * Returned `cleanup()` removes any tmp dir we created.
+ */
+function materializeBase(schematicsVersion, templateName) {
+    const localRegistry = process.env.GADMIN2_LOCAL_REGISTRY_DIR;
+    if (localRegistry) {
+        return materializeFromLocalRegistry(localRegistry, schematicsVersion, templateName);
+    }
+    return materializeFromNpm(schematicsVersion, templateName);
+}
+exports.materializeBase = materializeBase;
+function materializeFromLocalRegistry(registryDir, version, templateName) {
+    const src = path.join(registryDir, version, templateName);
+    if (!fs.existsSync(src)) {
+        throw new Error(`local registry: version "${version}" not found at ${src}`);
+    }
+    const dst = fs.mkdtempSync(path.join(os.tmpdir(), 'gadmin2-base-'));
+    copyTreeRecursive(src, dst);
+    let cleaned = false;
+    const cleanup = () => {
+        if (cleaned)
+            return;
+        cleaned = true;
+        fs.rmSync(dst, { recursive: true, force: true });
+    };
+    process.on('exit', cleanup);
+    return { dir: dst, cleanup };
+}
+function materializeFromNpm(version, templateName) {
+    var _a;
+    const tmp = fs.mkdtempSync(path.join(os.tmpdir(), 'gadmin2-base-'));
+    let cleaned = false;
+    const cleanup = () => {
+        if (cleaned)
+            return;
+        cleaned = true;
+        fs.rmSync(tmp, { recursive: true, force: true });
+    };
+    process.on('exit', cleanup);
+    try {
+        // npm pack writes the .tgz in the cwd; we capture its filename via --json.
+        let out;
+        try {
+            out = (0, child_process_1.execFileSync)('npm', ['pack', `${SCHEMATICS_PKG}@${version}`, '--json', '--silent'], { cwd: tmp, encoding: 'utf-8', stdio: ['ignore', 'pipe', 'pipe'] });
+        }
+        catch (err) {
+            // ENOENT — npm not in PATH (preflight should catch this earlier)
+            if (err && err.code === 'ENOENT') {
+                throw new Error('npm not in PATH — required to materialize the base template');
+            }
+            throw err;
+        }
+        const parsed = JSON.parse(out);
+        const tarballName = (_a = parsed === null || parsed === void 0 ? void 0 : parsed[0]) === null || _a === void 0 ? void 0 : _a.filename;
+        if (!tarballName) {
+            throw new Error(`npm pack did not return a filename. Raw output: ${out}`);
+        }
+        // npm pack `filename` may include a leading `<scope>/` for scoped packages
+        // on some npm versions, but the actual file lives flat in cwd.
+        const flatName = path.basename(tarballName);
+        try {
+            (0, child_process_1.execFileSync)('tar', ['-xf', flatName], { cwd: tmp, stdio: 'pipe' });
+        }
+        catch (err) {
+            // ENOENT — tar not in PATH (preflight should catch this earlier)
+            if (err && err.code === 'ENOENT') {
+                throw new Error('tar not in PATH — required to extract the base template tarball');
+            }
+            throw err;
+        }
+        const candidates = templateNameCandidates(templateName).map((n) => path.join(tmp, 'package/dist/lib/application/files', n));
+        for (const c of candidates) {
+            if (fs.existsSync(c)) {
+                return { dir: c, cleanup };
+            }
+        }
+        throw new Error(`materialized tarball does not contain template "${templateName}". ` +
+            `Tried: ${candidates.join(', ')}`);
+    }
+    catch (err) {
+        cleanup();
+        throw err;
+    }
+}
+function templateNameCandidates(templateName) {
+    const out = [templateName];
+    if (templateName.startsWith('gadmin2n-')) {
+        out.push(templateName.replace('gadmin2n-', 'gadmin2-'));
+    }
+    else if (templateName.startsWith('gadmin2-')) {
+        out.push(templateName.replace('gadmin2-', 'gadmin2n-'));
+    }
+    return out;
+}
+function copyTreeRecursive(src, dst) {
+    fs.mkdirSync(dst, { recursive: true });
+    for (const entry of fs.readdirSync(src, { withFileTypes: true })) {
+        const s = path.join(src, entry.name);
+        const d = path.join(dst, entry.name);
+        if (entry.isDirectory()) {
+            copyTreeRecursive(s, d);
+        }
+        else if (entry.isFile()) {
+            fs.copyFileSync(s, d);
+            try {
+                fs.chmodSync(d, fs.statSync(s).mode);
+            }
+            catch ( /* best effort */_a) { /* best effort */ }
+        }
+        // symlinks / sockets: skip
+    }
+}

package/lib/template-merge/merge3way.d.ts

@@ -0,0 +1,15 @@
+export interface Merge3Result {
+    merged: string;
+    hasConflicts: boolean;
+}
+/**
+ * 三方合并：依赖系统 git 的 `git merge-file`。
+ * 合并方向：base → ours / theirs，结果写入 ours 端。
+ * 冲突标记格式由 -L 参数控制：<<<<<<< INSTANCE / ======= / >>>>>>> TEMPLATE
+ *
+ * git merge-file 退出码：
+ *   - 0   干净合并
+ *   - N   1..127 冲突数（仍输出含标记的合并内容）
+ *   - 128+ git 内部错误 / spawn 失败 —— 抛出
+ */
+export declare function merge3Way(baseContent: string, oursContent: string, theirsContent: string): Merge3Result;

package/lib/template-merge/merge3way.js

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.merge3Way = void 0;
+const fs = require("fs");
+const os = require("os");
+const path = require("path");
+const child_process_1 = require("child_process");
+/**
+ * 三方合并：依赖系统 git 的 `git merge-file`。
+ * 合并方向：base → ours / theirs，结果写入 ours 端。
+ * 冲突标记格式由 -L 参数控制：<<<<<<< INSTANCE / ======= / >>>>>>> TEMPLATE
+ *
+ * git merge-file 退出码：
+ *   - 0   干净合并
+ *   - N   1..127 冲突数（仍输出含标记的合并内容）
+ *   - 128+ git 内部错误 / spawn 失败 —— 抛出
+ */
+function merge3Way(baseContent, oursContent, theirsContent) {
+    var _a, _b, _c, _d;
+    const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'gadmin-3way-'));
+    try {
+        const basePath = path.join(tmpDir, 'base');
+        const oursPath = path.join(tmpDir, 'ours');
+        const theirsPath = path.join(tmpDir, 'theirs');
+        fs.writeFileSync(basePath, baseContent, 'utf-8');
+        fs.writeFileSync(oursPath, oursContent, 'utf-8');
+        fs.writeFileSync(theirsPath, theirsContent, 'utf-8');
+        try {
+            (0, child_process_1.execFileSync)('git', ['merge-file', '-L', 'INSTANCE', '-L', 'BASE', '-L', 'TEMPLATE',
+                oursPath, basePath, theirsPath], { stdio: 'pipe' });
+            return { merged: fs.readFileSync(oursPath, 'utf-8'), hasConflicts: false };
+        }
+        catch (err) {
+            // ENOENT — git not in PATH (preflight should catch this earlier)
+            if (err && err.code === 'ENOENT') {
+                throw new Error('git not in PATH — required for 3-way merge');
+            }
+            // git merge-file: status N where 1..127 = conflict count.
+            // 128+ = git internal error / spawn failure — never a conflict count.
+            if (typeof (err === null || err === void 0 ? void 0 : err.status) === 'number' && err.status > 0 && err.status < 128) {
+                return {
+                    merged: fs.readFileSync(oursPath, 'utf-8'),
+                    hasConflicts: true,
+                };
+            }
+            const stderrMsg = (_c = (_b = (_a = err === null || err === void 0 ? void 0 : err.stderr) === null || _a === void 0 ? void 0 : _a.toString) === null || _b === void 0 ? void 0 : _b.call(_a)) !== null && _c !== void 0 ? _c : '';
+            throw new Error(`git merge-file failed (status ${(_d = err === null || err === void 0 ? void 0 : err.status) !== null && _d !== void 0 ? _d : '?'}): ${stderrMsg.trim() || (err === null || err === void 0 ? void 0 : err.message) || String(err)}`);
+        }
+    }
+    finally {
+        fs.rmSync(tmpDir, { recursive: true, force: true });
+    }
+}
+exports.merge3Way = merge3Way;

package/lib/template-merge/residual-scan.d.ts

@@ -0,0 +1,10 @@
+export interface ResidualMarker {
+    file: string;
+    line: number;
+    text: string;
+}
+/**
+ * 扫描 rootDir 下指定文件中是否含有冲突标记（按整行匹配，避免误报字符串字面量）。
+ * 二进制文件跳过。
+ */
+export declare function scanResidualMarkers(rootDir: string, files: string[]): ResidualMarker[];

package/lib/template-merge/residual-scan.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.scanResidualMarkers = void 0;
+// cli/lib/template-merge/residual-scan.ts
+const fs = require("fs");
+const path = require("path");
+const binary_detect_1 = require("./binary-detect");
+const MARKER_RE = /^(<<<<<<< INSTANCE|=======|>>>>>>> TEMPLATE)\r?$/;
+/**
+ * 扫描 rootDir 下指定文件中是否含有冲突标记（按整行匹配，避免误报字符串字面量）。
+ * 二进制文件跳过。
+ */
+function scanResidualMarkers(rootDir, files) {
+    const out = [];
+    for (const rel of files) {
+        const abs = path.join(rootDir, rel);
+        if (!fs.existsSync(abs))
+            continue;
+        if ((0, binary_detect_1.isFileBinary)(abs))
+            continue;
+        const content = fs.readFileSync(abs, 'utf-8');
+        const lines = content.split('\n');
+        for (let i = 0; i < lines.length; i++) {
+            if (MARKER_RE.test(lines[i])) {
+                out.push({ file: rel, line: i + 1, text: lines[i] });
+            }
+        }
+    }
+    return out;
+}
+exports.scanResidualMarkers = scanResidualMarkers;

package/lib/template-merge/types.d.ts

@@ -0,0 +1,27 @@
+/** 单个文件在三方合并中的分类结果。 */
+export declare type ClassifyResult = 'add' | 'keep' | 'noop' | 'delete' | 'update' | 'addAddConflict' | 'modifyDeleteConflict' | 'deleteModifyConflict';
+export interface ClassifiedPlan {
+    add: string[];
+    keep: string[];
+    noop: string[];
+    delete: string[];
+    update: string[];
+    addAddConflict: string[];
+    modifyDeleteConflict: string[];
+    deleteModifyConflict: string[];
+}
+export declare type ConflictKind = 'content' | 'add/add' | 'modify/delete' | 'delete/modify' | 'binary';
+export interface ConflictRecord {
+    path: string;
+    kind: ConflictKind;
+    detail?: string;
+}
+export interface MergeOptions {
+    ours?: boolean;
+    theirs?: boolean;
+}
+export interface BaseMeta {
+    schematicsVersion: string;
+    schemaVersion: number;
+}
+export declare const CURRENT_META_SCHEMA_VERSION = 1;

package/lib/template-merge/types.js

@@ -0,0 +1,5 @@
+"use strict";
+// cli/lib/template-merge/types.ts
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CURRENT_META_SCHEMA_VERSION = void 0;
+exports.CURRENT_META_SCHEMA_VERSION = 1;

package/lib/ui/messages.d.ts

@@ -19,8 +19,6 @@ export declare const MESSAGES: {
     LIBRARY_INSTALLATION_FAILED_NO_LIBRARY: string;
     LIBRARY_INSTALLATION_STARTS: string;
     TEMPLATE_QUESTION: string;
-    WITH_WEB_QUESTION: string;
     TRANSFER_PROTOCOL_QUESTION: string;
-    SERVER_FRAMEWORK_QUESTION: string;
     UI_FRAMEWORK_QUESTION: string;
 };

package/lib/ui/messages.js

@@ -27,8 +27,6 @@ exports.MESSAGES = {
     LIBRARY_INSTALLATION_FAILED_NO_LIBRARY: 'No library found.',
     LIBRARY_INSTALLATION_STARTS: 'Starting library setup...',
     TEMPLATE_QUESTION: 'Which template would you like to use?',
-    WITH_WEB_QUESTION: 'Need generate frontend web pages?',
     TRANSFER_PROTOCOL_QUESTION: 'Transfer protocol to use (Restful or GraphQL)?',
-    SERVER_FRAMEWORK_QUESTION: 'Server framework to use (Nest or Iris)?',
     UI_FRAMEWORK_QUESTION: 'UI framework to use (Antd or Tea)?',
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gadmin2n/cli",
-  "version": "0.0.105",
+  "version": "0.0.107",
   "description": "Gadmin - modern, fast, powerful node.js web framework (@cli)",
   "publishConfig": {
     "access": "public"
@@ -47,7 +47,7 @@
     "@angular-devkit/core": "13.3.2",
     "@angular-devkit/schematics": "13.3.2",
     "@angular-devkit/schematics-cli": "13.3.2",
-    "@gadmin2n/schematics": "^0.0.86",
+    "@gadmin2n/schematics": "^0.0.88",
     "abc": "^0.6.1",
     "chalk": "3.0.0",
     "chokidar": "3.5.3",

package/commands/build.command.d.ts

@@ -1,5 +0,0 @@
-import { CommanderStatic } from 'commander';
-import { AbstractCommand } from './abstract.command';
-export declare class BuildCommand extends AbstractCommand {
-    load(program: CommanderStatic): void;
-}

package/commands/build.command.js

@@ -1,50 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BuildCommand = void 0;
-const abstract_command_1 = require("./abstract.command");
-class BuildCommand extends abstract_command_1.AbstractCommand {
-    load(program) {
-        program
-            .command('build [app]')
-            .option('-c, --config [path]', 'Path to gadmin-cli configuration file.')
-            .option('-p, --path [path]', 'Path to tsconfig file.')
-            .option('-w, --watch', 'Run in watch mode (live-reload).')
-            .option('--watchAssets', 'Watch non-ts (e.g., .graphql) files mode.')
-            .option('--webpack', 'Use webpack for compilation.')
-            .option('--webpackPath [path]', 'Path to webpack configuration.')
-            .option('--tsc', 'Use tsc for compilation.')
-            .description('Build Gadmin application.')
-            .action((app, command) => __awaiter(this, void 0, void 0, function* () {
-            const options = [];
-            options.push({
-                name: 'config',
-                value: command.config,
-            });
-            const isWebpackEnabled = command.tsc ? false : command.webpack;
-            options.push({ name: 'webpack', value: isWebpackEnabled });
-            options.push({ name: 'watch', value: !!command.watch });
-            options.push({ name: 'watchAssets', value: !!command.watchAssets });
-            options.push({
-                name: 'path',
-                value: command.path,
-            });
-            options.push({
-                name: 'webpackPath',
-                value: command.webpackPath,
-            });
-            const inputs = [];
-            inputs.push({ name: 'app', value: app });
-            yield this.action.handle(inputs, options);
-        }));
-    }
-}
-exports.BuildCommand = BuildCommand;

package/lib/template-merge/config-loader.d.ts

@@ -1,15 +0,0 @@
-export interface TemplateUpdateConfig {
-    /** Glob → merger name. Insertion order is preserved (use plain object/array, not Map). */
-    mergers?: Record<string, string>;
-    /** Dot-namespaced key → value, e.g. 'json.scripts': 'preserve-instance' */
-    policies?: Record<string, string>;
-}
-/**
- * Load the templateUpdate section from gadmin-cli.json.
- * Searches in this order:
- *   1. <instanceDir>/server/gadmin-cli.json
- *   2. <instanceDir>/gadmin-cli.json
- * Returns null if no config file found, no `templateUpdate` key, or on parse error.
- * On parse error, also console.warn with the error and the file path.
- */
-export declare function loadTemplateUpdateConfig(instanceDir: string): TemplateUpdateConfig | null;

package/lib/template-merge/config-loader.js

@@ -1,38 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadTemplateUpdateConfig = void 0;
-const fs = require("fs");
-const path = require("path");
-/**
- * Load the templateUpdate section from gadmin-cli.json.
- * Searches in this order:
- *   1. <instanceDir>/server/gadmin-cli.json
- *   2. <instanceDir>/gadmin-cli.json
- * Returns null if no config file found, no `templateUpdate` key, or on parse error.
- * On parse error, also console.warn with the error and the file path.
- */
-function loadTemplateUpdateConfig(instanceDir) {
-    const candidates = [
-        path.join(instanceDir, 'server', 'gadmin-cli.json'),
-        path.join(instanceDir, 'gadmin-cli.json'),
-    ];
-    for (const configPath of candidates) {
-        if (!fs.existsSync(configPath))
-            continue;
-        try {
-            const raw = fs.readFileSync(configPath, 'utf-8');
-            const parsed = JSON.parse(raw);
-            const section = parsed === null || parsed === void 0 ? void 0 : parsed.templateUpdate;
-            if (!section || typeof section !== 'object') {
-                return null;
-            }
-            return section;
-        }
-        catch (err) {
-            console.warn(`Failed to parse templateUpdate config at ${configPath}: ${(err === null || err === void 0 ? void 0 : err.message) || err}`);
-            return null;
-        }
-    }
-    return null;
-}
-exports.loadTemplateUpdateConfig = loadTemplateUpdateConfig;

package/lib/template-merge/env-merger.d.ts

@@ -1,5 +0,0 @@
-import { Merger, MergeContext, MergeResult } from './merger';
-export declare class EnvMerger implements Merger {
-    readonly name = "env";
-    merge(ctx: MergeContext): MergeResult;
-}

package/lib/template-merge/env-merger.js

@@ -1,57 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EnvMerger = void 0;
-const KEY_RE = /^([A-Za-z_][A-Za-z0-9_]*)=/;
-class EnvMerger {
-    constructor() {
-        this.name = 'env';
-    }
-    merge(ctx) {
-        try {
-            const instLines = ctx.instanceContent.split('\n');
-            const instKeys = new Set();
-            for (const line of instLines) {
-                const m = line.match(KEY_RE);
-                if (m)
-                    instKeys.add(m[1]);
-            }
-            const tmplLines = ctx.templateContent.split('\n');
-            const toAdd = [];
-            const addedKeys = [];
-            for (const line of tmplLines) {
-                const trimmed = line.trim();
-                if (trimmed === '' || trimmed.startsWith('#'))
-                    continue;
-                const m = line.match(KEY_RE);
-                if (!m)
-                    continue;
-                const key = m[1];
-                if (instKeys.has(key))
-                    continue;
-                toAdd.push(line);
-                addedKeys.push(key);
-            }
-            if (toAdd.length === 0) {
-                return {
-                    ok: true,
-                    merged: ctx.instanceContent,
-                    notes: ['no changes'],
-                };
-            }
-            let merged = ctx.instanceContent;
-            if (!merged.endsWith('\n'))
-                merged += '\n';
-            merged += '\n# --- added from template ---\n';
-            merged += toAdd.join('\n');
-            if (!merged.endsWith('\n'))
-                merged += '\n';
-            const notes = addedKeys.map((k) => `added ${k}`);
-            return { ok: true, merged, notes };
-        }
-        catch (e) {
-            const msg = e instanceof Error ? e.message : String(e);
-            return { ok: false, reason: `env merge error: ${msg}` };
-        }
-    }
-}
-exports.EnvMerger = EnvMerger;

package/lib/template-merge/glob.d.ts

@@ -1,5 +0,0 @@
-/**
- * Match a file path against a glob pattern.
- * Equivalent to `matchesPattern` in actions/update.action.ts.
- */
-export declare function globMatch(filePath: string, pattern: string): boolean;

package/lib/template-merge/glob.js

@@ -1,78 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.globMatch = void 0;
-/**
- * Convert a glob pattern to a RegExp.
- * Supports: * (any chars except /), ** (any path segments), ? (single char)
- */
-function globToRegex(pattern) {
-    let regexStr = '^';
-    let i = 0;
-    while (i < pattern.length) {
-        const c = pattern[i];
-        if (c === '*') {
-            if (pattern[i + 1] === '*') {
-                if (pattern[i + 2] === '/') {
-                    regexStr += '(?:.+/)?';
-                    i += 3;
-                }
-                else {
-                    regexStr += '.*';
-                    i += 2;
-                }
-            }
-            else {
-                regexStr += '[^/]*';
-                i++;
-            }
-        }
-        else if (c === '?') {
-            regexStr += '[^/]';
-            i++;
-        }
-        else if (c === '.' ||
-            c === '(' ||
-            c === ')' ||
-            c === '[' ||
-            c === ']' ||
-            c === '{' ||
-            c === '}' ||
-            c === '+' ||
-            c === '^' ||
-            c === '$' ||
-            c === '|' ||
-            c === '\\') {
-            regexStr += '\\' + c;
-            i++;
-        }
-        else {
-            regexStr += c;
-            i++;
-        }
-    }
-    regexStr += '$';
-    return new RegExp(regexStr);
-}
-/**
- * Match a file path against a glob pattern.
- * Equivalent to `matchesPattern` in actions/update.action.ts.
- */
-function globMatch(filePath, pattern) {
-    if (filePath === pattern)
-        return true;
-    if (filePath.startsWith(pattern + '/'))
-        return true;
-    const parts = filePath.split('/');
-    if (!pattern.includes('/') &&
-        !pattern.includes('*') &&
-        !pattern.includes('?')) {
-        if (parts.includes(pattern))
-            return true;
-    }
-    if (pattern.includes('*') || pattern.includes('?')) {
-        const regex = globToRegex(pattern);
-        return regex.test(filePath);
-    }
-    return false;
-}
-exports.globMatch = globMatch;

package/lib/template-merge/json-merger.d.ts

@@ -1,5 +0,0 @@
-import { Merger, MergeContext, MergeResult } from './merger';
-export declare class JsonMerger implements Merger {
-    readonly name = "json";
-    merge(ctx: MergeContext): MergeResult;
-}