@ozyman42/ozy-cli 0.4.8 → 0.4.9-darwin-x64.0
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/multi-call-binary +0 -0
- package/package.json +11 -52
- package/bin/ozy +0 -191
- package/bin/ozy-signing-agent +0 -191
- package/bin/ozy-ssh-keygen +0 -191
- package/bin/ozy-virtual-security-key +0 -191
- package/dist/commands/git/hosts.js +0 -18
- package/dist/commands/git/hosts.js.map +0 -1
- package/dist/commands/git/index.js +0 -8
- package/dist/commands/git/index.js.map +0 -1
- package/dist/commands/git/setup.js +0 -145
- package/dist/commands/git/setup.js.map +0 -1
- package/dist/commands/index.js +0 -13
- package/dist/commands/index.js.map +0 -1
- package/dist/commands/npm/index.js +0 -7
- package/dist/commands/npm/index.js.map +0 -1
- package/dist/commands/npm/setup/git-remote.js +0 -66
- package/dist/commands/npm/setup/git-remote.js.map +0 -1
- package/dist/commands/npm/setup/index.js +0 -168
- package/dist/commands/npm/setup/index.js.map +0 -1
- package/dist/commands/npm/setup/npm-auth.js +0 -62
- package/dist/commands/npm/setup/npm-auth.js.map +0 -1
- package/dist/commands/npm/setup/package-json-validate.js +0 -47
- package/dist/commands/npm/setup/package-json-validate.js.map +0 -1
- package/dist/commands/npm/setup/package-registry.js +0 -20
- package/dist/commands/npm/setup/package-registry.js.map +0 -1
- package/dist/commands/npm/setup/setup.test.js +0 -95
- package/dist/commands/npm/setup/setup.test.js.map +0 -1
- package/dist/commands/npm/setup/trusted-publishing.js +0 -84
- package/dist/commands/npm/setup/trusted-publishing.js.map +0 -1
- package/dist/commands/npm/setup/workflow.js +0 -19
- package/dist/commands/npm/setup/workflow.js.map +0 -1
- package/dist/commands/ssh/get-sk-credential.js +0 -104
- package/dist/commands/ssh/get-sk-credential.js.map +0 -1
- package/dist/commands/ssh/index.js +0 -7
- package/dist/commands/ssh/index.js.map +0 -1
- package/dist/commands/upgrade.js +0 -199
- package/dist/commands/upgrade.js.map +0 -1
- package/dist/common/command.js +0 -15
- package/dist/common/command.js.map +0 -1
- package/dist/common/constants.js +0 -25
- package/dist/common/constants.js.map +0 -1
- package/dist/common/effective-modules-extensions.js +0 -13
- package/dist/common/effective-modules-extensions.js.map +0 -1
- package/dist/common/log.js +0 -4
- package/dist/common/log.js.map +0 -1
- package/dist/common/render-caller-tree.js +0 -20
- package/dist/common/render-caller-tree.js.map +0 -1
- package/dist/entrypoints/ozy-signing-agent.js +0 -48
- package/dist/entrypoints/ozy-signing-agent.js.map +0 -1
- package/dist/entrypoints/ozy-ssh-keygen.js +0 -9
- package/dist/entrypoints/ozy-ssh-keygen.js.map +0 -1
- package/dist/entrypoints/ozy-virtual-security-key.js +0 -18
- package/dist/entrypoints/ozy-virtual-security-key.js.map +0 -1
- package/dist/entrypoints/ozy.js +0 -3
- package/dist/entrypoints/ozy.js.map +0 -1
- package/dist/index.js +0 -2
- package/dist/index.js.map +0 -1
- package/dist/internal/thing.js +0 -4
- package/dist/internal/thing.js.map +0 -1
- package/dist/modules/cli/agent-client/impl.js +0 -109
- package/dist/modules/cli/agent-client/impl.js.map +0 -1
- package/dist/modules/cli/agent-client/interface.js +0 -11
- package/dist/modules/cli/agent-client/interface.js.map +0 -1
- package/dist/modules/cli/git/impl.js +0 -124
- package/dist/modules/cli/git/impl.js.map +0 -1
- package/dist/modules/cli/git/interface.js +0 -3
- package/dist/modules/cli/git/interface.js.map +0 -1
- package/dist/modules/cli/git/submodule/fix.js +0 -257
- package/dist/modules/cli/git/submodule/fix.js.map +0 -1
- package/dist/modules/cli/git/submodule/git-state.js +0 -154
- package/dist/modules/cli/git/submodule/git-state.js.map +0 -1
- package/dist/modules/cli/git/submodule/gitmodules.js +0 -113
- package/dist/modules/cli/git/submodule/gitmodules.js.map +0 -1
- package/dist/modules/cli/git/submodule/printer.js +0 -232
- package/dist/modules/cli/git/submodule/printer.js.map +0 -1
- package/dist/modules/cli/git/submodule/resolve-git-dir.js +0 -16
- package/dist/modules/cli/git/submodule/resolve-git-dir.js.map +0 -1
- package/dist/modules/cli/github/impl.js +0 -137
- package/dist/modules/cli/github/impl.js.map +0 -1
- package/dist/modules/cli/github/interface.js +0 -2
- package/dist/modules/cli/github/interface.js.map +0 -1
- package/dist/modules/cli/index.js +0 -9
- package/dist/modules/cli/index.js.map +0 -1
- package/dist/modules/common/crypto/impl.js +0 -133
- package/dist/modules/common/crypto/impl.js.map +0 -1
- package/dist/modules/common/crypto/interface.js +0 -2
- package/dist/modules/common/crypto/interface.js.map +0 -1
- package/dist/modules/common/index.js +0 -10
- package/dist/modules/common/index.js.map +0 -1
- package/dist/modules/common/kep-map-store/impl.js +0 -42
- package/dist/modules/common/kep-map-store/impl.js.map +0 -1
- package/dist/modules/common/kep-map-store/interface.js +0 -2
- package/dist/modules/common/kep-map-store/interface.js.map +0 -1
- package/dist/modules/common/os-platform/caller-info.js +0 -132
- package/dist/modules/common/os-platform/caller-info.js.map +0 -1
- package/dist/modules/common/os-platform/impl.js +0 -95
- package/dist/modules/common/os-platform/impl.js.map +0 -1
- package/dist/modules/common/os-platform/interface.js +0 -2
- package/dist/modules/common/os-platform/interface.js.map +0 -1
- package/dist/modules/common/os-platform/virtual-hid/index.js +0 -12
- package/dist/modules/common/os-platform/virtual-hid/index.js.map +0 -1
- package/dist/modules/common/os-platform/virtual-hid/linux.js +0 -5
- package/dist/modules/common/os-platform/virtual-hid/linux.js.map +0 -1
- package/dist/modules/common/os-platform/virtual-hid/mac.js +0 -119
- package/dist/modules/common/os-platform/virtual-hid/mac.js.map +0 -1
- package/dist/modules/common/os-platform/virtual-hid/windows.js +0 -5
- package/dist/modules/common/os-platform/virtual-hid/windows.js.map +0 -1
- package/dist/modules/common/ssh-config/impl.js +0 -116
- package/dist/modules/common/ssh-config/impl.js.map +0 -1
- package/dist/modules/common/ssh-config/interface.js +0 -10
- package/dist/modules/common/ssh-config/interface.js.map +0 -1
- package/dist/modules/ssh-agent/index.js +0 -8
- package/dist/modules/ssh-agent/index.js.map +0 -1
- package/dist/modules/ssh-agent/session/impl.js +0 -265
- package/dist/modules/ssh-agent/session/impl.js.map +0 -1
- package/dist/modules/ssh-agent/session/interface-rpc.js +0 -20
- package/dist/modules/ssh-agent/session/interface-rpc.js.map +0 -1
- package/dist/modules/ssh-agent/session/interface.js +0 -32
- package/dist/modules/ssh-agent/session/interface.js.map +0 -1
- package/dist/modules/ssh-agent/session/passkey-prf-page.js +0 -204
- package/dist/modules/ssh-agent/session/passkey-prf-page.js.map +0 -1
- package/dist/modules/ssh-agent/session/prf-flow.js +0 -103
- package/dist/modules/ssh-agent/session/prf-flow.js.map +0 -1
- package/dist/modules/ssh-agent/ssh-agent/impl.js +0 -117
- package/dist/modules/ssh-agent/ssh-agent/impl.js.map +0 -1
- package/dist/modules/ssh-agent/ssh-agent/interface.js +0 -2
- package/dist/modules/ssh-agent/ssh-agent/interface.js.map +0 -1
- package/dist/scripts/build.js +0 -410
- package/dist/scripts/build.js.map +0 -1
- package/dist/scripts/check-npm-version.js +0 -8
- package/dist/scripts/check-npm-version.js.map +0 -1
- package/dist/scripts/kill-existing-agent.js +0 -21
- package/dist/scripts/kill-existing-agent.js.map +0 -1
- package/dist/scripts/publish.js +0 -46
- package/dist/scripts/publish.js.map +0 -1
- package/src/commands/git/hosts.ts +0 -20
- package/src/commands/git/index.ts +0 -9
- package/src/commands/git/setup.ts +0 -182
- package/src/commands/index.ts +0 -15
- package/src/commands/npm/index.ts +0 -8
- package/src/commands/npm/setup/git-remote.ts +0 -78
- package/src/commands/npm/setup/index.ts +0 -189
- package/src/commands/npm/setup/npm-auth.ts +0 -58
- package/src/commands/npm/setup/package-json-validate.ts +0 -68
- package/src/commands/npm/setup/package-registry.ts +0 -24
- package/src/commands/npm/setup/publish-workflow.yml +0 -35
- package/src/commands/npm/setup/setup.test.ts +0 -117
- package/src/commands/npm/setup/trusted-publishing.ts +0 -106
- package/src/commands/npm/setup/workflow.ts +0 -20
- package/src/commands/ssh/get-sk-credential.ts +0 -110
- package/src/commands/ssh/index.ts +0 -8
- package/src/commands/upgrade.ts +0 -220
- package/src/common/command.ts +0 -16
- package/src/common/constants.ts +0 -26
- package/src/common/effective-modules-extensions.ts +0 -24
- package/src/common/log.ts +0 -3
- package/src/common/render-caller-tree.ts +0 -22
- package/src/entrypoints/ozy-signing-agent.ts +0 -48
- package/src/entrypoints/ozy-ssh-keygen.ts +0 -10
- package/src/entrypoints/ozy-virtual-security-key.ts +0 -21
- package/src/entrypoints/ozy.ts +0 -2
- package/src/index.ts +0 -1
- package/src/internal/thing.ts +0 -3
- package/src/modules/cli/agent-client/impl.ts +0 -152
- package/src/modules/cli/agent-client/interface.ts +0 -17
- package/src/modules/cli/git/impl.ts +0 -133
- package/src/modules/cli/git/interface.ts +0 -23
- package/src/modules/cli/git/submodule/fix.ts +0 -298
- package/src/modules/cli/git/submodule/git-state.ts +0 -217
- package/src/modules/cli/git/submodule/gitmodules.ts +0 -126
- package/src/modules/cli/git/submodule/printer.ts +0 -256
- package/src/modules/cli/git/submodule/resolve-git-dir.ts +0 -14
- package/src/modules/cli/github/impl.ts +0 -169
- package/src/modules/cli/github/interface.ts +0 -29
- package/src/modules/cli/index.ts +0 -16
- package/src/modules/common/crypto/impl.ts +0 -173
- package/src/modules/common/crypto/interface.ts +0 -20
- package/src/modules/common/index.ts +0 -19
- package/src/modules/common/kep-map-store/impl.ts +0 -47
- package/src/modules/common/kep-map-store/interface.ts +0 -9
- package/src/modules/common/os-platform/caller-info.ts +0 -152
- package/src/modules/common/os-platform/impl.ts +0 -91
- package/src/modules/common/os-platform/interface.ts +0 -16
- package/src/modules/common/os-platform/virtual-hid/index.ts +0 -12
- package/src/modules/common/os-platform/virtual-hid/linux.ts +0 -7
- package/src/modules/common/os-platform/virtual-hid/mac.ts +0 -150
- package/src/modules/common/os-platform/virtual-hid/windows.ts +0 -7
- package/src/modules/common/ssh-config/impl.ts +0 -130
- package/src/modules/common/ssh-config/interface.ts +0 -33
- package/src/modules/ssh-agent/index.ts +0 -13
- package/src/modules/ssh-agent/session/agent-notes.md +0 -210
- package/src/modules/ssh-agent/session/design.md +0 -2
- package/src/modules/ssh-agent/session/html-refactor.md +0 -23
- package/src/modules/ssh-agent/session/impl.ts +0 -328
- package/src/modules/ssh-agent/session/interface-rpc.ts +0 -24
- package/src/modules/ssh-agent/session/interface.ts +0 -62
- package/src/modules/ssh-agent/session/passkey-prf-page.ts +0 -224
- package/src/modules/ssh-agent/session/prf-flow.ts +0 -152
- package/src/modules/ssh-agent/ssh-agent/impl.ts +0 -136
- package/src/modules/ssh-agent/ssh-agent/interface.ts +0 -9
- package/src/scripts/build.ts +0 -504
- package/src/scripts/check-npm-version.ts +0 -7
- package/src/scripts/command-launcher.js.ejs +0 -168
- package/src/scripts/kill-existing-agent.ts +0 -22
- package/src/scripts/publish.ts +0 -47
- package/src/scripts/windows-bin-shims.md +0 -1104
|
@@ -1,154 +0,0 @@
|
|
|
1
|
-
import { existsSync, readdirSync, statSync } from "node:fs";
|
|
2
|
-
import { readFile } from "node:fs/promises";
|
|
3
|
-
import { resolve, join } from "node:path";
|
|
4
|
-
import { Effect, Option } from "effect";
|
|
5
|
-
import { resolveGitDir } from "./resolve-git-dir";
|
|
6
|
-
// --- parsers ---
|
|
7
|
-
function parseGitConfig(content) {
|
|
8
|
-
const entries = [];
|
|
9
|
-
let current = null;
|
|
10
|
-
for (const line of content.split("\n")) {
|
|
11
|
-
const headerMatch = line.match(/^\[submodule "(.+)"\]$/);
|
|
12
|
-
if (headerMatch) {
|
|
13
|
-
if (current?.name)
|
|
14
|
-
entries.push(current);
|
|
15
|
-
current = { name: headerMatch[1] };
|
|
16
|
-
continue;
|
|
17
|
-
}
|
|
18
|
-
if (!current)
|
|
19
|
-
continue;
|
|
20
|
-
const kvMatch = line.match(/^\s+(\w+)\s*=\s*(.+)$/);
|
|
21
|
-
if (!kvMatch)
|
|
22
|
-
continue;
|
|
23
|
-
const [, key, value] = kvMatch;
|
|
24
|
-
if (key === "url")
|
|
25
|
-
current.url = value.trim();
|
|
26
|
-
else if (key === "path")
|
|
27
|
-
current.path = value.trim();
|
|
28
|
-
else if (key === "active")
|
|
29
|
-
current.active = value.trim() === "true";
|
|
30
|
-
}
|
|
31
|
-
if (current?.name)
|
|
32
|
-
entries.push(current);
|
|
33
|
-
return entries;
|
|
34
|
-
}
|
|
35
|
-
function parseIndexGitlinks(output) {
|
|
36
|
-
return output
|
|
37
|
-
.split("\n")
|
|
38
|
-
.filter((l) => l.startsWith("160000 "))
|
|
39
|
-
.map((line) => {
|
|
40
|
-
const match = line.match(/^160000 ([0-9a-f]{40}) \d\t(.+)$/);
|
|
41
|
-
if (!match)
|
|
42
|
-
throw new Error(`Unexpected ls-files line: ${line}`);
|
|
43
|
-
return { commit: match[1], path: match[2] };
|
|
44
|
-
});
|
|
45
|
-
}
|
|
46
|
-
/**
|
|
47
|
-
* Recursively scans .git/modules/, returning:
|
|
48
|
-
* - gitDirs: paths of real git dirs (contain a HEAD file)
|
|
49
|
-
* - orphanDirs: paths that are neither a git dir nor a prefix of any known module path
|
|
50
|
-
*/
|
|
51
|
-
function scanModuleDirs(root, modulePaths, rel = "") {
|
|
52
|
-
const gitDirs = [];
|
|
53
|
-
const orphanDirs = [];
|
|
54
|
-
if (!existsSync(root))
|
|
55
|
-
return { gitDirs, orphanDirs };
|
|
56
|
-
for (const entry of readdirSync(root)) {
|
|
57
|
-
const abs = join(root, entry);
|
|
58
|
-
if (!statSync(abs).isDirectory())
|
|
59
|
-
continue;
|
|
60
|
-
const relPath = rel ? `${rel}/${entry}` : entry;
|
|
61
|
-
if (existsSync(join(abs, "HEAD"))) {
|
|
62
|
-
gitDirs.push(relPath);
|
|
63
|
-
}
|
|
64
|
-
else {
|
|
65
|
-
const isPrefix = [...modulePaths].some((p) => p.startsWith(relPath + "/"));
|
|
66
|
-
if (isPrefix) {
|
|
67
|
-
const sub = scanModuleDirs(abs, modulePaths, relPath);
|
|
68
|
-
gitDirs.push(...sub.gitDirs);
|
|
69
|
-
orphanDirs.push(...sub.orphanDirs);
|
|
70
|
-
}
|
|
71
|
-
else {
|
|
72
|
-
orphanDirs.push(relPath);
|
|
73
|
-
}
|
|
74
|
-
}
|
|
75
|
-
}
|
|
76
|
-
return { gitDirs, orphanDirs };
|
|
77
|
-
}
|
|
78
|
-
async function readModuleDirRemoteUrl(abs) {
|
|
79
|
-
const configPath = join(abs, "config");
|
|
80
|
-
if (!existsSync(configPath))
|
|
81
|
-
return Option.none();
|
|
82
|
-
const content = await readFile(configPath, "utf8");
|
|
83
|
-
const match = content.match(/\[remote "origin"\][^\[]*\n\s+url\s*=\s*(.+)/);
|
|
84
|
-
return match?.[1] ? Option.some(match[1].trim()) : Option.none();
|
|
85
|
-
}
|
|
86
|
-
async function spawnGitInDir(args, cwd) {
|
|
87
|
-
const proc = Bun.spawn(["git", ...args], { cwd, stdout: "pipe", stderr: "pipe" });
|
|
88
|
-
const [code, out, err] = await Promise.all([
|
|
89
|
-
proc.exited,
|
|
90
|
-
new Response(proc.stdout).text(),
|
|
91
|
-
new Response(proc.stderr).text(),
|
|
92
|
-
]);
|
|
93
|
-
return code === 0 ? out.trim() : { error: err.trim().split("\n")[0] };
|
|
94
|
-
}
|
|
95
|
-
async function readWorkingTreeEntry(repoRoot, subPath) {
|
|
96
|
-
const workingTreeAbs = join(repoRoot, subPath);
|
|
97
|
-
const dotGit = join(workingTreeAbs, ".git");
|
|
98
|
-
let type;
|
|
99
|
-
let gitdirTarget;
|
|
100
|
-
if (!existsSync(dotGit)) {
|
|
101
|
-
type = "missing";
|
|
102
|
-
}
|
|
103
|
-
else if (statSync(dotGit).isDirectory()) {
|
|
104
|
-
type = "dir";
|
|
105
|
-
}
|
|
106
|
-
else {
|
|
107
|
-
type = "file";
|
|
108
|
-
const content = await readFile(dotGit, "utf8");
|
|
109
|
-
const match = content.match(/^gitdir:\s*(.+)$/m);
|
|
110
|
-
gitdirTarget = match?.[1].trim();
|
|
111
|
-
}
|
|
112
|
-
if (!existsSync(workingTreeAbs))
|
|
113
|
-
return { path: subPath, type, gitdirTarget };
|
|
114
|
-
const [remote, headCommit] = await Promise.all([
|
|
115
|
-
spawnGitInDir(["remote", "get-url", "origin"], workingTreeAbs),
|
|
116
|
-
spawnGitInDir(["rev-parse", "HEAD"], workingTreeAbs),
|
|
117
|
-
]);
|
|
118
|
-
return { path: subPath, type, gitdirTarget, remote, headCommit };
|
|
119
|
-
}
|
|
120
|
-
// --- main reader ---
|
|
121
|
-
export function readGitState(repoRoot, extraPaths = []) {
|
|
122
|
-
return Effect.tryPromise({
|
|
123
|
-
try: async () => {
|
|
124
|
-
const gitDir = await resolveGitDir(repoRoot);
|
|
125
|
-
const [configContent, lsOutput] = await Promise.all([
|
|
126
|
-
readFile(resolve(gitDir, "config"), "utf8"),
|
|
127
|
-
new Response(Bun.spawn(["git", "ls-files", "--stage"], { cwd: repoRoot, stdout: "pipe" }).stdout).text(),
|
|
128
|
-
]);
|
|
129
|
-
const config = parseGitConfig(configContent);
|
|
130
|
-
const index = parseIndexGitlinks(lsOutput);
|
|
131
|
-
const modulePaths = new Set(extraPaths);
|
|
132
|
-
const modulesRoot = resolve(gitDir, "modules");
|
|
133
|
-
const { gitDirs: moduleDirPaths, orphanDirs: orphanModuleDirs } = scanModuleDirs(modulesRoot, modulePaths);
|
|
134
|
-
const moduleDirs = await Promise.all(moduleDirPaths.map(async (rel) => {
|
|
135
|
-
const remoteUrlOption = await readModuleDirRemoteUrl(join(modulesRoot, rel));
|
|
136
|
-
return {
|
|
137
|
-
relativePath: rel,
|
|
138
|
-
remoteUrl: Option.isSome(remoteUrlOption) ? remoteUrlOption.value : undefined,
|
|
139
|
-
};
|
|
140
|
-
}));
|
|
141
|
-
const allPaths = [
|
|
142
|
-
...new Set([
|
|
143
|
-
...index.map((e) => e.path),
|
|
144
|
-
...config.flatMap((e) => (e.path ? [e.path] : [])),
|
|
145
|
-
...extraPaths,
|
|
146
|
-
]),
|
|
147
|
-
];
|
|
148
|
-
const workingTree = await Promise.all(allPaths.map((p) => readWorkingTreeEntry(repoRoot, p)));
|
|
149
|
-
return { config, moduleDirs, orphanModuleDirs, index, workingTree };
|
|
150
|
-
},
|
|
151
|
-
catch: (e) => e instanceof Error ? e.message : String(e),
|
|
152
|
-
});
|
|
153
|
-
}
|
|
154
|
-
//# sourceMappingURL=git-state.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"git-state.js","sourceRoot":"","sources":["../../../../../../../../src/modules/cli/git/submodule/git-state.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,113 +0,0 @@
|
|
|
1
|
-
import { existsSync } from "node:fs";
|
|
2
|
-
import { readFile, writeFile } from "node:fs/promises";
|
|
3
|
-
import { resolve } from "node:path";
|
|
4
|
-
import { Effect } from "effect";
|
|
5
|
-
import { STANDARD_REMOTE_PREFIX } from "@/common/constants";
|
|
6
|
-
// git@host:org/repo.git or git@host:repo.git
|
|
7
|
-
const SSH_URL_RE = /^git@[^:]+:.+\.git$/;
|
|
8
|
-
const SSH_URL_HOST_RE = /^git@[^:]+:(.+)$/;
|
|
9
|
-
export class Gitmodules {
|
|
10
|
-
path;
|
|
11
|
-
repoRoot;
|
|
12
|
-
modules;
|
|
13
|
-
rawContent;
|
|
14
|
-
constructor(path, repoRoot, modules, rawContent) {
|
|
15
|
-
this.path = path;
|
|
16
|
-
this.repoRoot = repoRoot;
|
|
17
|
-
this.modules = modules;
|
|
18
|
-
this.rawContent = rawContent;
|
|
19
|
-
this.path;
|
|
20
|
-
}
|
|
21
|
-
static *fromRepoRoot(repoRoot) {
|
|
22
|
-
const path = resolve(repoRoot, ".gitmodules");
|
|
23
|
-
const content = yield* Effect.tryPromise({
|
|
24
|
-
try: () => readFile(path, "utf8"),
|
|
25
|
-
catch: (e) => e instanceof Error ? e.message : String(e),
|
|
26
|
-
});
|
|
27
|
-
const modules = Gitmodules
|
|
28
|
-
.parse(content)
|
|
29
|
-
.map(Gitmodules.normalizeRemote)
|
|
30
|
-
.sort((a, b) => a.name.localeCompare(b.name));
|
|
31
|
-
const serialized = modules
|
|
32
|
-
.map((m) => `[submodule "${m.name}"]\n\tpath = ${m.path}\n\turl = ${m.url}`)
|
|
33
|
-
.join("\n") + "\n";
|
|
34
|
-
const result = new Gitmodules(path, repoRoot, modules, serialized);
|
|
35
|
-
const errors = result.validate();
|
|
36
|
-
if (errors.length) {
|
|
37
|
-
return yield* Effect.fail(`Validation errors in .gitmodules:\n${errors.map(e => ` - ${e}`).join('\n')}`);
|
|
38
|
-
}
|
|
39
|
-
if (serialized !== content) {
|
|
40
|
-
yield* Effect.tryPromise({
|
|
41
|
-
try: () => writeFile(resolve(repoRoot, '.gitmodules'), serialized, 'utf8'),
|
|
42
|
-
catch: (e) => e instanceof Error ? e.message : String(e),
|
|
43
|
-
});
|
|
44
|
-
yield* Effect.log('Updated .gitmodules.');
|
|
45
|
-
}
|
|
46
|
-
return result;
|
|
47
|
-
}
|
|
48
|
-
static parse(content) {
|
|
49
|
-
const modules = [];
|
|
50
|
-
let current = null;
|
|
51
|
-
for (const line of content.split("\n")) {
|
|
52
|
-
const headerMatch = line.match(/^\[submodule "(.+)"\]$/);
|
|
53
|
-
if (headerMatch) {
|
|
54
|
-
if (current)
|
|
55
|
-
modules.push(current);
|
|
56
|
-
current = { name: headerMatch[1] };
|
|
57
|
-
continue;
|
|
58
|
-
}
|
|
59
|
-
const kvMatch = line.match(/^\s+(\w+)\s*=\s*(.+)$/);
|
|
60
|
-
if (kvMatch && current) {
|
|
61
|
-
const [, key, value] = kvMatch;
|
|
62
|
-
if (key === "path" || key === "url")
|
|
63
|
-
current[key] = value.trim();
|
|
64
|
-
}
|
|
65
|
-
}
|
|
66
|
-
if (current)
|
|
67
|
-
modules.push(current);
|
|
68
|
-
return modules;
|
|
69
|
-
}
|
|
70
|
-
static normalizeRemote(m) {
|
|
71
|
-
if (m.url.startsWith(STANDARD_REMOTE_PREFIX))
|
|
72
|
-
return m;
|
|
73
|
-
const match = m.url.match(SSH_URL_HOST_RE);
|
|
74
|
-
// TODO: we should probably move this logic to be alongside validate
|
|
75
|
-
if (!match)
|
|
76
|
-
return m; // malformed URL — left as-is, validate() will report it
|
|
77
|
-
const normalizedUrl = `${STANDARD_REMOTE_PREFIX}${match[1]}`;
|
|
78
|
-
console.warn(`- updating submodule "${m.name}" remote: ${m.url} -> ${normalizedUrl}`);
|
|
79
|
-
return { ...m, url: normalizedUrl };
|
|
80
|
-
}
|
|
81
|
-
get list() {
|
|
82
|
-
return this.modules;
|
|
83
|
-
}
|
|
84
|
-
get content() {
|
|
85
|
-
return this.rawContent;
|
|
86
|
-
}
|
|
87
|
-
validate() {
|
|
88
|
-
const errors = [];
|
|
89
|
-
const names = new Set();
|
|
90
|
-
const paths = new Set();
|
|
91
|
-
const urls = new Set();
|
|
92
|
-
for (const m of this.modules) {
|
|
93
|
-
if (names.has(m.name))
|
|
94
|
-
errors.push(`Duplicate name: "${m.name}"`);
|
|
95
|
-
else
|
|
96
|
-
names.add(m.name);
|
|
97
|
-
if (paths.has(m.path))
|
|
98
|
-
errors.push(`Duplicate path: "${m.path}" (submodule "${m.name}")`);
|
|
99
|
-
else
|
|
100
|
-
paths.add(m.path);
|
|
101
|
-
if (urls.has(m.url))
|
|
102
|
-
errors.push(`Duplicate url: "${m.url}" (submodule "${m.name}")`);
|
|
103
|
-
else
|
|
104
|
-
urls.add(m.url);
|
|
105
|
-
if (!SSH_URL_RE.test(m.url))
|
|
106
|
-
errors.push(`Invalid url for "${m.name}": ${m.url}`);
|
|
107
|
-
if (!existsSync(resolve(this.repoRoot, m.path)))
|
|
108
|
-
errors.push(`Path does not exist for "${m.name}": ${m.path}`);
|
|
109
|
-
}
|
|
110
|
-
return errors;
|
|
111
|
-
}
|
|
112
|
-
}
|
|
113
|
-
//# sourceMappingURL=gitmodules.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"gitmodules.js","sourceRoot":"","sources":["../../../../../../../../src/modules/cli/git/submodule/gitmodules.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,232 +0,0 @@
|
|
|
1
|
-
const RED = "\x1b[31m";
|
|
2
|
-
const GREEN = "\x1b[32m";
|
|
3
|
-
const CYAN = "\x1b[36m";
|
|
4
|
-
const DIM = "\x1b[2m";
|
|
5
|
-
const BOLD = "\x1b[1m";
|
|
6
|
-
const RESET = "\x1b[0m";
|
|
7
|
-
const ok = `${GREEN}✓${RESET}`;
|
|
8
|
-
const fail = (msg) => `${RED}✗ ${msg}${RESET}`;
|
|
9
|
-
const fsName = (s) => `${CYAN}${s}${RESET}`;
|
|
10
|
-
const key = (s) => `${DIM}${s}${RESET}`;
|
|
11
|
-
function render(lines, prefix = "") {
|
|
12
|
-
for (let i = 0; i < lines.length; i++) {
|
|
13
|
-
const last = i === lines.length - 1;
|
|
14
|
-
const branch = last ? "└── " : "├── ";
|
|
15
|
-
const child = last ? " " : "│ ";
|
|
16
|
-
const l = lines[i];
|
|
17
|
-
const label = l.isKey ? key(l.label) : fsName(l.label);
|
|
18
|
-
let out = `${prefix}${branch}${label}`;
|
|
19
|
-
if (l.value !== undefined)
|
|
20
|
-
out += `: ${l.value}`;
|
|
21
|
-
if (l.status !== undefined)
|
|
22
|
-
out += ` ${l.status}`;
|
|
23
|
-
console.log(out);
|
|
24
|
-
if (l.children?.length)
|
|
25
|
-
render(l.children, prefix + child);
|
|
26
|
-
}
|
|
27
|
-
}
|
|
28
|
-
function buildPathTree(parts, children) {
|
|
29
|
-
if (parts.length === 1)
|
|
30
|
-
return { label: parts[0], children };
|
|
31
|
-
return { label: parts[0], children: [buildPathTree(parts.slice(1), children)] };
|
|
32
|
-
}
|
|
33
|
-
function resultLine(label, result) {
|
|
34
|
-
if (result === undefined)
|
|
35
|
-
return { label, isKey: true, status: fail("unknown") };
|
|
36
|
-
if (typeof result === "string")
|
|
37
|
-
return { label, isKey: true, value: result };
|
|
38
|
-
return { label, isKey: true, status: fail(result.error) };
|
|
39
|
-
}
|
|
40
|
-
function moduleHasIssues(m, cfg, dir, idx, headSha, wt) {
|
|
41
|
-
if (!cfg)
|
|
42
|
-
return true;
|
|
43
|
-
if (cfg.path !== m.path || cfg.url !== m.url)
|
|
44
|
-
return true;
|
|
45
|
-
if (!dir)
|
|
46
|
-
return true;
|
|
47
|
-
if (!idx)
|
|
48
|
-
return true;
|
|
49
|
-
if (headSha && idx.commit !== headSha)
|
|
50
|
-
return true;
|
|
51
|
-
if (!wt || wt.type === "missing" || wt.type === "dir")
|
|
52
|
-
return true;
|
|
53
|
-
if (typeof wt.headCommit !== "string")
|
|
54
|
-
return true;
|
|
55
|
-
if (typeof wt.remote !== "string" || wt.remote !== m.url)
|
|
56
|
-
return true;
|
|
57
|
-
return false;
|
|
58
|
-
}
|
|
59
|
-
export function printSyncState(modules, state) {
|
|
60
|
-
const byName = new Map(state.config.map((c) => [c.name, c]));
|
|
61
|
-
const byPath = new Map(state.moduleDirs.map((d) => [d.relativePath, d]));
|
|
62
|
-
const byIndexPath = new Map(state.index.map((i) => [i.path, i]));
|
|
63
|
-
const byTreePath = new Map(state.workingTree.map((w) => [w.path, w]));
|
|
64
|
-
const modulePaths = new Set(modules.list.map((m) => m.path));
|
|
65
|
-
const moduleNames = new Set(modules.list.map((m) => m.name));
|
|
66
|
-
console.log("=== syncing submodules ===");
|
|
67
|
-
for (const m of modules.list) {
|
|
68
|
-
const cfg = byName.get(m.name);
|
|
69
|
-
const dir = byPath.get(m.path);
|
|
70
|
-
const idx = byIndexPath.get(m.path);
|
|
71
|
-
const wt = byTreePath.get(m.path);
|
|
72
|
-
const headSha = typeof wt?.headCommit === "string" ? wt.headCommit : undefined;
|
|
73
|
-
if (!moduleHasIssues(m, cfg, dir, idx, headSha, wt)) {
|
|
74
|
-
console.log(`${BOLD}[${m.name}]${RESET} ${ok}`);
|
|
75
|
-
continue;
|
|
76
|
-
}
|
|
77
|
-
console.log(`${BOLD}[${m.name}]${RESET}`);
|
|
78
|
-
// .gitmodules
|
|
79
|
-
const gitmodulesNode = {
|
|
80
|
-
label: ".gitmodules",
|
|
81
|
-
children: [
|
|
82
|
-
{ label: "path", isKey: true, value: m.path },
|
|
83
|
-
{ label: "url", isKey: true, value: m.url },
|
|
84
|
-
],
|
|
85
|
-
};
|
|
86
|
-
// .git/config
|
|
87
|
-
let configNode;
|
|
88
|
-
if (!cfg) {
|
|
89
|
-
configNode = { label: "config", status: fail("missing") };
|
|
90
|
-
}
|
|
91
|
-
else {
|
|
92
|
-
configNode = {
|
|
93
|
-
label: "config",
|
|
94
|
-
children: [
|
|
95
|
-
{
|
|
96
|
-
label: "path",
|
|
97
|
-
isKey: true,
|
|
98
|
-
value: cfg.path ?? "(missing)",
|
|
99
|
-
status: cfg.path === m.path ? ok : fail(`expected ${m.path}`),
|
|
100
|
-
},
|
|
101
|
-
{
|
|
102
|
-
label: "url",
|
|
103
|
-
isKey: true,
|
|
104
|
-
value: cfg.url ?? "(missing)",
|
|
105
|
-
status: cfg.url === m.url ? ok : fail(`expected ${m.url}`),
|
|
106
|
-
},
|
|
107
|
-
],
|
|
108
|
-
};
|
|
109
|
-
}
|
|
110
|
-
// .git/modules
|
|
111
|
-
const modulesNode = {
|
|
112
|
-
label: "modules",
|
|
113
|
-
children: [{ label: m.path, status: dir ? ok : fail("missing") }],
|
|
114
|
-
};
|
|
115
|
-
// .git/index
|
|
116
|
-
let indexNode;
|
|
117
|
-
if (!idx) {
|
|
118
|
-
indexNode = { label: "index", status: fail("missing") };
|
|
119
|
-
}
|
|
120
|
-
else {
|
|
121
|
-
const idxSha8 = idx.commit.slice(0, 8);
|
|
122
|
-
const matches = headSha && idx.commit === headSha;
|
|
123
|
-
const mismatches = headSha && idx.commit !== headSha;
|
|
124
|
-
indexNode = {
|
|
125
|
-
label: "index",
|
|
126
|
-
value: idxSha8,
|
|
127
|
-
status: matches ? ok : mismatches ? fail(`head is ${headSha.slice(0, 8)}`) : undefined,
|
|
128
|
-
};
|
|
129
|
-
}
|
|
130
|
-
const dotGitNode = {
|
|
131
|
-
label: ".git",
|
|
132
|
-
children: [configNode, modulesNode, indexNode],
|
|
133
|
-
};
|
|
134
|
-
// working tree leaves
|
|
135
|
-
const wtLeaves = [];
|
|
136
|
-
if (!wt || wt.type === "missing") {
|
|
137
|
-
wtLeaves.push({ label: ".git", status: fail("missing") });
|
|
138
|
-
}
|
|
139
|
-
else if (wt.type === "dir") {
|
|
140
|
-
wtLeaves.push({ label: ".git", status: fail("directory (standalone clone)") });
|
|
141
|
-
}
|
|
142
|
-
else {
|
|
143
|
-
wtLeaves.push({ label: ".git", value: `gitdir → ${wt.gitdirTarget}` });
|
|
144
|
-
}
|
|
145
|
-
if (wt) {
|
|
146
|
-
const head = headSha ?? wt.headCommit;
|
|
147
|
-
wtLeaves.push(resultLine("head", typeof head === "string" ? head.slice(0, 8) : head));
|
|
148
|
-
if (typeof wt.remote === "string") {
|
|
149
|
-
wtLeaves.push({
|
|
150
|
-
label: "remote",
|
|
151
|
-
isKey: true,
|
|
152
|
-
value: wt.remote,
|
|
153
|
-
status: wt.remote === m.url ? ok : fail(`expected ${m.url}`),
|
|
154
|
-
});
|
|
155
|
-
}
|
|
156
|
-
else {
|
|
157
|
-
wtLeaves.push(resultLine("remote", wt.remote));
|
|
158
|
-
}
|
|
159
|
-
}
|
|
160
|
-
const workingTreeNode = buildPathTree(m.path.split("/"), wtLeaves);
|
|
161
|
-
render([gitmodulesNode, dotGitNode, workingTreeNode]);
|
|
162
|
-
}
|
|
163
|
-
// Stale entries
|
|
164
|
-
const staleConfig = state.config.filter((c) => !moduleNames.has(c.name));
|
|
165
|
-
const staleDirs = state.moduleDirs.filter((d) => !modulePaths.has(d.relativePath));
|
|
166
|
-
const staleIndex = state.index.filter((i) => !modulePaths.has(i.path));
|
|
167
|
-
if (staleConfig.length || staleDirs.length || state.orphanModuleDirs.length || staleIndex.length) {
|
|
168
|
-
console.log(`\n${RED}${BOLD}=== stale (not in .gitmodules) ===${RESET}`);
|
|
169
|
-
const staleNodes = [];
|
|
170
|
-
if (staleConfig.length) {
|
|
171
|
-
staleNodes.push({
|
|
172
|
-
label: ".git/config",
|
|
173
|
-
children: staleConfig.map((c) => ({ label: c.name })),
|
|
174
|
-
});
|
|
175
|
-
}
|
|
176
|
-
if (staleDirs.length || state.orphanModuleDirs.length) {
|
|
177
|
-
staleNodes.push({
|
|
178
|
-
label: ".git/modules",
|
|
179
|
-
children: [
|
|
180
|
-
...staleDirs.map((d) => ({ label: d.relativePath })),
|
|
181
|
-
...state.orphanModuleDirs.map((d) => ({ label: d })),
|
|
182
|
-
],
|
|
183
|
-
});
|
|
184
|
-
}
|
|
185
|
-
if (staleIndex.length) {
|
|
186
|
-
staleNodes.push({
|
|
187
|
-
label: ".git/index",
|
|
188
|
-
children: staleIndex.map((i) => ({ label: i.path, isKey: true, value: i.commit.slice(0, 8) })),
|
|
189
|
-
});
|
|
190
|
-
}
|
|
191
|
-
render(staleNodes);
|
|
192
|
-
}
|
|
193
|
-
}
|
|
194
|
-
function addToFixTree(tree, fix, depth = 0) {
|
|
195
|
-
const seg = fix.location[depth];
|
|
196
|
-
if (!tree.has(seg))
|
|
197
|
-
tree.set(seg, { subtree: new Map(), fixes: [] });
|
|
198
|
-
const node = tree.get(seg);
|
|
199
|
-
if (depth === fix.location.length - 1) {
|
|
200
|
-
node.fixes.push(fix);
|
|
201
|
-
}
|
|
202
|
-
else {
|
|
203
|
-
addToFixTree(node.subtree, fix, depth + 1);
|
|
204
|
-
}
|
|
205
|
-
}
|
|
206
|
-
function fixTreeToLines(tree) {
|
|
207
|
-
const lines = [];
|
|
208
|
-
for (const [label, { subtree, fixes }] of tree) {
|
|
209
|
-
const children = fixTreeToLines(subtree);
|
|
210
|
-
if (fixes.length > 0) {
|
|
211
|
-
for (const fix of fixes) {
|
|
212
|
-
const actionStr = fix.action === "deleted" ? `${RED}deleted${RESET}` : `${GREEN}synced${RESET}`;
|
|
213
|
-
const status = fix.detail ? `${actionStr} ${fix.detail}` : actionStr;
|
|
214
|
-
lines.push({ label, status, children: children.length > 0 ? children : undefined });
|
|
215
|
-
}
|
|
216
|
-
}
|
|
217
|
-
else {
|
|
218
|
-
lines.push({ label, children });
|
|
219
|
-
}
|
|
220
|
-
}
|
|
221
|
-
return lines;
|
|
222
|
-
}
|
|
223
|
-
export function printFixes(fixes) {
|
|
224
|
-
if (fixes.length === 0)
|
|
225
|
-
return;
|
|
226
|
-
const tree = new Map();
|
|
227
|
-
for (const fix of fixes)
|
|
228
|
-
addToFixTree(tree, fix);
|
|
229
|
-
console.log("\napplied fixes:");
|
|
230
|
-
render(fixTreeToLines(tree));
|
|
231
|
-
}
|
|
232
|
-
//# sourceMappingURL=printer.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"printer.js","sourceRoot":"","sources":["../../../../../../../../src/modules/cli/git/submodule/printer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +0,0 @@
|
|
|
1
|
-
import { statSync } from "node:fs";
|
|
2
|
-
import { readFile } from "node:fs/promises";
|
|
3
|
-
import { resolve } from "node:path";
|
|
4
|
-
// A submodule's .git is a redirect file ("gitdir: <relative path>"), not a directory —
|
|
5
|
-
// resolve it to the real git dir so callers don't try to treat the file as a directory.
|
|
6
|
-
export async function resolveGitDir(repoRoot) {
|
|
7
|
-
const dotGit = resolve(repoRoot, ".git");
|
|
8
|
-
if (statSync(dotGit).isDirectory())
|
|
9
|
-
return dotGit;
|
|
10
|
-
const content = await readFile(dotGit, "utf8");
|
|
11
|
-
const match = content.match(/^gitdir:\s*(.+)$/m);
|
|
12
|
-
if (!match)
|
|
13
|
-
throw new Error(`Malformed .git file at ${dotGit}`);
|
|
14
|
-
return resolve(repoRoot, match[1].trim());
|
|
15
|
-
}
|
|
16
|
-
//# sourceMappingURL=resolve-git-dir.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-git-dir.js","sourceRoot":"","sources":["../../../../../../../../src/modules/cli/git/submodule/resolve-git-dir.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,uFAAuF;AACvF,wFAAwF;AACxF,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,QAAgB;IAClD,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACzC,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE;QAAE,OAAO,MAAM,CAAC;IAClD,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/C,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;IACjD,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,MAAM,EAAE,CAAC,CAAC;IAChE,OAAO,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAE,CAAC,IAAI,EAAE,CAAC,CAAC;AAC7C,CAAC"}
|