@tinyrack/devsync 1.6.0 → 1.8.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/README.md +5 -3
- package/dist/cli/base-command.d.ts +2 -0
- package/dist/cli/base-command.d.ts.map +1 -1
- package/dist/cli/base-command.js +5 -1
- package/dist/cli/base-command.js.map +1 -1
- package/dist/cli/commands/doctor.d.ts.map +1 -1
- package/dist/cli/commands/doctor.js +1 -1
- package/dist/cli/commands/doctor.js.map +1 -1
- package/dist/cli/commands/init.d.ts.map +1 -1
- package/dist/cli/commands/init.js +2 -1
- package/dist/cli/commands/init.js.map +1 -1
- package/dist/cli/commands/pull.d.ts.map +1 -1
- package/dist/cli/commands/pull.js +2 -1
- package/dist/cli/commands/pull.js.map +1 -1
- package/dist/cli/commands/push.d.ts.map +1 -1
- package/dist/cli/commands/push.js +2 -1
- package/dist/cli/commands/push.js.map +1 -1
- package/dist/cli/commands/status.d.ts.map +1 -1
- package/dist/cli/commands/status.js +2 -0
- package/dist/cli/commands/status.js.map +1 -1
- package/dist/cli/commands/track.d.ts.map +1 -1
- package/dist/cli/commands/track.js +6 -4
- package/dist/cli/commands/track.js.map +1 -1
- package/dist/cli/progress-reporter.d.ts +5 -0
- package/dist/cli/progress-reporter.d.ts.map +1 -0
- package/dist/cli/progress-reporter.js +17 -0
- package/dist/cli/progress-reporter.js.map +1 -0
- package/dist/config/platform.d.ts +4 -3
- package/dist/config/platform.d.ts.map +1 -1
- package/dist/config/platform.js +16 -4
- package/dist/config/platform.js.map +1 -1
- package/dist/config/sync.d.ts +11 -0
- package/dist/config/sync.d.ts.map +1 -1
- package/dist/config/sync.js +9 -4
- package/dist/config/sync.js.map +1 -1
- package/dist/index.js +7 -1
- package/dist/index.js.map +1 -1
- package/dist/lib/output.d.ts +4 -0
- package/dist/lib/output.d.ts.map +1 -1
- package/dist/lib/output.js +5 -0
- package/dist/lib/output.js.map +1 -1
- package/dist/lib/progress.d.ts +8 -0
- package/dist/lib/progress.d.ts.map +1 -0
- package/dist/lib/progress.js +7 -0
- package/dist/lib/progress.js.map +1 -0
- package/dist/services/add.d.ts.map +1 -1
- package/dist/services/add.js +8 -3
- package/dist/services/add.js.map +1 -1
- package/dist/services/config-file.d.ts +4 -0
- package/dist/services/config-file.d.ts.map +1 -1
- package/dist/services/doctor.d.ts +2 -1
- package/dist/services/doctor.d.ts.map +1 -1
- package/dist/services/doctor.js +15 -1
- package/dist/services/doctor.js.map +1 -1
- package/dist/services/git.d.ts +2 -1
- package/dist/services/git.d.ts.map +1 -1
- package/dist/services/git.js +81 -4
- package/dist/services/git.js.map +1 -1
- package/dist/services/init.d.ts +2 -1
- package/dist/services/init.d.ts.map +1 -1
- package/dist/services/init.js +25 -4
- package/dist/services/init.js.map +1 -1
- package/dist/services/local-materialization.d.ts +4 -3
- package/dist/services/local-materialization.d.ts.map +1 -1
- package/dist/services/local-materialization.js +52 -19
- package/dist/services/local-materialization.js.map +1 -1
- package/dist/services/local-snapshot.d.ts +2 -1
- package/dist/services/local-snapshot.d.ts.map +1 -1
- package/dist/services/local-snapshot.js +32 -4
- package/dist/services/local-snapshot.js.map +1 -1
- package/dist/services/pull.d.ts +3 -2
- package/dist/services/pull.d.ts.map +1 -1
- package/dist/services/pull.js +15 -7
- package/dist/services/pull.js.map +1 -1
- package/dist/services/push.d.ts +5 -2
- package/dist/services/push.d.ts.map +1 -1
- package/dist/services/push.js +30 -10
- package/dist/services/push.js.map +1 -1
- package/dist/services/repo-artifacts.d.ts +4 -3
- package/dist/services/repo-artifacts.d.ts.map +1 -1
- package/dist/services/repo-artifacts.js +51 -9
- package/dist/services/repo-artifacts.js.map +1 -1
- package/dist/services/repo-snapshot.d.ts +2 -1
- package/dist/services/repo-snapshot.d.ts.map +1 -1
- package/dist/services/repo-snapshot.js +24 -5
- package/dist/services/repo-snapshot.js.map +1 -1
- package/dist/services/set.d.ts.map +1 -1
- package/dist/services/set.js +8 -6
- package/dist/services/set.js.map +1 -1
- package/dist/services/status.d.ts +2 -0
- package/dist/services/status.d.ts.map +1 -1
- package/dist/services/status.js +9 -2
- package/dist/services/status.js.map +1 -1
- package/package.json +3 -3
package/dist/lib/output.d.ts
CHANGED
|
@@ -12,10 +12,14 @@ type OutputTone = "default" | "error" | "success" | "warn";
|
|
|
12
12
|
type FormatterOptions = Readonly<{
|
|
13
13
|
verbose?: boolean;
|
|
14
14
|
}>;
|
|
15
|
+
type ProgressFormatOptions = Readonly<{
|
|
16
|
+
detail?: boolean;
|
|
17
|
+
}>;
|
|
15
18
|
type StatPair = readonly [label: string, value: number | string];
|
|
16
19
|
export declare const output: (...lines: OutputLine[]) => string;
|
|
17
20
|
export declare const writeStdout: (value: string) => void;
|
|
18
21
|
export declare const writeStderr: (value: string) => void;
|
|
22
|
+
export declare const formatProgressMessage: (message: string, options?: ProgressFormatOptions) => string;
|
|
19
23
|
export declare const heading: (text: string, tone?: OutputTone) => string;
|
|
20
24
|
export declare const kv: (label: string, value: number | string, labelWidth?: number) => string;
|
|
21
25
|
export declare const statLine: (...pairs: readonly StatPair[]) => string;
|
package/dist/lib/output.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"output.d.ts","sourceRoot":"","sources":["../../src/lib/output.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"output.d.ts","sourceRoot":"","sources":["../../src/lib/output.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/output.js
CHANGED
|
@@ -113,6 +113,11 @@ export const writeStdout = (value) => {
|
|
|
113
113
|
export const writeStderr = (value) => {
|
|
114
114
|
process.stderr.write(value);
|
|
115
115
|
};
|
|
116
|
+
export const formatProgressMessage = (message, options = {}) => {
|
|
117
|
+
return ensureTrailingNewline(options.detail
|
|
118
|
+
? `${OUTPUT_INDENT}${style.detail(message)}`
|
|
119
|
+
: `${toneStyle("default")(toneIcon("default"))} ${style.value(message)}`);
|
|
120
|
+
};
|
|
116
121
|
export const heading = (text, tone = "default") => {
|
|
117
122
|
const icon = toneIcon(tone);
|
|
118
123
|
return toneStyle(tone)(text.length > 0 ? `${icon} ${text}` : icon);
|
package/dist/lib/output.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"output.js","sourceRoot":"","sources":["../../src/lib/output.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"output.js","sourceRoot":"","sources":["../../src/lib/output.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
export type ProgressReporter = Readonly<{
|
|
2
|
+
detail(message: string): void;
|
|
3
|
+
phase(message: string): void;
|
|
4
|
+
verbose: boolean;
|
|
5
|
+
}>;
|
|
6
|
+
export declare const reportPhase: (reporter: ProgressReporter | undefined, message: string) => void;
|
|
7
|
+
export declare const reportDetail: (reporter: ProgressReporter | undefined, message: string) => void;
|
|
8
|
+
//# sourceMappingURL=progress.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"progress.d.ts","sourceRoot":"","sources":["../../src/lib/progress.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,gBAAgB,GAAG,QAAQ,CAAC;IACtC,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC,CAAC;AAEH,eAAO,MAAM,WAAW,GACtB,UAAU,gBAAgB,GAAG,SAAS,EACtC,SAAS,MAAM,SAGhB,CAAC;AAEF,eAAO,MAAM,YAAY,GACvB,UAAU,gBAAgB,GAAG,SAAS,EACtC,SAAS,MAAM,SAGhB,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"progress.js","sourceRoot":"","sources":["../../src/lib/progress.ts"],"names":[],"mappings":"AAMA,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,QAAsC,EACtC,OAAe,EACf,EAAE;IACF,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;AAC3B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,CAC1B,QAAsC,EACtC,OAAe,EACf,EAAE;IACF,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;AAC5B,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add.d.ts","sourceRoot":"","sources":["../../src/services/add.ts"],"names":[],"mappings":"AACA,OAAO,EAKL,KAAK,mBAAmB,EACxB,KAAK,QAAQ,EACd,MAAM,qBAAqB,CAAC;AAe7B,MAAM,MAAM,cAAc,GAAG,QAAQ,CAAC;IACpC,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC7B,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC,CAAC;AAEH,MAAM,MAAM,aAAa,GAAG,QAAQ,CAAC;IACnC,cAAc,EAAE,OAAO,CAAC;IACxB,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,mBAAmB,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5B,IAAI,EAAE,QAAQ,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"add.d.ts","sourceRoot":"","sources":["../../src/services/add.ts"],"names":[],"mappings":"AACA,OAAO,EAKL,KAAK,mBAAmB,EACxB,KAAK,QAAQ,EACd,MAAM,qBAAqB,CAAC;AAe7B,MAAM,MAAM,cAAc,GAAG,QAAQ,CAAC;IACpC,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC7B,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC,CAAC;AAEH,MAAM,MAAM,aAAa,GAAG,QAAQ,CAAC;IACnC,cAAc,EAAE,OAAO,CAAC;IACxB,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,mBAAmB,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5B,IAAI,EAAE,QAAQ,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC,CAAC;AAgGH,eAAO,MAAM,eAAe,GAC1B,SAAS,cAAc,EACvB,aAAa,MAAM,CAAC,UAAU,EAC9B,KAAK,MAAM,KACV,OAAO,CAAC,aAAa,CAuIvB,CAAC"}
|
package/dist/services/add.js
CHANGED
|
@@ -9,6 +9,12 @@ import { ensureSyncRepository, resolveSyncPaths } from "./runtime.js";
|
|
|
9
9
|
const buildDefaultPlatformMode = (mode) => ({
|
|
10
10
|
default: mode,
|
|
11
11
|
});
|
|
12
|
+
const hasPlatformSpecificModeOverride = (configuredMode) => {
|
|
13
|
+
return (configuredMode.win !== undefined ||
|
|
14
|
+
configuredMode.mac !== undefined ||
|
|
15
|
+
configuredMode.linux !== undefined ||
|
|
16
|
+
configuredMode.wsl !== undefined);
|
|
17
|
+
};
|
|
12
18
|
const buildAddEntryCandidate = async (targetPath, syncDirectory, homeDirectory, input) => {
|
|
13
19
|
const targetStats = await getPathStats(targetPath);
|
|
14
20
|
if (targetStats === undefined) {
|
|
@@ -123,9 +129,8 @@ export const trackSyncTarget = async (request, environment, cwd) => {
|
|
|
123
129
|
const requestedConfiguredMode = buildDefaultPlatformMode(request.mode);
|
|
124
130
|
const modeChanged = existingEntry?.mode !== request.mode ||
|
|
125
131
|
existingEntry?.configuredMode.default !== requestedConfiguredMode.default ||
|
|
126
|
-
existingEntry
|
|
127
|
-
|
|
128
|
-
existingEntry?.configuredMode.linux !== undefined;
|
|
132
|
+
(existingEntry !== undefined &&
|
|
133
|
+
hasPlatformSpecificModeOverride(existingEntry.configuredMode));
|
|
129
134
|
const profilesChanged = effectiveProfiles !== undefined &&
|
|
130
135
|
(existingEntry?.profiles.length !== candidate.profiles.length ||
|
|
131
136
|
!candidate.profiles.every((m) => existingEntry?.profiles.includes(m)));
|
package/dist/services/add.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add.js","sourceRoot":"","sources":["../../src/services/add.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"add.js","sourceRoot":"","sources":["../../src/services/add.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ export declare const sortSyncConfigEntries: (entries: readonly SyncConfig["entri
|
|
|
6
6
|
win?: string | undefined;
|
|
7
7
|
mac?: string | undefined;
|
|
8
8
|
linux?: string | undefined;
|
|
9
|
+
wsl?: string | undefined;
|
|
9
10
|
};
|
|
10
11
|
profiles?: string[] | undefined;
|
|
11
12
|
mode?: {
|
|
@@ -13,6 +14,7 @@ export declare const sortSyncConfigEntries: (entries: readonly SyncConfig["entri
|
|
|
13
14
|
win?: "normal" | "secret" | "ignore" | undefined;
|
|
14
15
|
mac?: "normal" | "secret" | "ignore" | undefined;
|
|
15
16
|
linux?: "normal" | "secret" | "ignore" | undefined;
|
|
17
|
+
wsl?: "normal" | "secret" | "ignore" | undefined;
|
|
16
18
|
} | undefined;
|
|
17
19
|
}[];
|
|
18
20
|
export declare const createSyncConfigDocument: (config: ResolvedSyncConfig) => SyncConfig;
|
|
@@ -25,6 +27,7 @@ export declare const writeValidatedSyncConfig: (syncDirectory: string, config: S
|
|
|
25
27
|
win?: string | undefined;
|
|
26
28
|
mac?: string | undefined;
|
|
27
29
|
linux?: string | undefined;
|
|
30
|
+
wsl?: string | undefined;
|
|
28
31
|
};
|
|
29
32
|
profiles?: string[] | undefined;
|
|
30
33
|
mode?: {
|
|
@@ -32,6 +35,7 @@ export declare const writeValidatedSyncConfig: (syncDirectory: string, config: S
|
|
|
32
35
|
win?: "normal" | "secret" | "ignore" | undefined;
|
|
33
36
|
mac?: "normal" | "secret" | "ignore" | undefined;
|
|
34
37
|
linux?: "normal" | "secret" | "ignore" | undefined;
|
|
38
|
+
wsl?: "normal" | "secret" | "ignore" | undefined;
|
|
35
39
|
} | undefined;
|
|
36
40
|
}[];
|
|
37
41
|
age?: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-file.d.ts","sourceRoot":"","sources":["../../src/services/config-file.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,KAAK,kBAAkB,EAEvB,KAAK,UAAU,EAChB,MAAM,qBAAqB,CAAC;AAI7B,eAAO,MAAM,qBAAqB,GAChC,SAAS,SAAS,UAAU,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,EAAE
|
|
1
|
+
{"version":3,"file":"config-file.d.ts","sourceRoot":"","sources":["../../src/services/config-file.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,KAAK,kBAAkB,EAEvB,KAAK,UAAU,EAChB,MAAM,qBAAqB,CAAC;AAI7B,eAAO,MAAM,qBAAqB,GAChC,SAAS,SAAS,UAAU,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,EAAE;;;;;;;;;;;;;;;;;GAOlD,CAAC;AAEF,eAAO,MAAM,wBAAwB,GACnC,QAAQ,kBAAkB,KACzB,UAsBF,CAAC;AAEF,eAAO,MAAM,wBAAwB,GACnC,eAAe,MAAM,EACrB,QAAQ,UAAU,EAClB,aAAa,MAAM,CAAC,UAAU;;;;;;;;;;;;;;;;;;;;;;;;EAW/B,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { type ProgressReporter } from "#app/lib/progress.js";
|
|
1
2
|
export type DoctorCheckLevel = "fail" | "ok" | "warn";
|
|
2
3
|
export type DoctorCheck = Readonly<{
|
|
3
4
|
checkId: string;
|
|
@@ -11,5 +12,5 @@ export type SyncDoctorResult = Readonly<{
|
|
|
11
12
|
hasWarnings: boolean;
|
|
12
13
|
syncDirectory: string;
|
|
13
14
|
}>;
|
|
14
|
-
export declare const runSyncDoctor: (environment: NodeJS.ProcessEnv) => Promise<SyncDoctorResult>;
|
|
15
|
+
export declare const runSyncDoctor: (environment: NodeJS.ProcessEnv, reporter?: ProgressReporter) => Promise<SyncDoctorResult>;
|
|
15
16
|
//# sourceMappingURL=doctor.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../src/services/doctor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../src/services/doctor.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,gBAAgB,EAGtB,MAAM,sBAAsB,CAAC;AAU9B,MAAM,MAAM,gBAAgB,GAAG,MAAM,GAAG,IAAI,GAAG,MAAM,CAAC;AAEtD,MAAM,MAAM,WAAW,GAAG,QAAQ,CAAC;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,gBAAgB,CAAC;CACzB,CAAC,CAAC;AAEH,MAAM,MAAM,gBAAgB,GAAG,QAAQ,CAAC;IACtC,MAAM,EAAE,SAAS,WAAW,EAAE,CAAC;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,OAAO,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC,CAAC;AAoBH,eAAO,MAAM,aAAa,GACxB,aAAa,MAAM,CAAC,UAAU,EAC9B,WAAW,gBAAgB,KAC1B,OAAO,CAAC,gBAAgB,CA+H1B,CAAC"}
|
package/dist/services/doctor.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { resolveSyncConfigFilePath } from "#app/config/sync.js";
|
|
2
|
+
import { reportDetail, reportPhase, } from "#app/lib/progress.js";
|
|
2
3
|
import { pathExists } from "./filesystem.js";
|
|
3
4
|
import { ensureRepository } from "./git.js";
|
|
4
5
|
import { loadSyncConfig, resolveSyncPaths, } from "./runtime.js";
|
|
@@ -17,11 +18,13 @@ const fail = (checkId, detail) => ({
|
|
|
17
18
|
detail,
|
|
18
19
|
level: "fail",
|
|
19
20
|
});
|
|
20
|
-
export const runSyncDoctor = async (environment) => {
|
|
21
|
+
export const runSyncDoctor = async (environment, reporter) => {
|
|
22
|
+
reportPhase(reporter, "Running doctor checks...");
|
|
21
23
|
const { syncDirectory } = resolveSyncPaths(environment);
|
|
22
24
|
const configPath = resolveSyncConfigFilePath(syncDirectory);
|
|
23
25
|
const checks = [];
|
|
24
26
|
try {
|
|
27
|
+
reportPhase(reporter, "Checking sync repository...");
|
|
25
28
|
await ensureRepository(syncDirectory);
|
|
26
29
|
checks.push(ok("git", "Sync directory is a git repository."));
|
|
27
30
|
}
|
|
@@ -37,6 +40,7 @@ export const runSyncDoctor = async (environment) => {
|
|
|
37
40
|
}
|
|
38
41
|
let config;
|
|
39
42
|
try {
|
|
43
|
+
reportPhase(reporter, "Loading sync configuration...");
|
|
40
44
|
const { effectiveConfig, fullConfig } = await loadSyncConfig(syncDirectory, environment);
|
|
41
45
|
config = effectiveConfig;
|
|
42
46
|
checks.push(ok("config", `Loaded config with ${fullConfig.entries.length} entries and ${effectiveConfig.age.recipients.length} recipients.`));
|
|
@@ -56,6 +60,7 @@ export const runSyncDoctor = async (environment) => {
|
|
|
56
60
|
syncDirectory,
|
|
57
61
|
};
|
|
58
62
|
}
|
|
63
|
+
reportPhase(reporter, "Checking age identity...");
|
|
59
64
|
checks.push((await pathExists(config.age.identityFile))
|
|
60
65
|
? ok("age", `Age identity file exists at ${config.age.identityFile}.`)
|
|
61
66
|
: fail("age", `Age identity file is missing: ${config.age.identityFile}`));
|
|
@@ -66,7 +71,16 @@ export const runSyncDoctor = async (environment) => {
|
|
|
66
71
|
return !environment || entry.localPath.length > 0;
|
|
67
72
|
});
|
|
68
73
|
let missingCount = 0;
|
|
74
|
+
let checkedLocalPathCount = 0;
|
|
75
|
+
reportPhase(reporter, "Checking tracked local paths...");
|
|
69
76
|
for (const entry of missingEntries) {
|
|
77
|
+
checkedLocalPathCount += 1;
|
|
78
|
+
if (reporter?.verbose) {
|
|
79
|
+
reportDetail(reporter, `checked tracked local path ${entry.localPath}`);
|
|
80
|
+
}
|
|
81
|
+
else if (checkedLocalPathCount % 100 === 0) {
|
|
82
|
+
reportPhase(reporter, `Checked ${checkedLocalPathCount} tracked local paths...`);
|
|
83
|
+
}
|
|
70
84
|
if (!(await pathExists(entry.localPath))) {
|
|
71
85
|
missingCount += 1;
|
|
72
86
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../src/services/doctor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../src/services/doctor.ts"],"names":[],"mappings":"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"}
|
package/dist/services/git.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
|
+
import type { ProgressReporter } from "#app/lib/progress.js";
|
|
1
2
|
export declare const ensureRepository: (directory: string) => Promise<void>;
|
|
2
|
-
export declare const initializeRepository: (directory: string, source?: string) => Promise<{
|
|
3
|
+
export declare const initializeRepository: (directory: string, source?: string, reporter?: ProgressReporter) => Promise<{
|
|
3
4
|
action: "initialized";
|
|
4
5
|
source?: undefined;
|
|
5
6
|
} | {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git.d.ts","sourceRoot":"","sources":["../../src/services/git.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"git.d.ts","sourceRoot":"","sources":["../../src/services/git.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAoJ7D,eAAO,MAAM,gBAAgB,GAAU,WAAW,MAAM,kBAEvD,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAC/B,WAAW,MAAM,EACjB,SAAS,MAAM,EACf,WAAW,gBAAgB;;;;;;EAoB5B,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAAU,eAAe,MAAM,kBAU9D,CAAC"}
|
package/dist/services/git.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { execFile } from "node:child_process";
|
|
1
|
+
import { execFile, spawn } from "node:child_process";
|
|
2
2
|
import { promisify } from "node:util";
|
|
3
3
|
import { wrapUnknownError } from "./error.js";
|
|
4
4
|
const execFileAsync = promisify(execFile);
|
|
@@ -26,17 +26,94 @@ const runGitCommand = async (args, options) => {
|
|
|
26
26
|
throw new Error(error instanceof Error ? error.message : "git failed.");
|
|
27
27
|
}
|
|
28
28
|
};
|
|
29
|
+
const forwardGitProgressChunk = (reporter, state, chunk) => {
|
|
30
|
+
if (!reporter?.verbose) {
|
|
31
|
+
return;
|
|
32
|
+
}
|
|
33
|
+
state.remainder += chunk.replaceAll("\r", "\n");
|
|
34
|
+
const lines = state.remainder.split("\n");
|
|
35
|
+
state.remainder = lines.pop() ?? "";
|
|
36
|
+
for (const line of lines) {
|
|
37
|
+
const trimmed = line.trim();
|
|
38
|
+
if (trimmed.length > 0) {
|
|
39
|
+
reporter.detail(`git: ${trimmed}`);
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
};
|
|
43
|
+
const flushGitProgressChunk = (reporter, state) => {
|
|
44
|
+
if (!reporter?.verbose) {
|
|
45
|
+
return;
|
|
46
|
+
}
|
|
47
|
+
const trimmed = state.remainder.trim();
|
|
48
|
+
if (trimmed.length > 0) {
|
|
49
|
+
reporter.detail(`git: ${trimmed}`);
|
|
50
|
+
}
|
|
51
|
+
};
|
|
52
|
+
const runStreamingGitCommand = async (args, options) => {
|
|
53
|
+
return await new Promise((resolve, reject) => {
|
|
54
|
+
const child = spawn("git", [...args], {
|
|
55
|
+
cwd: options?.cwd,
|
|
56
|
+
stdio: ["ignore", "pipe", "pipe"],
|
|
57
|
+
});
|
|
58
|
+
let settled = false;
|
|
59
|
+
let stdout = "";
|
|
60
|
+
let stderr = "";
|
|
61
|
+
const stdoutState = { remainder: "" };
|
|
62
|
+
const stderrState = { remainder: "" };
|
|
63
|
+
const finish = (handler) => {
|
|
64
|
+
if (settled) {
|
|
65
|
+
return;
|
|
66
|
+
}
|
|
67
|
+
settled = true;
|
|
68
|
+
handler();
|
|
69
|
+
};
|
|
70
|
+
child.stdout?.setEncoding("utf8");
|
|
71
|
+
child.stderr?.setEncoding("utf8");
|
|
72
|
+
child.stdout?.on("data", (chunk) => {
|
|
73
|
+
stdout += chunk;
|
|
74
|
+
forwardGitProgressChunk(options?.reporter, stdoutState, chunk);
|
|
75
|
+
});
|
|
76
|
+
child.stderr?.on("data", (chunk) => {
|
|
77
|
+
stderr += chunk;
|
|
78
|
+
forwardGitProgressChunk(options?.reporter, stderrState, chunk);
|
|
79
|
+
});
|
|
80
|
+
child.on("error", (error) => {
|
|
81
|
+
finish(() => {
|
|
82
|
+
reject(new Error(error instanceof Error ? error.message : "git failed."));
|
|
83
|
+
});
|
|
84
|
+
});
|
|
85
|
+
child.on("close", (code) => {
|
|
86
|
+
flushGitProgressChunk(options?.reporter, stdoutState);
|
|
87
|
+
flushGitProgressChunk(options?.reporter, stderrState);
|
|
88
|
+
if (code === 0) {
|
|
89
|
+
finish(() => {
|
|
90
|
+
resolve({ stderr, stdout });
|
|
91
|
+
});
|
|
92
|
+
return;
|
|
93
|
+
}
|
|
94
|
+
finish(() => {
|
|
95
|
+
reject(new Error(stderr.trim() ||
|
|
96
|
+
stdout.trim() ||
|
|
97
|
+
`git exited with code ${code ?? "unknown"}.`));
|
|
98
|
+
});
|
|
99
|
+
});
|
|
100
|
+
});
|
|
101
|
+
};
|
|
29
102
|
export const ensureRepository = async (directory) => {
|
|
30
103
|
await runGitCommand(["-C", directory, "rev-parse", "--is-inside-work-tree"]);
|
|
31
104
|
};
|
|
32
|
-
export const initializeRepository = async (directory, source) => {
|
|
105
|
+
export const initializeRepository = async (directory, source, reporter) => {
|
|
33
106
|
if (source === undefined) {
|
|
34
|
-
await
|
|
107
|
+
await runStreamingGitCommand(["init", "-b", "main", directory], {
|
|
108
|
+
reporter,
|
|
109
|
+
});
|
|
35
110
|
return {
|
|
36
111
|
action: "initialized",
|
|
37
112
|
};
|
|
38
113
|
}
|
|
39
|
-
await
|
|
114
|
+
await runStreamingGitCommand(["clone", source, directory], {
|
|
115
|
+
reporter,
|
|
116
|
+
});
|
|
40
117
|
return {
|
|
41
118
|
action: "cloned",
|
|
42
119
|
source,
|
package/dist/services/git.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git.js","sourceRoot":"","sources":["../../src/services/git.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"git.js","sourceRoot":"","sources":["../../src/services/git.ts"],"names":[],"mappings":"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"}
|
package/dist/services/init.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { ProgressReporter } from "#app/lib/progress.js";
|
|
1
2
|
export type SyncInitRequest = Readonly<{
|
|
2
3
|
ageIdentity?: string;
|
|
3
4
|
generateAgeIdentity?: boolean;
|
|
@@ -17,5 +18,5 @@ export type SyncInitResult = Readonly<{
|
|
|
17
18
|
syncDirectory: string;
|
|
18
19
|
}>;
|
|
19
20
|
export declare const defaultSyncIdentityFile = "$XDG_CONFIG_HOME/devsync/age/keys.txt";
|
|
20
|
-
export declare const initializeSync: (request: SyncInitRequest, environment: NodeJS.ProcessEnv) => Promise<SyncInitResult>;
|
|
21
|
+
export declare const initializeSync: (request: SyncInitRequest, environment: NodeJS.ProcessEnv, reporter?: ProgressReporter) => Promise<SyncInitResult>;
|
|
21
22
|
//# sourceMappingURL=init.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/services/init.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/services/init.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAiB7D,MAAM,MAAM,eAAe,GAAG,QAAQ,CAAC;IACrC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,SAAS,MAAM,EAAE,CAAC;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC,CAAC;AAEH,MAAM,MAAM,cAAc,GAAG,QAAQ,CAAC;IACpC,kBAAkB,EAAE,OAAO,CAAC;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,QAAQ,GAAG,UAAU,GAAG,aAAa,CAAC;IACjD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC,CAAC;AAEH,eAAO,MAAM,uBAAuB,0CAA0C,CAAC;AAoL/E,eAAO,MAAM,cAAc,GACzB,SAAS,eAAe,EACxB,aAAa,MAAM,CAAC,UAAU,EAC9B,WAAW,gBAAgB,KAC1B,OAAO,CAAC,cAAc,CA6JxB,CAAC"}
|
package/dist/services/init.js
CHANGED
|
@@ -3,6 +3,7 @@ import { dirname } from "node:path";
|
|
|
3
3
|
import { formatGlobalDevsyncConfig, readGlobalDevsyncConfig, resolveConfiguredIdentityFile, } from "#app/config/global-config.js";
|
|
4
4
|
import { createInitialSyncConfig, formatSyncConfig, parseSyncConfig, readSyncConfig, resolveSyncArtifactsDirectoryPath, } from "#app/config/sync.js";
|
|
5
5
|
import { resolveConfiguredAbsolutePath } from "#app/config/xdg.js";
|
|
6
|
+
import { reportPhase } from "#app/lib/progress.js";
|
|
6
7
|
import { createAgeIdentityFile, readAgeRecipientsFromIdentityFile, writeAgeIdentityFile, } from "./crypto.js";
|
|
7
8
|
import { DevsyncError, wrapUnknownError } from "./error.js";
|
|
8
9
|
import { pathExists, writeTextFileAtomically } from "./filesystem.js";
|
|
@@ -16,11 +17,12 @@ const normalizeRecipients = (recipients) => {
|
|
|
16
17
|
return left.localeCompare(right);
|
|
17
18
|
});
|
|
18
19
|
};
|
|
19
|
-
const resolveInitAgeBootstrap = async (request, environment) => {
|
|
20
|
+
const resolveInitAgeBootstrap = async (request, environment, reporter) => {
|
|
20
21
|
const configuredIdentityFile = request.identityFile?.trim() || defaultSyncIdentityFile;
|
|
21
22
|
const identityFile = resolveConfiguredAbsolutePath(configuredIdentityFile, environment);
|
|
22
23
|
const explicitRecipients = normalizeRecipients(request.recipients);
|
|
23
24
|
if (request.ageIdentity !== undefined) {
|
|
25
|
+
reportPhase(reporter, "Writing age identity file...");
|
|
24
26
|
const { recipient } = await writeAgeIdentityFile(identityFile, request.ageIdentity);
|
|
25
27
|
return {
|
|
26
28
|
configuredIdentityFile,
|
|
@@ -30,12 +32,14 @@ const resolveInitAgeBootstrap = async (request, environment) => {
|
|
|
30
32
|
}
|
|
31
33
|
if (explicitRecipients.length === 0) {
|
|
32
34
|
if (await pathExists(identityFile)) {
|
|
35
|
+
reportPhase(reporter, "Loading age recipients from the existing identity...");
|
|
33
36
|
return {
|
|
34
37
|
configuredIdentityFile,
|
|
35
38
|
generatedIdentity: false,
|
|
36
39
|
recipients: normalizeRecipients(await readAgeRecipientsFromIdentityFile(identityFile)),
|
|
37
40
|
};
|
|
38
41
|
}
|
|
42
|
+
reportPhase(reporter, "Generating a new age identity...");
|
|
39
43
|
const { recipient } = await createAgeIdentityFile(identityFile);
|
|
40
44
|
return {
|
|
41
45
|
configuredIdentityFile,
|
|
@@ -44,6 +48,7 @@ const resolveInitAgeBootstrap = async (request, environment) => {
|
|
|
44
48
|
};
|
|
45
49
|
}
|
|
46
50
|
if (request.generateAgeIdentity === true) {
|
|
51
|
+
reportPhase(reporter, "Generating a new age identity...");
|
|
47
52
|
const { recipient } = await createAgeIdentityFile(identityFile);
|
|
48
53
|
return {
|
|
49
54
|
configuredIdentityFile,
|
|
@@ -52,12 +57,14 @@ const resolveInitAgeBootstrap = async (request, environment) => {
|
|
|
52
57
|
};
|
|
53
58
|
}
|
|
54
59
|
if (await pathExists(identityFile)) {
|
|
60
|
+
reportPhase(reporter, "Using the existing age identity file...");
|
|
55
61
|
return {
|
|
56
62
|
configuredIdentityFile,
|
|
57
63
|
generatedIdentity: false,
|
|
58
64
|
recipients: explicitRecipients,
|
|
59
65
|
};
|
|
60
66
|
}
|
|
67
|
+
reportPhase(reporter, "Generating a new age identity...");
|
|
61
68
|
const { recipient } = await createAgeIdentityFile(identityFile);
|
|
62
69
|
return {
|
|
63
70
|
configuredIdentityFile,
|
|
@@ -115,11 +122,14 @@ const buildAlreadyInitializedResult = (config, environment, base) => {
|
|
|
115
122
|
syncDirectory: base.syncDirectory,
|
|
116
123
|
};
|
|
117
124
|
};
|
|
118
|
-
export const initializeSync = async (request, environment) => {
|
|
125
|
+
export const initializeSync = async (request, environment, reporter) => {
|
|
126
|
+
reportPhase(reporter, "Initializing sync directory...");
|
|
119
127
|
const { syncDirectory, configPath, globalConfigPath } = resolveSyncPaths(environment);
|
|
120
128
|
const configExists = await pathExists(configPath);
|
|
121
129
|
if (configExists) {
|
|
130
|
+
reportPhase(reporter, "Checking the existing sync repository...");
|
|
122
131
|
await ensureSyncRepository(syncDirectory);
|
|
132
|
+
reportPhase(reporter, "Loading the existing sync manifest...");
|
|
123
133
|
const config = await readSyncConfig(syncDirectory, environment);
|
|
124
134
|
assertInitRequestMatchesConfig(config.age, request, environment);
|
|
125
135
|
return buildAlreadyInitializedResult(config, environment, {
|
|
@@ -131,10 +141,13 @@ export const initializeSync = async (request, environment) => {
|
|
|
131
141
|
await mkdir(dirname(syncDirectory), {
|
|
132
142
|
recursive: true,
|
|
133
143
|
});
|
|
144
|
+
reportPhase(reporter, "Preparing the sync directory...");
|
|
134
145
|
let gitAction = "existing";
|
|
135
146
|
let gitSource;
|
|
136
147
|
try {
|
|
148
|
+
reportPhase(reporter, "Checking for an existing git repository...");
|
|
137
149
|
await ensureRepository(syncDirectory);
|
|
150
|
+
reportPhase(reporter, "Using the existing git repository...");
|
|
138
151
|
}
|
|
139
152
|
catch {
|
|
140
153
|
const syncDirectoryExists = await pathExists(syncDirectory);
|
|
@@ -151,7 +164,10 @@ export const initializeSync = async (request, environment) => {
|
|
|
151
164
|
const gitSourceInput = request.repository?.trim() || undefined;
|
|
152
165
|
let gitResult;
|
|
153
166
|
try {
|
|
154
|
-
|
|
167
|
+
reportPhase(reporter, gitSourceInput === undefined
|
|
168
|
+
? "Initializing a new git repository..."
|
|
169
|
+
: `Cloning the sync repository from ${gitSourceInput}...`);
|
|
170
|
+
gitResult = await initializeRepository(syncDirectory, gitSourceInput, reporter);
|
|
155
171
|
}
|
|
156
172
|
catch (error) {
|
|
157
173
|
throw wrapUnknownError(gitSourceInput === undefined
|
|
@@ -174,10 +190,12 @@ export const initializeSync = async (request, environment) => {
|
|
|
174
190
|
gitAction = gitResult.action;
|
|
175
191
|
gitSource = gitResult.source;
|
|
176
192
|
}
|
|
193
|
+
reportPhase(reporter, "Preparing the sync artifact directory...");
|
|
177
194
|
await mkdir(resolveSyncArtifactsDirectoryPath(syncDirectory), {
|
|
178
195
|
recursive: true,
|
|
179
196
|
});
|
|
180
197
|
if (await pathExists(configPath)) {
|
|
198
|
+
reportPhase(reporter, "Loading the existing sync manifest...");
|
|
181
199
|
const config = await readSyncConfig(syncDirectory, environment);
|
|
182
200
|
assertInitRequestMatchesConfig(config.age, request, environment);
|
|
183
201
|
return buildAlreadyInitializedResult(config, environment, {
|
|
@@ -187,8 +205,10 @@ export const initializeSync = async (request, environment) => {
|
|
|
187
205
|
syncDirectory,
|
|
188
206
|
});
|
|
189
207
|
}
|
|
190
|
-
|
|
208
|
+
reportPhase(reporter, "Preparing sync encryption settings...");
|
|
209
|
+
const ageBootstrap = await resolveInitAgeBootstrap(request, environment, reporter);
|
|
191
210
|
// Write global settings.json (without age)
|
|
211
|
+
reportPhase(reporter, "Writing global devsync settings...");
|
|
192
212
|
const existingGlobalConfig = await readGlobalDevsyncConfig(environment);
|
|
193
213
|
const globalConfigToWrite = {
|
|
194
214
|
activeProfile: existingGlobalConfig?.activeProfile ?? "default",
|
|
@@ -201,6 +221,7 @@ export const initializeSync = async (request, environment) => {
|
|
|
201
221
|
identityFile: ageBootstrap.configuredIdentityFile,
|
|
202
222
|
recipients: [...new Set(ageBootstrap.recipients.map((r) => r.trim()))],
|
|
203
223
|
});
|
|
224
|
+
reportPhase(reporter, "Writing sync manifest...");
|
|
204
225
|
parseSyncConfig(initialConfig, environment);
|
|
205
226
|
await writeFile(configPath, formatSyncConfig(initialConfig), "utf8");
|
|
206
227
|
return {
|