@azrico/azcli 1.2.3 → 1.2.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +5 -0
- package/dist/cli/create-cli.js +37 -0
- package/dist/cli/create-cli.js.map +1 -0
- package/dist/cli/index.js +23 -0
- package/dist/cli/index.js.map +1 -0
- package/dist/cli/options.js +17 -0
- package/dist/cli/options.js.map +1 -0
- package/dist/core/files.js +82 -0
- package/dist/core/files.js.map +1 -0
- package/dist/core/json.js +16 -0
- package/dist/core/json.js.map +1 -0
- package/dist/core/logger.js +26 -0
- package/dist/core/logger.js.map +1 -0
- package/dist/core/process.js +125 -0
- package/dist/core/process.js.map +1 -0
- package/dist/core/project-type.js +41 -0
- package/dist/core/project-type.js.map +1 -0
- package/dist/core/strings.js +20 -0
- package/dist/core/strings.js.map +1 -0
- package/dist/features/build/build.js +46 -0
- package/dist/features/build/build.js.map +1 -0
- package/dist/features/build/command.js +17 -0
- package/dist/features/build/command.js.map +1 -0
- package/dist/features/build/wordpress.js +135 -0
- package/dist/features/build/wordpress.js.map +1 -0
- package/dist/features/clean/clean.js +27 -0
- package/dist/features/clean/clean.js.map +1 -0
- package/dist/features/clean/command.js +13 -0
- package/dist/features/clean/command.js.map +1 -0
- package/dist/features/optimize-transcripts/agent-runner.js +40 -0
- package/dist/features/optimize-transcripts/agent-runner.js.map +1 -0
- package/dist/features/optimize-transcripts/command.js +24 -0
- package/dist/features/optimize-transcripts/command.js.map +1 -0
- package/dist/features/optimize-transcripts/optimize.js +72 -0
- package/dist/features/optimize-transcripts/optimize.js.map +1 -0
- package/dist/features/optimize-transcripts/prompts.js +39 -0
- package/dist/features/optimize-transcripts/prompts.js.map +1 -0
- package/dist/features/optimize-transcripts/redact.js +57 -0
- package/dist/features/optimize-transcripts/redact.js.map +1 -0
- package/dist/features/optimize-transcripts/secret-remover.js +85 -0
- package/dist/features/optimize-transcripts/secret-remover.js.map +1 -0
- package/dist/features/package/command.js +13 -0
- package/dist/features/package/command.js.map +1 -0
- package/dist/features/package/packager.js +132 -0
- package/dist/features/package/packager.js.map +1 -0
- package/dist/features/publish/command.js +13 -0
- package/dist/features/publish/command.js.map +1 -0
- package/dist/features/publish/publish.js +29 -0
- package/dist/features/publish/publish.js.map +1 -0
- package/dist/features/transcripts/command.js +27 -0
- package/dist/features/transcripts/command.js.map +1 -0
- package/dist/features/transcripts/extract.js +148 -0
- package/dist/features/transcripts/extract.js.map +1 -0
- package/dist/features/transcripts/jsonl.js +100 -0
- package/dist/features/transcripts/jsonl.js.map +1 -0
- package/dist/features/transcripts/options.js +53 -0
- package/dist/features/transcripts/options.js.map +1 -0
- package/dist/features/transcripts/render-markdown.js +105 -0
- package/dist/features/transcripts/render-markdown.js.map +1 -0
- package/dist/features/transcripts/sources/claude.js +150 -0
- package/dist/features/transcripts/sources/claude.js.map +1 -0
- package/dist/features/transcripts/sources/codex.js +171 -0
- package/dist/features/transcripts/sources/codex.js.map +1 -0
- package/dist/features/transcripts/types.js +5 -0
- package/dist/features/transcripts/types.js.map +1 -0
- package/dist/features/update/command.js +16 -0
- package/dist/features/update/command.js.map +1 -0
- package/dist/features/update/composer.js +35 -0
- package/dist/features/update/composer.js.map +1 -0
- package/dist/features/update/filter-options.js +23 -0
- package/dist/features/update/filter-options.js.map +1 -0
- package/dist/features/update/update.js +28 -0
- package/dist/features/update/update.js.map +1 -0
- package/dist/features/update/yarn.js +30 -0
- package/dist/features/update/yarn.js.map +1 -0
- package/dist/features/verify-changes/changed-files.js +36 -0
- package/dist/features/verify-changes/changed-files.js.map +1 -0
- package/dist/features/verify-changes/command.js +27 -0
- package/dist/features/verify-changes/command.js.map +1 -0
- package/dist/features/verify-changes/config.js +91 -0
- package/dist/features/verify-changes/config.js.map +1 -0
- package/dist/features/verify-changes/report.js +30 -0
- package/dist/features/verify-changes/report.js.map +1 -0
- package/dist/features/verify-changes/select.js +39 -0
- package/dist/features/verify-changes/select.js.map +1 -0
- package/dist/features/verify-changes/verify.js +54 -0
- package/dist/features/verify-changes/verify.js.map +1 -0
- package/dist/features/worktree/command.js +55 -0
- package/dist/features/worktree/command.js.map +1 -0
- package/dist/features/worktree/config.js +115 -0
- package/dist/features/worktree/config.js.map +1 -0
- package/dist/features/worktree/git.js +62 -0
- package/dist/features/worktree/git.js.map +1 -0
- package/dist/features/worktree/start.js +156 -0
- package/dist/features/worktree/start.js.map +1 -0
- package/dist/features/worktree/status.js +50 -0
- package/dist/features/worktree/status.js.map +1 -0
- package/dist/features/worktree/sync.js +107 -0
- package/dist/features/worktree/sync.js.map +1 -0
- package/dist/features/yarn/commands.js +18 -0
- package/dist/features/yarn/commands.js.map +1 -0
- package/package.json +3 -2
|
@@ -0,0 +1,156 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.formatStart = exports.startWorktree = exports.pickPort = exports.isPortFree = void 0;
|
|
7
|
+
const node_child_process_1 = require("node:child_process");
|
|
8
|
+
const node_fs_1 = __importDefault(require("node:fs"));
|
|
9
|
+
const node_http_1 = __importDefault(require("node:http"));
|
|
10
|
+
const node_net_1 = __importDefault(require("node:net"));
|
|
11
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
12
|
+
const files_1 = require("../../core/files");
|
|
13
|
+
const logger_1 = require("../../core/logger");
|
|
14
|
+
const process_1 = require("../../core/process");
|
|
15
|
+
const config_1 = require("./config");
|
|
16
|
+
const git_1 = require("./git");
|
|
17
|
+
const pollMs = 500;
|
|
18
|
+
const compileGraceMs = 3000;
|
|
19
|
+
const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
|
|
20
|
+
function isPortFree(port) {
|
|
21
|
+
return new Promise((resolve) => {
|
|
22
|
+
const server = node_net_1.default.createServer();
|
|
23
|
+
server.once('error', () => resolve(false));
|
|
24
|
+
server.listen(port, () => server.close(() => resolve(true)));
|
|
25
|
+
});
|
|
26
|
+
}
|
|
27
|
+
exports.isPortFree = isPortFree;
|
|
28
|
+
/** An explicitly requested port must be free; otherwise take the first free port above the default one. */
|
|
29
|
+
async function pickPort(defaultPort, requested) {
|
|
30
|
+
if (requested !== undefined) {
|
|
31
|
+
if (!(await isPortFree(requested)))
|
|
32
|
+
throw new Error(`Port ${requested} is already in use`);
|
|
33
|
+
return requested;
|
|
34
|
+
}
|
|
35
|
+
for (let port = defaultPort + 1; port < defaultPort + 101; port++)
|
|
36
|
+
if (await isPortFree(port))
|
|
37
|
+
return port;
|
|
38
|
+
throw new Error(`No free port found above ${defaultPort}`);
|
|
39
|
+
}
|
|
40
|
+
exports.pickPort = pickPort;
|
|
41
|
+
function probe(url) {
|
|
42
|
+
return new Promise((resolve) => {
|
|
43
|
+
const request = node_http_1.default.get(url, { timeout: 2000 }, (response) => {
|
|
44
|
+
response.resume();
|
|
45
|
+
resolve(true);
|
|
46
|
+
});
|
|
47
|
+
request.once('timeout', () => request.destroy());
|
|
48
|
+
request.once('error', () => resolve(false));
|
|
49
|
+
});
|
|
50
|
+
}
|
|
51
|
+
function killTree(pid) {
|
|
52
|
+
try {
|
|
53
|
+
if (process.platform === 'win32')
|
|
54
|
+
(0, node_child_process_1.spawnSync)('taskkill', ['/pid', String(pid), '/t', '/f'], { windowsHide: true });
|
|
55
|
+
else
|
|
56
|
+
process.kill(-pid, 'SIGTERM');
|
|
57
|
+
}
|
|
58
|
+
catch {
|
|
59
|
+
// The process is already gone.
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
function compileState(log, dev) {
|
|
63
|
+
if (new RegExp(dev.failedPattern, 'i').test(log))
|
|
64
|
+
return 'failed';
|
|
65
|
+
return new RegExp(dev.compiledPattern, 'i').test(log) ? 'ok' : 'unknown';
|
|
66
|
+
}
|
|
67
|
+
function launchEnvironment(root, cwd, dev, port) {
|
|
68
|
+
const env = { ...process.env, [dev.portEnv]: String(port) };
|
|
69
|
+
const key = Object.keys(env).find((name) => name.toUpperCase() === 'PATH') ?? 'PATH';
|
|
70
|
+
const directories = dev.binDirs.flatMap((dir) => [(0, files_1.resolveInside)(root, dir), (0, files_1.resolveInside)(cwd, dir)]);
|
|
71
|
+
env[key] = [...directories, env[key] ?? ''].join(node_path_1.default.delimiter);
|
|
72
|
+
return env;
|
|
73
|
+
}
|
|
74
|
+
async function startWorktree(options, run = process_1.runCommand) {
|
|
75
|
+
const root = node_path_1.default.resolve(options.path);
|
|
76
|
+
if (!node_fs_1.default.existsSync(root))
|
|
77
|
+
throw new Error(`Worktree not found: ${root}`);
|
|
78
|
+
const config = (0, config_1.loadConfig)(root, node_path_1.default.resolve(options.project ?? '.'));
|
|
79
|
+
const dev = config.dev;
|
|
80
|
+
if (!dev)
|
|
81
|
+
throw new Error('Missing "dev" in .azcli/worktree.json.');
|
|
82
|
+
let pagePath = dev.readyPath;
|
|
83
|
+
if (options.page) {
|
|
84
|
+
if (!(options.page in dev.pages))
|
|
85
|
+
throw new Error(`Unknown page "${options.page}". Configured pages: ${Object.keys(dev.pages).join(', ') || 'none'}`);
|
|
86
|
+
pagePath = dev.pages[options.page];
|
|
87
|
+
}
|
|
88
|
+
if (!options.skipInstall) {
|
|
89
|
+
const install = config.install;
|
|
90
|
+
await run(install.command, install.args, { cwd: install.cwd ? (0, files_1.resolveInside)(root, install.cwd) : root, quiet: options.quiet });
|
|
91
|
+
}
|
|
92
|
+
const port = await pickPort(dev.defaultPort, options.port);
|
|
93
|
+
const cwd = dev.cwd ? (0, files_1.resolveInside)(root, dev.cwd) : root;
|
|
94
|
+
const launch = (0, process_1.resolveCommand)(dev.command, dev.args.map((arg) => arg.replaceAll('{port}', String(port))), cwd, launchEnvironment(root, cwd, dev, port));
|
|
95
|
+
const logDirectory = node_path_1.default.join(await (0, git_1.gitDir)(run, root), 'azcli');
|
|
96
|
+
node_fs_1.default.mkdirSync(logDirectory, { recursive: true });
|
|
97
|
+
const log = node_path_1.default.join(logDirectory, `dev-${port}.log`);
|
|
98
|
+
const report = (fields) => ({
|
|
99
|
+
url: `http://localhost:${port}${pagePath}`, port, log, ...fields,
|
|
100
|
+
});
|
|
101
|
+
const fd = node_fs_1.default.openSync(log, 'w');
|
|
102
|
+
let exit;
|
|
103
|
+
const child = (0, node_child_process_1.spawn)(launch.command, launch.args, {
|
|
104
|
+
cwd,
|
|
105
|
+
env: launchEnvironment(root, cwd, dev, port),
|
|
106
|
+
detached: true,
|
|
107
|
+
stdio: ['ignore', fd, fd],
|
|
108
|
+
windowsHide: true,
|
|
109
|
+
});
|
|
110
|
+
node_fs_1.default.closeSync(fd);
|
|
111
|
+
child.once('error', (error) => { exit = `could not start ${dev.command}: ${error.message}`; });
|
|
112
|
+
child.once('exit', (code, signal) => { exit = signal ? `terminated by ${signal}` : `exit code ${code}`; });
|
|
113
|
+
const readLog = () => node_fs_1.default.readFileSync(log, 'utf8');
|
|
114
|
+
const tail = () => readLog().split(/\r?\n/).filter(Boolean).slice(-20).join('\n');
|
|
115
|
+
const fail = (state, error) => {
|
|
116
|
+
if (state === 'timeout' && child.pid)
|
|
117
|
+
killTree(child.pid);
|
|
118
|
+
return report({ state, compile: compileState(readLog(), dev), pid: child.pid, error, logTail: tail() });
|
|
119
|
+
};
|
|
120
|
+
const timeoutMs = (options.timeout ?? dev.timeoutSeconds) * 1000;
|
|
121
|
+
const started = Date.now();
|
|
122
|
+
const readyUrl = `http://localhost:${port}${dev.readyPath}`;
|
|
123
|
+
if (!options.quiet)
|
|
124
|
+
(0, logger_1.showMessage)(`Waiting for ${readyUrl} (up to ${timeoutMs / 1000}s)`);
|
|
125
|
+
while (!exit) {
|
|
126
|
+
if (await probe(readyUrl))
|
|
127
|
+
break;
|
|
128
|
+
if (Date.now() - started > timeoutMs)
|
|
129
|
+
return fail('timeout', `no response from ${readyUrl} within ${timeoutMs / 1000}s`);
|
|
130
|
+
await sleep(pollMs);
|
|
131
|
+
}
|
|
132
|
+
if (exit)
|
|
133
|
+
return fail('exited', `dev server stopped: ${exit}`);
|
|
134
|
+
const graceEnd = Date.now() + compileGraceMs;
|
|
135
|
+
while (compileState(readLog(), dev) === 'unknown' && Date.now() < graceEnd && !exit)
|
|
136
|
+
await sleep(200);
|
|
137
|
+
if (exit)
|
|
138
|
+
return fail('exited', `dev server stopped: ${exit}`);
|
|
139
|
+
child.unref();
|
|
140
|
+
return report({ state: 'running', compile: compileState(readLog(), dev), pid: child.pid });
|
|
141
|
+
}
|
|
142
|
+
exports.startWorktree = startWorktree;
|
|
143
|
+
function formatStart(report) {
|
|
144
|
+
const output = [
|
|
145
|
+
`state: ${report.state}${report.error ? ` (${report.error})` : ''}`,
|
|
146
|
+
`url: ${report.url}`,
|
|
147
|
+
`pid: ${report.pid ?? 'none'}`,
|
|
148
|
+
`compile: ${report.compile}`,
|
|
149
|
+
`log: ${report.log}`,
|
|
150
|
+
];
|
|
151
|
+
if (report.logTail)
|
|
152
|
+
output.push('last log lines:', report.logTail);
|
|
153
|
+
return output.join('\n');
|
|
154
|
+
}
|
|
155
|
+
exports.formatStart = formatStart;
|
|
156
|
+
//# sourceMappingURL=start.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../src/features/worktree/start.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.formatStatus = exports.worktreeStatus = void 0;
|
|
7
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
8
|
+
const process_1 = require("../../core/process");
|
|
9
|
+
const config_1 = require("./config");
|
|
10
|
+
const git_1 = require("./git");
|
|
11
|
+
const manifests = new Set(['package.json', 'yarn.lock', 'package-lock.json', 'pnpm-lock.yaml', 'composer.json', 'composer.lock', 'requirements.txt', 'pyproject.toml', 'poetry.lock']);
|
|
12
|
+
const isManifest = (file) => manifests.has(node_path_1.default.posix.basename(file));
|
|
13
|
+
async function worktreeStatus(options, run = process_1.runCommand) {
|
|
14
|
+
const root = node_path_1.default.resolve(options.path);
|
|
15
|
+
const config = (0, config_1.loadConfig)(root, node_path_1.default.resolve(options.project ?? '.'));
|
|
16
|
+
const target = await (0, git_1.resolveTarget)(run, root, options.target, config.target);
|
|
17
|
+
const worktree = await (0, git_1.treeState)(run, root);
|
|
18
|
+
const entry = (await (0, git_1.listWorktrees)(run, root)).find((tree) => tree.branch === target);
|
|
19
|
+
const [behind, ahead] = (await (0, git_1.git)(run, root, ['rev-list', '--left-right', '--count', `${target}...HEAD`])).split(/\s+/).map(Number);
|
|
20
|
+
const mergeBase = await (0, git_1.git)(run, root, ['merge-base', target, 'HEAD']);
|
|
21
|
+
const changed = async (to) => (0, git_1.lines)(await (0, git_1.git)(run, root, ['diff', '--name-only', '--no-renames', mergeBase, to])).filter(isManifest);
|
|
22
|
+
return {
|
|
23
|
+
target,
|
|
24
|
+
worktree,
|
|
25
|
+
targetTree: entry ? await (0, git_1.treeState)(run, entry.path) : null,
|
|
26
|
+
behind,
|
|
27
|
+
ahead,
|
|
28
|
+
merged: await (0, git_1.gitOk)(run, root, ['merge-base', '--is-ancestor', 'HEAD', target]),
|
|
29
|
+
dependencyChanges: { incoming: await changed(target), outgoing: await changed('HEAD') },
|
|
30
|
+
};
|
|
31
|
+
}
|
|
32
|
+
exports.worktreeStatus = worktreeStatus;
|
|
33
|
+
function describeTree(label, tree) {
|
|
34
|
+
if (!tree)
|
|
35
|
+
return `${label}: not checked out in any worktree`;
|
|
36
|
+
const dirty = tree.dirty.length ? `${tree.dirty.length} changed file(s)` : 'clean';
|
|
37
|
+
return `${label}: ${tree.branch ?? '(detached)'} @ ${tree.tip}, ${dirty}\n ${tree.path}${tree.dirty.map((line) => `\n ${line}`).join('')}`;
|
|
38
|
+
}
|
|
39
|
+
function formatStatus(status) {
|
|
40
|
+
const { incoming, outgoing } = status.dependencyChanges;
|
|
41
|
+
return [
|
|
42
|
+
describeTree('worktree', status.worktree),
|
|
43
|
+
describeTree('target ', status.targetTree),
|
|
44
|
+
`vs ${status.target}: ${status.ahead} ahead, ${status.behind} behind${status.merged ? ' (fully merged into target)' : ''}`,
|
|
45
|
+
`dependency manifests changed on ${status.target}: ${incoming.join(', ') || 'none'}`,
|
|
46
|
+
`dependency manifests changed on branch: ${outgoing.join(', ') || 'none'}`,
|
|
47
|
+
].join('\n');
|
|
48
|
+
}
|
|
49
|
+
exports.formatStatus = formatStatus;
|
|
50
|
+
//# sourceMappingURL=status.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../src/features/worktree/status.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,107 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.formatSync = exports.syncWorktree = void 0;
|
|
7
|
+
const node_fs_1 = __importDefault(require("node:fs"));
|
|
8
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
9
|
+
const process_1 = require("../../core/process");
|
|
10
|
+
const config_1 = require("./config");
|
|
11
|
+
const git_1 = require("./git");
|
|
12
|
+
const stage = (run, cwd, number, file) => run('git', ['show', `:${number}:${file}`], { cwd, quiet: true }).then((result) => result.stdout, () => undefined);
|
|
13
|
+
const squash = (text) => text.replace(/\s+/g, '');
|
|
14
|
+
async function collectConflicts(run, cwd) {
|
|
15
|
+
const files = (0, git_1.lines)(await (0, git_1.git)(run, cwd, ['diff', '--name-only', '--diff-filter=U']));
|
|
16
|
+
const directory = node_path_1.default.join(await (0, git_1.gitDir)(run, cwd), 'azcli', 'conflicts');
|
|
17
|
+
node_fs_1.default.rmSync(directory, { recursive: true, force: true });
|
|
18
|
+
const conflicts = [];
|
|
19
|
+
for (const file of files) {
|
|
20
|
+
const sides = { base: await stage(run, cwd, 1, file), ours: await stage(run, cwd, 2, file), theirs: await stage(run, cwd, 3, file) };
|
|
21
|
+
const conflict = {
|
|
22
|
+
file,
|
|
23
|
+
whitespaceOnly: sides.ours !== undefined && sides.theirs !== undefined && squash(sides.ours) === squash(sides.theirs),
|
|
24
|
+
};
|
|
25
|
+
for (const [name, content] of Object.entries(sides)) {
|
|
26
|
+
if (content === undefined)
|
|
27
|
+
continue;
|
|
28
|
+
const target = node_path_1.default.join(directory, `${file}.${name}`);
|
|
29
|
+
node_fs_1.default.mkdirSync(node_path_1.default.dirname(target), { recursive: true });
|
|
30
|
+
node_fs_1.default.writeFileSync(target, content);
|
|
31
|
+
conflict[name] = target;
|
|
32
|
+
}
|
|
33
|
+
conflicts.push(conflict);
|
|
34
|
+
}
|
|
35
|
+
return conflicts;
|
|
36
|
+
}
|
|
37
|
+
async function assertReady(run, cwd, label) {
|
|
38
|
+
const state = await (0, git_1.treeState)(run, cwd);
|
|
39
|
+
if (!state.branch)
|
|
40
|
+
throw new Error(`${label} is on a detached HEAD: ${cwd}`);
|
|
41
|
+
if (await (0, git_1.gitOk)(run, cwd, ['rev-parse', '--quiet', '--verify', 'MERGE_HEAD']))
|
|
42
|
+
throw new Error(`${label} has a merge in progress: ${cwd}`);
|
|
43
|
+
const tracked = state.dirty.filter((line) => !line.startsWith('??'));
|
|
44
|
+
if (tracked.length)
|
|
45
|
+
throw new Error(`${label} has uncommitted changes; commit or stash them first (${cwd}):\n${tracked.join('\n')}`);
|
|
46
|
+
return state.branch;
|
|
47
|
+
}
|
|
48
|
+
async function merge(run, direction, cwd, into, from) {
|
|
49
|
+
const step = (result, conflicts = []) => ({ direction, cwd, into, from, result, conflicts });
|
|
50
|
+
if (await (0, git_1.gitOk)(run, cwd, ['merge-base', '--is-ancestor', from, 'HEAD']))
|
|
51
|
+
return step('up-to-date');
|
|
52
|
+
try {
|
|
53
|
+
await run('git', ['merge', '--no-edit', from], { cwd, quiet: true });
|
|
54
|
+
return step('merged');
|
|
55
|
+
}
|
|
56
|
+
catch (error) {
|
|
57
|
+
const conflicts = await collectConflicts(run, cwd);
|
|
58
|
+
if (!conflicts.length)
|
|
59
|
+
throw error;
|
|
60
|
+
return step('conflict', conflicts);
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
/**
|
|
64
|
+
* Performs only the requested merge direction(s). On conflict the merge stays in progress in its worktree,
|
|
65
|
+
* so the caller can resolve and commit; nothing is resolved here.
|
|
66
|
+
*/
|
|
67
|
+
async function syncWorktree(options, run = process_1.runCommand) {
|
|
68
|
+
const root = node_path_1.default.resolve(options.path);
|
|
69
|
+
const config = (0, config_1.loadConfig)(root, node_path_1.default.resolve(options.project ?? '.'));
|
|
70
|
+
const target = await (0, git_1.resolveTarget)(run, root, options.target, config.target);
|
|
71
|
+
const branch = await assertReady(run, root, 'Worktree');
|
|
72
|
+
if (branch === target)
|
|
73
|
+
throw new Error(`The worktree is on the target branch itself: ${target}`);
|
|
74
|
+
const targetEntry = (await (0, git_1.listWorktrees)(run, root)).find((tree) => tree.branch === target);
|
|
75
|
+
if (!targetEntry)
|
|
76
|
+
throw new Error(`Target branch "${target}" is not checked out in any worktree`);
|
|
77
|
+
await assertReady(run, targetEntry.path, 'Target worktree');
|
|
78
|
+
const steps = [];
|
|
79
|
+
if (options.direction !== 'out')
|
|
80
|
+
steps.push(await merge(run, 'in', root, branch, target));
|
|
81
|
+
if (options.direction !== 'in' && !steps.some((step) => step.result === 'conflict'))
|
|
82
|
+
steps.push(await merge(run, 'out', targetEntry.path, target, branch));
|
|
83
|
+
return {
|
|
84
|
+
target,
|
|
85
|
+
steps,
|
|
86
|
+
tips: { worktree: await (0, git_1.git)(run, root, ['rev-parse', '--short', 'HEAD']), target: await (0, git_1.git)(run, targetEntry.path, ['rev-parse', '--short', 'HEAD']) },
|
|
87
|
+
};
|
|
88
|
+
}
|
|
89
|
+
exports.syncWorktree = syncWorktree;
|
|
90
|
+
function formatSync(report) {
|
|
91
|
+
const output = [];
|
|
92
|
+
for (const step of report.steps) {
|
|
93
|
+
output.push(`${step.direction}: merge ${step.from} into ${step.into} -> ${step.result}`);
|
|
94
|
+
for (const conflict of step.conflicts) {
|
|
95
|
+
output.push(` CONFLICT ${conflict.file}${conflict.whitespaceOnly ? ' (whitespace-only)' : ''}`);
|
|
96
|
+
for (const side of ['base', 'ours', 'theirs'])
|
|
97
|
+
if (conflict[side])
|
|
98
|
+
output.push(` ${side}: ${conflict[side]}`);
|
|
99
|
+
}
|
|
100
|
+
if (step.conflicts.length)
|
|
101
|
+
output.push(` The merge is still in progress in ${step.cwd}; resolve, commit, or run "git merge --abort".`);
|
|
102
|
+
}
|
|
103
|
+
output.push(`tips: worktree ${report.tips.worktree}, ${report.target} ${report.tips.target}`);
|
|
104
|
+
return output.join('\n');
|
|
105
|
+
}
|
|
106
|
+
exports.formatSync = formatSync;
|
|
107
|
+
//# sourceMappingURL=sync.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../../src/features/worktree/sync.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.testCommand = exports.buildCommand = exports.installCommand = void 0;
|
|
4
|
+
const process_1 = require("../../core/process");
|
|
5
|
+
function yarnCommand(command, describe, args) {
|
|
6
|
+
return {
|
|
7
|
+
command,
|
|
8
|
+
describe,
|
|
9
|
+
builder: (cli) => cli.option('path', { type: 'string', describe: 'Project directory' }),
|
|
10
|
+
handler: async (options) => {
|
|
11
|
+
await (0, process_1.runCommand)('yarn', args, { cwd: options.path, quiet: options.quiet });
|
|
12
|
+
},
|
|
13
|
+
};
|
|
14
|
+
}
|
|
15
|
+
exports.installCommand = yarnCommand('yarni', 'Install Yarn dependencies', ['install']);
|
|
16
|
+
exports.buildCommand = yarnCommand('yarnb', 'Run the Yarn build', ['run', 'build']);
|
|
17
|
+
exports.testCommand = yarnCommand('yarnt', 'Run the Yarn tests', ['run', 'test']);
|
|
18
|
+
//# sourceMappingURL=commands.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../../src/features/yarn/commands.ts"],"names":[],"mappings":";;;AACA,gDAAgD;AAGhD,SAAS,WAAW,CAAC,OAAe,EAAE,QAAgB,EAAE,IAAc;IACrE,OAAO;QACN,OAAO;QACP,QAAQ;QACR,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,mBAAmB,EAAE,CAAC;QACvF,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;YAC1B,MAAM,IAAA,oBAAU,EAAC,MAAM,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;QAC7E,CAAC;KACD,CAAC;AACH,CAAC;AAEY,QAAA,cAAc,GAAG,WAAW,CAAC,OAAO,EAAE,2BAA2B,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;AAChF,QAAA,YAAY,GAAG,WAAW,CAAC,OAAO,EAAE,oBAAoB,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;AAC5E,QAAA,WAAW,GAAG,WAAW,CAAC,OAAO,EAAE,oBAAoB,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@azrico/azcli",
|
|
3
|
-
"version": "1.2.
|
|
3
|
+
"version": "1.2.5",
|
|
4
4
|
"description": "Project build, publishing, dependency, and AI transcript helpers",
|
|
5
5
|
"type": "commonjs",
|
|
6
6
|
"main": "dist/cli/index.js",
|
|
7
7
|
"scripts": {
|
|
8
|
+
"prepack": "npm run build",
|
|
8
9
|
"build": "node scripts/build.cjs",
|
|
9
10
|
"build-dev": "node scripts/build.cjs --dev",
|
|
10
11
|
"start": "nodemon --watch src --watch temp --ext ts,json --exec \"node scripts/build.cjs --dev\"",
|
|
@@ -38,4 +39,4 @@
|
|
|
38
39
|
"engines": {
|
|
39
40
|
"node": ">=20"
|
|
40
41
|
}
|
|
41
|
-
}
|
|
42
|
+
}
|