@tinyrack/dotweave 0.42.11 → 0.42.19
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 +6 -2
- package/dist/application.d.ts +0 -3
- package/dist/application.d.ts.map +1 -1
- package/dist/application.js +23 -22
- package/dist/application.js.map +1 -1
- package/dist/cli/autocomplete.d.ts +5 -4
- package/dist/cli/autocomplete.d.ts.map +1 -1
- package/dist/cli/autocomplete.js +33 -28
- package/dist/cli/autocomplete.js.map +1 -1
- package/dist/cli/cd.d.ts +2 -2
- package/dist/cli/cd.d.ts.map +1 -1
- package/dist/cli/cd.js +1 -4
- package/dist/cli/cd.js.map +1 -1
- package/dist/cli/doctor.d.ts +2 -2
- package/dist/cli/doctor.d.ts.map +1 -1
- package/dist/cli/doctor.js +19 -28
- package/dist/cli/doctor.js.map +1 -1
- package/dist/cli/index.d.ts +1 -3
- package/dist/cli/index.d.ts.map +1 -1
- package/dist/cli/index.js +5 -5
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/init.d.ts +2 -2
- package/dist/cli/init.d.ts.map +1 -1
- package/dist/cli/init.js +9 -15
- package/dist/cli/init.js.map +1 -1
- package/dist/cli/profile/index.d.ts +1 -1
- package/dist/cli/profile/index.d.ts.map +1 -1
- package/dist/cli/profile/list.d.ts +2 -2
- package/dist/cli/profile/list.d.ts.map +1 -1
- package/dist/cli/profile/list.js +13 -23
- package/dist/cli/profile/list.js.map +1 -1
- package/dist/cli/profile/use.d.ts +2 -2
- package/dist/cli/profile/use.d.ts.map +1 -1
- package/dist/cli/profile/use.js +4 -13
- package/dist/cli/profile/use.js.map +1 -1
- package/dist/cli/pull.d.ts +2 -2
- package/dist/cli/pull.d.ts.map +1 -1
- package/dist/cli/pull.js +22 -41
- package/dist/cli/pull.js.map +1 -1
- package/dist/cli/push.d.ts +2 -2
- package/dist/cli/push.d.ts.map +1 -1
- package/dist/cli/push.js +17 -23
- package/dist/cli/push.js.map +1 -1
- package/dist/cli/root-commands.d.ts +9 -10
- package/dist/cli/root-commands.d.ts.map +1 -1
- package/dist/cli/root-commands.js +0 -4
- package/dist/cli/root-commands.js.map +1 -1
- package/dist/cli/shared-flags.d.ts +9 -0
- package/dist/cli/shared-flags.d.ts.map +1 -0
- package/dist/cli/shared-flags.js +8 -0
- package/dist/cli/shared-flags.js.map +1 -0
- package/dist/cli/status.d.ts +2 -2
- package/dist/cli/status.d.ts.map +1 -1
- package/dist/cli/status.js +26 -55
- package/dist/cli/status.js.map +1 -1
- package/dist/cli/track.d.ts +2 -2
- package/dist/cli/track.d.ts.map +1 -1
- package/dist/cli/track.js +14 -33
- package/dist/cli/track.js.map +1 -1
- package/dist/cli/untrack.d.ts +2 -2
- package/dist/cli/untrack.d.ts.map +1 -1
- package/dist/cli/untrack.js +5 -14
- package/dist/cli/untrack.js.map +1 -1
- package/dist/config/constants.d.ts +1 -1
- package/dist/config/constants.d.ts.map +1 -1
- package/dist/config/constants.js +1 -1
- package/dist/config/constants.js.map +1 -1
- package/dist/config/global-config.d.ts +3 -3
- package/dist/config/global-config.d.ts.map +1 -1
- package/dist/config/global-config.js +7 -8
- package/dist/config/global-config.js.map +1 -1
- package/dist/config/identity-file.d.ts +0 -7
- package/dist/config/identity-file.d.ts.map +1 -1
- package/dist/config/identity-file.js +2 -44
- package/dist/config/identity-file.js.map +1 -1
- package/dist/config/runtime-env.d.ts.map +1 -1
- package/dist/config/runtime-env.js +2 -7
- package/dist/config/runtime-env.js.map +1 -1
- package/dist/config/{sync-entry.d.ts → sync-queries.d.ts} +5 -3
- package/dist/config/sync-queries.d.ts.map +1 -0
- package/dist/config/{sync-entry.js → sync-queries.js} +15 -6
- package/dist/config/sync-queries.js.map +1 -0
- package/dist/config/sync-schema.d.ts +9 -7
- package/dist/config/sync-schema.d.ts.map +1 -1
- package/dist/config/sync-schema.js +53 -18
- package/dist/config/sync-schema.js.map +1 -1
- package/dist/config/xdg.d.ts.map +1 -1
- package/dist/config/xdg.js +15 -34
- package/dist/config/xdg.js.map +1 -1
- package/dist/lib/error.js +1 -1
- package/dist/lib/error.js.map +1 -1
- package/dist/lib/git.d.ts +3 -4
- package/dist/lib/git.d.ts.map +1 -1
- package/dist/lib/git.js +7 -48
- package/dist/lib/git.js.map +1 -1
- package/dist/lib/jsonc.d.ts +1 -1
- package/dist/lib/jsonc.d.ts.map +1 -1
- package/dist/lib/jsonc.js +1 -1
- package/dist/lib/jsonc.js.map +1 -1
- package/dist/lib/path.d.ts +3 -16
- package/dist/lib/path.d.ts.map +1 -1
- package/dist/lib/path.js +30 -19
- package/dist/lib/path.js.map +1 -1
- package/dist/lib/string.d.ts +1 -4
- package/dist/lib/string.d.ts.map +1 -1
- package/dist/lib/string.js +6 -4
- package/dist/lib/string.js.map +1 -1
- package/dist/lib/version.d.ts.map +1 -1
- package/dist/lib/version.js +2 -2
- package/dist/lib/version.js.map +1 -1
- package/dist/services/autocomplete.js +13 -13
- package/dist/services/autocomplete.js.map +1 -1
- package/dist/services/config-file.d.ts +4 -4
- package/dist/services/config-file.d.ts.map +1 -1
- package/dist/services/config-file.js +7 -8
- package/dist/services/config-file.js.map +1 -1
- package/dist/services/doctor.d.ts +1 -4
- package/dist/services/doctor.d.ts.map +1 -1
- package/dist/services/doctor.js +10 -37
- package/dist/services/doctor.js.map +1 -1
- package/dist/services/init.d.ts +1 -5
- package/dist/services/init.d.ts.map +1 -1
- package/dist/services/init.js +25 -59
- package/dist/services/init.js.map +1 -1
- package/dist/services/local-snapshot.d.ts +2 -7
- package/dist/services/local-snapshot.d.ts.map +1 -1
- package/dist/services/local-snapshot.js +12 -35
- package/dist/services/local-snapshot.js.map +1 -1
- package/dist/services/profile.d.ts +0 -4
- package/dist/services/profile.d.ts.map +1 -1
- package/dist/services/profile.js +13 -22
- package/dist/services/profile.js.map +1 -1
- package/dist/services/pull-apply.d.ts +30 -0
- package/dist/services/pull-apply.d.ts.map +1 -0
- package/dist/services/{local-materialization.js → pull-apply.js} +150 -210
- package/dist/services/pull-apply.js.map +1 -0
- package/dist/services/pull.d.ts +7 -10
- package/dist/services/pull.d.ts.map +1 -1
- package/dist/services/pull.js +19 -30
- package/dist/services/pull.js.map +1 -1
- package/dist/services/push.d.ts +4 -7
- package/dist/services/push.d.ts.map +1 -1
- package/dist/services/push.js +15 -38
- package/dist/services/push.js.map +1 -1
- package/dist/services/repo-artifacts.d.ts +5 -6
- package/dist/services/repo-artifacts.d.ts.map +1 -1
- package/dist/services/repo-artifacts.js +21 -60
- package/dist/services/repo-artifacts.js.map +1 -1
- package/dist/services/repo-snapshot.d.ts +2 -3
- package/dist/services/repo-snapshot.d.ts.map +1 -1
- package/dist/services/repo-snapshot.js +14 -26
- package/dist/services/repo-snapshot.js.map +1 -1
- package/dist/services/status.d.ts +1 -5
- package/dist/services/status.d.ts.map +1 -1
- package/dist/services/status.js +7 -17
- package/dist/services/status.js.map +1 -1
- package/dist/services/{runtime.d.ts → sync-context.d.ts} +9 -3
- package/dist/services/sync-context.d.ts.map +1 -0
- package/dist/services/{runtime.js → sync-context.js} +14 -7
- package/dist/services/sync-context.js.map +1 -0
- package/dist/services/{set.d.ts → sync-mode.d.ts} +7 -9
- package/dist/services/sync-mode.d.ts.map +1 -0
- package/dist/services/{set.js → sync-mode.js} +9 -23
- package/dist/services/sync-mode.js.map +1 -0
- package/dist/services/{paths.d.ts → sync-paths.d.ts} +2 -2
- package/dist/services/sync-paths.d.ts.map +1 -0
- package/dist/services/{paths.js → sync-paths.js} +4 -6
- package/dist/services/sync-paths.js.map +1 -0
- package/dist/services/terminal/logger.d.ts +30 -5
- package/dist/services/terminal/logger.d.ts.map +1 -1
- package/dist/services/terminal/logger.js +61 -14
- package/dist/services/terminal/logger.js.map +1 -1
- package/dist/services/terminal/path-completion.d.ts +2 -2
- package/dist/services/terminal/path-completion.d.ts.map +1 -1
- package/dist/services/terminal/path-completion.js +16 -13
- package/dist/services/terminal/path-completion.js.map +1 -1
- package/dist/services/terminal/shell.d.ts +1 -12
- package/dist/services/terminal/shell.d.ts.map +1 -1
- package/dist/services/terminal/shell.js +7 -160
- package/dist/services/terminal/shell.js.map +1 -1
- package/dist/services/terminal/spinner.d.ts +10 -0
- package/dist/services/terminal/spinner.d.ts.map +1 -0
- package/dist/services/terminal/spinner.js +61 -0
- package/dist/services/terminal/spinner.js.map +1 -0
- package/dist/services/terminal/theme.d.ts +31 -0
- package/dist/services/terminal/theme.d.ts.map +1 -0
- package/dist/services/terminal/theme.js +32 -0
- package/dist/services/terminal/theme.js.map +1 -0
- package/dist/services/track.d.ts +1 -3
- package/dist/services/track.d.ts.map +1 -1
- package/dist/services/track.js +7 -23
- package/dist/services/track.js.map +1 -1
- package/dist/services/untrack.d.ts +0 -2
- package/dist/services/untrack.d.ts.map +1 -1
- package/dist/services/untrack.js +4 -11
- package/dist/services/untrack.js.map +1 -1
- package/package.json +1 -2
- package/dist/config/sync-entry.d.ts.map +0 -1
- package/dist/config/sync-entry.js.map +0 -1
- package/dist/config/sync.d.ts +0 -8
- package/dist/config/sync.d.ts.map +0 -1
- package/dist/config/sync.js +0 -53
- package/dist/config/sync.js.map +0 -1
- package/dist/services/local-materialization.d.ts +0 -30
- package/dist/services/local-materialization.d.ts.map +0 -1
- package/dist/services/local-materialization.js.map +0 -1
- package/dist/services/paths.d.ts.map +0 -1
- package/dist/services/paths.js.map +0 -1
- package/dist/services/runtime.d.ts.map +0 -1
- package/dist/services/runtime.js.map +0 -1
- package/dist/services/set.d.ts.map +0 -1
- package/dist/services/set.js.map +0 -1
- package/dist/services/terminal/cli-runtime.d.ts +0 -18
- package/dist/services/terminal/cli-runtime.d.ts.map +0 -1
- package/dist/services/terminal/cli-runtime.js +0 -19
- package/dist/services/terminal/cli-runtime.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repo-snapshot.d.ts","sourceRoot":"","sources":["../../src/services/repo-snapshot.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"repo-snapshot.d.ts","sourceRoot":"","sources":["../../src/services/repo-snapshot.ts"],"names":[],"mappings":"AAWA,OAAO,EAAmB,KAAK,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAMzE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAE7D,KAAK,wBAAwB,GAAG,mBAAmB,CAAC;AAoNpD,eAAO,MAAM,uBAAuB,GAClC,eAAe,MAAM,EACrB,QAAQ,wBAAwB,uCAwDjC,CAAC"}
|
|
@@ -1,22 +1,12 @@
|
|
|
1
1
|
import { lstat, readFile, readlink } from "node:fs/promises";
|
|
2
2
|
import { join } from "node:path";
|
|
3
|
-
import {
|
|
3
|
+
import { findOwningSyncEntry, requireManagedSyncMode, resolveSyncRule, } from "#app/config/sync-queries.ts";
|
|
4
4
|
import { decryptSecretFile } from "#app/lib/crypto.ts";
|
|
5
5
|
import { DotweaveError, wrapUnknownError } from "#app/lib/error.ts";
|
|
6
6
|
import { isExecutableMode } from "#app/lib/file-mode.ts";
|
|
7
7
|
import { getPathStats, listDirectoryEntries } from "#app/lib/filesystem.ts";
|
|
8
8
|
import { addSnapshotNode } from "./local-snapshot.js";
|
|
9
9
|
import { assertStorageSafeRepoPath, collectArtifactProfiles, parseArtifactRelativePath, } from "./repo-artifacts.js";
|
|
10
|
-
const reportRepositoryScanProgress = (reporter, state, storagePath, kind) => {
|
|
11
|
-
state.scannedStorageEntryCount += 1;
|
|
12
|
-
if ((reporter?.level ?? 0) >= 4) {
|
|
13
|
-
reporter?.verbose(`scanned repository ${kind} ${storagePath}`);
|
|
14
|
-
return;
|
|
15
|
-
}
|
|
16
|
-
if (state.scannedStorageEntryCount % 100 === 0) {
|
|
17
|
-
reporter?.start(`Scanned ${state.scannedStorageEntryCount} repository entries...`);
|
|
18
|
-
}
|
|
19
|
-
};
|
|
20
10
|
const isActiveStorageProfile = (storageProfile, config, repoPath) => {
|
|
21
11
|
const rule = resolveSyncRule(config, repoPath, config.activeProfile);
|
|
22
12
|
if (rule === undefined || rule.mode === "ignore") {
|
|
@@ -24,6 +14,10 @@ const isActiveStorageProfile = (storageProfile, config, repoPath) => {
|
|
|
24
14
|
}
|
|
25
15
|
return rule.profile === storageProfile;
|
|
26
16
|
};
|
|
17
|
+
const resolveSnapshotExecutable = (config, repoPath, artifactMode) => {
|
|
18
|
+
const entry = findOwningSyncEntry(config, repoPath);
|
|
19
|
+
return isExecutableMode(entry?.permission ?? artifactMode);
|
|
20
|
+
};
|
|
27
21
|
const readArtifactLeaf = async (absolutePath, storagePath, config, snapshot) => {
|
|
28
22
|
const artifact = parseArtifactRelativePath(storagePath);
|
|
29
23
|
if (!isActiveStorageProfile(artifact.profile, config, artifact.repoPath)) {
|
|
@@ -83,13 +77,13 @@ const readArtifactLeaf = async (absolutePath, storagePath, config, snapshot) =>
|
|
|
83
77
|
}
|
|
84
78
|
addSnapshotNode(snapshot, artifact.repoPath, {
|
|
85
79
|
contents,
|
|
86
|
-
executable:
|
|
80
|
+
executable: resolveSnapshotExecutable(config, artifact.repoPath, stats.mode),
|
|
87
81
|
secret: true,
|
|
88
82
|
type: "file",
|
|
89
83
|
});
|
|
90
84
|
return;
|
|
91
85
|
}
|
|
92
|
-
const mode =
|
|
86
|
+
const mode = requireManagedSyncMode(config, artifact.repoPath, config.activeProfile, storagePath);
|
|
93
87
|
const stats = await lstat(absolutePath);
|
|
94
88
|
if (stats.isSymbolicLink()) {
|
|
95
89
|
if (mode === "secret") {
|
|
@@ -118,38 +112,32 @@ const readArtifactLeaf = async (absolutePath, storagePath, config, snapshot) =>
|
|
|
118
112
|
}
|
|
119
113
|
addSnapshotNode(snapshot, artifact.repoPath, {
|
|
120
114
|
contents: await readFile(absolutePath),
|
|
121
|
-
executable:
|
|
115
|
+
executable: resolveSnapshotExecutable(config, artifact.repoPath, stats.mode),
|
|
122
116
|
secret: false,
|
|
123
117
|
type: "file",
|
|
124
118
|
});
|
|
125
119
|
};
|
|
126
|
-
const walkArtifactTree = async (rootDirectory, config, snapshot, prefix = ""
|
|
127
|
-
scannedStorageEntryCount: 0,
|
|
128
|
-
}) => {
|
|
120
|
+
const walkArtifactTree = async (rootDirectory, config, snapshot, prefix = "") => {
|
|
129
121
|
const entries = await listDirectoryEntries(rootDirectory);
|
|
130
122
|
for (const entry of entries) {
|
|
131
123
|
const absolutePath = join(rootDirectory, entry.name);
|
|
132
124
|
const storagePath = prefix === "" ? entry.name : `${prefix}/${entry.name}`;
|
|
133
125
|
const stats = await lstat(absolutePath);
|
|
134
|
-
reportRepositoryScanProgress(reporter, progressState, storagePath, stats.isDirectory() ? "directory" : "file");
|
|
135
126
|
if (stats.isDirectory()) {
|
|
136
|
-
await walkArtifactTree(absolutePath, config, snapshot, storagePath
|
|
127
|
+
await walkArtifactTree(absolutePath, config, snapshot, storagePath);
|
|
137
128
|
continue;
|
|
138
129
|
}
|
|
139
130
|
await readArtifactLeaf(absolutePath, storagePath, config, snapshot);
|
|
140
131
|
}
|
|
141
132
|
};
|
|
142
|
-
export const buildRepositorySnapshot = async (syncDirectory, config
|
|
133
|
+
export const buildRepositorySnapshot = async (syncDirectory, config) => {
|
|
143
134
|
const snapshot = new Map();
|
|
144
|
-
const artifactsDirectory = syncDirectory;
|
|
145
135
|
const artifactProfiles = collectArtifactProfiles(config.entries);
|
|
146
|
-
const progressState = { scannedStorageEntryCount: 0 };
|
|
147
136
|
await Promise.all([...artifactProfiles].map(async (profile) => {
|
|
148
|
-
const profileDirectory = join(
|
|
137
|
+
const profileDirectory = join(syncDirectory, profile);
|
|
149
138
|
const profileStats = await getPathStats(profileDirectory);
|
|
150
139
|
if (profileStats?.isDirectory()) {
|
|
151
|
-
|
|
152
|
-
await walkArtifactTree(profileDirectory, config, snapshot, profile, reporter, progressState);
|
|
140
|
+
await walkArtifactTree(profileDirectory, config, snapshot, profile);
|
|
153
141
|
}
|
|
154
142
|
}));
|
|
155
143
|
for (const entry of config.entries) {
|
|
@@ -163,7 +151,7 @@ export const buildRepositorySnapshot = async (syncDirectory, config, reporter) =
|
|
|
163
151
|
const hasTrackedChildren = [...snapshot.keys()].some((repoPath) => {
|
|
164
152
|
return repoPath.startsWith(`${entry.repoPath}/`);
|
|
165
153
|
});
|
|
166
|
-
const expectedPath = join(
|
|
154
|
+
const expectedPath = join(syncDirectory, rule.profile, ...entry.repoPath.split("/"));
|
|
167
155
|
const expectedStats = await getPathStats(expectedPath);
|
|
168
156
|
if (expectedStats !== undefined && !expectedStats.isDirectory()) {
|
|
169
157
|
throw new DotweaveError("Directory sync entry is not stored as a directory in the repository.", {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repo-snapshot.js","sourceRoot":"","sources":["../../src/services/repo-snapshot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"repo-snapshot.js","sourceRoot":"","sources":["../../src/services/repo-snapshot.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
import { type SyncConfigEntryKind, type SyncMode } from "#app/config/sync.ts";
|
|
1
|
+
import type { SyncConfigEntryKind, SyncMode } from "#app/config/sync-schema.ts";
|
|
3
2
|
import { buildPullResultFromPlan } from "./pull.ts";
|
|
4
3
|
import { buildPushResultFromPlan } from "./push.ts";
|
|
5
4
|
export type StatusEntry = Readonly<{
|
|
@@ -20,7 +19,6 @@ export type PullChanges = Readonly<{
|
|
|
20
19
|
}>;
|
|
21
20
|
export type StatusResult = Readonly<{
|
|
22
21
|
activeProfile?: string;
|
|
23
|
-
configPath: string;
|
|
24
22
|
entries: readonly StatusEntry[];
|
|
25
23
|
entryCount: number;
|
|
26
24
|
pull: ReturnType<typeof buildPullResultFromPlan> & {
|
|
@@ -32,10 +30,8 @@ export type StatusResult = Readonly<{
|
|
|
32
30
|
preview: readonly string[];
|
|
33
31
|
};
|
|
34
32
|
recipientCount: number;
|
|
35
|
-
syncDirectory: string;
|
|
36
33
|
}>;
|
|
37
34
|
export declare const getStatus: (options?: Readonly<{
|
|
38
35
|
profile?: string;
|
|
39
|
-
reporter?: ConsolaInstance;
|
|
40
36
|
}>) => Promise<StatusResult>;
|
|
41
37
|
//# sourceMappingURL=status.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../src/services/status.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../src/services/status.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAGhF,OAAO,EAGL,uBAAuB,EACxB,MAAM,WAAW,CAAC;AAEnB,OAAO,EAGL,uBAAuB,EACxB,MAAM,WAAW,CAAC;AAQnB,MAAM,MAAM,WAAW,GAAG,QAAQ,CAAC;IACjC,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;CAClB,CAAC,CAAC;AAEH,MAAM,MAAM,WAAW,GAAG,QAAQ,CAAC;IACjC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IACzB,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5B,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;CAC5B,CAAC,CAAC;AAEH,MAAM,MAAM,WAAW,GAAG,QAAQ,CAAC;IACjC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IAC3B,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;CAC5B,CAAC,CAAC;AAEH,MAAM,MAAM,YAAY,GAAG,QAAQ,CAAC;IAClC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,SAAS,WAAW,EAAE,CAAC;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,UAAU,CAAC,OAAO,uBAAuB,CAAC,GAAG;QACjD,OAAO,EAAE,WAAW,CAAC;QACrB,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;KAC5B,CAAC;IACF,IAAI,EAAE,UAAU,CAAC,OAAO,uBAAuB,CAAC,GAAG;QACjD,OAAO,EAAE,WAAW,CAAC;QACrB,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;KAC5B,CAAC;IACF,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC,CAAC;AAuDH,eAAO,MAAM,SAAS,GACpB,UAAS,QAAQ,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAM,KACN,OAAO,CAAC,YAAY,CAyCtB,CAAC"}
|
package/dist/services/status.js
CHANGED
|
@@ -1,9 +1,8 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { ensureGitRepository } from "#app/lib/git.ts";
|
|
1
|
+
import { requireGitRepository } from "#app/lib/git.ts";
|
|
3
2
|
import { buildPullPlan, buildPullPlanPreview, buildPullResultFromPlan, } from "./pull.js";
|
|
4
3
|
import { buildPushPlan, buildPushPlanPreview, buildPushResultFromPlan, } from "./push.js";
|
|
5
4
|
import { buildArtifactKey, isRepoArtifactCurrent, parseArtifactRelativePath, } from "./repo-artifacts.js";
|
|
6
|
-
import { loadSyncConfig, resolveSyncPaths } from "./
|
|
5
|
+
import { loadSyncConfig, resolveSyncPaths } from "./sync-context.js";
|
|
7
6
|
const normalizeArtifactKeyToRepoPath = (artifactKey) => {
|
|
8
7
|
const relativePath = artifactKey.endsWith("/")
|
|
9
8
|
? artifactKey.slice(0, -1)
|
|
@@ -44,24 +43,16 @@ const buildPullChanges = (plan) => {
|
|
|
44
43
|
};
|
|
45
44
|
};
|
|
46
45
|
export const getStatus = async (options = {}) => {
|
|
47
|
-
const reporter = options.reporter;
|
|
48
|
-
reporter?.start("Analyzing sync status...");
|
|
49
46
|
const { syncDirectory } = resolveSyncPaths();
|
|
50
|
-
|
|
51
|
-
reporter?.start("Checking sync directory...");
|
|
52
|
-
await ensureGitRepository(syncDirectory);
|
|
53
|
-
reporter?.start("Loading sync configuration...");
|
|
47
|
+
await requireGitRepository(syncDirectory);
|
|
54
48
|
const { effectiveConfig, fullConfig } = await loadSyncConfig(syncDirectory, options);
|
|
55
|
-
|
|
56
|
-
const
|
|
57
|
-
reporter?.start("Building pull plan...");
|
|
58
|
-
const pullPlan = await buildPullPlan(effectiveConfig, syncDirectory, reporter);
|
|
49
|
+
const pushPlan = await buildPushPlan(effectiveConfig, syncDirectory);
|
|
50
|
+
const pullPlan = await buildPullPlan(effectiveConfig, syncDirectory);
|
|
59
51
|
const pushChanges = await buildPushChanges(pushPlan, syncDirectory, effectiveConfig.age.identityFile);
|
|
60
52
|
return {
|
|
61
53
|
...(effectiveConfig.activeProfile === undefined
|
|
62
54
|
? {}
|
|
63
55
|
: { activeProfile: effectiveConfig.activeProfile }),
|
|
64
|
-
configPath,
|
|
65
56
|
entries: fullConfig.entries.map((entry) => ({
|
|
66
57
|
kind: entry.kind,
|
|
67
58
|
localPath: entry.localPath,
|
|
@@ -71,17 +62,16 @@ export const getStatus = async (options = {}) => {
|
|
|
71
62
|
})),
|
|
72
63
|
entryCount: fullConfig.entries.length,
|
|
73
64
|
pull: {
|
|
74
|
-
...buildPullResultFromPlan(pullPlan,
|
|
65
|
+
...buildPullResultFromPlan(pullPlan, true),
|
|
75
66
|
changes: buildPullChanges(pullPlan),
|
|
76
67
|
preview: buildPullPlanPreview(pullPlan),
|
|
77
68
|
},
|
|
78
69
|
push: {
|
|
79
|
-
...buildPushResultFromPlan(pushPlan,
|
|
70
|
+
...buildPushResultFromPlan(pushPlan, true),
|
|
80
71
|
changes: pushChanges,
|
|
81
72
|
preview: buildPushPlanPreview(pushPlan),
|
|
82
73
|
},
|
|
83
74
|
recipientCount: effectiveConfig.age.recipients.length,
|
|
84
|
-
syncDirectory,
|
|
85
75
|
};
|
|
86
76
|
};
|
|
87
77
|
//# sourceMappingURL=status.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../src/services/status.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../src/services/status.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
import { type ActiveProfileSelection, type GlobalDotweaveConfig } from "#app/config/global-config.ts";
|
|
2
|
-
import { type AgeConfig, type ResolvedSyncConfig, type SyncConfigResolutionContext } from "#app/config/sync.ts";
|
|
2
|
+
import { type AgeConfig, type ResolvedSyncConfig, type SyncConfigResolutionContext } from "#app/config/sync-schema.ts";
|
|
3
3
|
export type RuntimeAgeConfig = Readonly<{
|
|
4
4
|
identityFile: string;
|
|
5
5
|
recipients: readonly string[];
|
|
6
6
|
}>;
|
|
7
7
|
export type SyncPaths = Readonly<{
|
|
8
|
-
artifactsDirectory: string;
|
|
9
8
|
configPath: string;
|
|
10
9
|
globalConfigPath: string;
|
|
11
10
|
homeDirectory: string;
|
|
@@ -27,4 +26,11 @@ export declare const buildEffectiveSyncConfig: (fullConfig: ResolvedSyncConfig,
|
|
|
27
26
|
export declare const loadSyncConfig: (syncDirectory: string, options?: Readonly<{
|
|
28
27
|
profile?: string;
|
|
29
28
|
}>) => Promise<LoadedSyncConfig>;
|
|
30
|
-
|
|
29
|
+
export type WritableSyncConfig = Readonly<{
|
|
30
|
+
config: ResolvedSyncConfig;
|
|
31
|
+
configPath: string;
|
|
32
|
+
context: SyncConfigResolutionContext;
|
|
33
|
+
syncDirectory: string;
|
|
34
|
+
}>;
|
|
35
|
+
export declare const loadWritableSyncConfig: () => Promise<WritableSyncConfig>;
|
|
36
|
+
//# sourceMappingURL=sync-context.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sync-context.d.ts","sourceRoot":"","sources":["../../src/services/sync-context.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,sBAAsB,EAC3B,KAAK,oBAAoB,EAG1B,MAAM,8BAA8B,CAAC;AAUtC,OAAO,EACL,KAAK,SAAS,EACd,KAAK,kBAAkB,EAGvB,KAAK,2BAA2B,EACjC,MAAM,4BAA4B,CAAC;AAIpC,MAAM,MAAM,gBAAgB,GAAG,QAAQ,CAAC;IACtC,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,SAAS,MAAM,EAAE,CAAC;CAC/B,CAAC,CAAC;AAEH,MAAM,MAAM,SAAS,GAAG,QAAQ,CAAC;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC,CAAC;AAEH,MAAM,MAAM,mBAAmB,GAAG,kBAAkB,GAClD,QAAQ,CAAC;IACP,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,GAAG,EAAE,gBAAgB,CAAC;CACvB,CAAC,CAAC;AAEL,MAAM,MAAM,gBAAgB,GAAG,QAAQ,CAAC;IACtC,eAAe,EAAE,mBAAmB,CAAC;IACrC,UAAU,EAAE,kBAAkB,CAAC;IAC/B,YAAY,CAAC,EAAE,oBAAoB,CAAC;CACrC,CAAC,CAAC;AAEH,eAAO,MAAM,kCAAkC,QACzC,2BAOH,CAAC;AAEJ,eAAO,MAAM,gBAAgB,QAAO,SASnC,CAAC;AAEF,eAAO,MAAM,wBAAwB,GAAI,KAAK,SAAS,KAAG,gBAQzD,CAAC;AAEF,eAAO,MAAM,wBAAwB,GACnC,YAAY,kBAAkB,EAC9B,WAAW,sBAAsB,EACjC,KAAK,gBAAgB,KACpB,mBAqBF,CAAC;AAEF,eAAO,MAAM,cAAc,GACzB,eAAe,MAAM,EACrB,UAAS,QAAQ,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAM,KACN,OAAO,CAAC,gBAAgB,CAmC1B,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,QAAQ,CAAC;IACxC,MAAM,EAAE,kBAAkB,CAAC;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,2BAA2B,CAAC;IACrC,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC,CAAC;AAEH,eAAO,MAAM,sBAAsB,QAAa,OAAO,CAAC,kBAAkB,CAMzE,CAAC"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { AppConstants } from "#app/config/constants.ts";
|
|
2
2
|
import { readGlobalDotweaveConfig, resolveActiveProfileSelection, } from "#app/config/global-config.ts";
|
|
3
3
|
import { resolveDefaultIdentityFile } from "#app/config/identity-file.ts";
|
|
4
4
|
import { readEnvValue, resolveCurrentPlatformKey, resolveDotweaveGlobalConfigFilePathFromEnv, resolveDotweaveSyncDirectoryFromEnv, resolveHomeDirectoryFromEnv, resolveXdgConfigHomeFromEnv, } from "#app/config/runtime-env.ts";
|
|
5
|
-
import { readSyncConfig, resolveSyncConfigFilePath, } from "#app/config/sync.ts";
|
|
5
|
+
import { readSyncConfig, resolveSyncConfigFilePath, } from "#app/config/sync-schema.ts";
|
|
6
6
|
import { DotweaveError } from "#app/lib/error.ts";
|
|
7
|
+
import { requireGitRepository } from "#app/lib/git.ts";
|
|
7
8
|
export const resolveSyncConfigResolutionContext = () => {
|
|
8
9
|
return {
|
|
9
10
|
homeDirectory: resolveHomeDirectoryFromEnv(),
|
|
@@ -15,7 +16,6 @@ export const resolveSyncConfigResolutionContext = () => {
|
|
|
15
16
|
export const resolveSyncPaths = () => {
|
|
16
17
|
const syncDirectory = resolveDotweaveSyncDirectoryFromEnv();
|
|
17
18
|
return {
|
|
18
|
-
artifactsDirectory: syncDirectory,
|
|
19
19
|
configPath: resolveSyncConfigFilePath(syncDirectory),
|
|
20
20
|
globalConfigPath: resolveDotweaveGlobalConfigFilePathFromEnv(),
|
|
21
21
|
homeDirectory: resolveHomeDirectoryFromEnv(),
|
|
@@ -31,9 +31,9 @@ export const resolveAgeFromSyncConfig = (age) => {
|
|
|
31
31
|
export const buildEffectiveSyncConfig = (fullConfig, selection, age) => {
|
|
32
32
|
const activeProfile = selection.mode === "single" ? selection.profile : undefined;
|
|
33
33
|
const effectiveProfile = activeProfile !== undefined &&
|
|
34
|
-
activeProfile !==
|
|
34
|
+
activeProfile !== AppConstants.SYNC.DEFAULT_PROFILE
|
|
35
35
|
? activeProfile
|
|
36
|
-
:
|
|
36
|
+
: AppConstants.SYNC.DEFAULT_PROFILE;
|
|
37
37
|
const entries = fullConfig.entries.filter((entry) => entry.profiles.length === 0 || entry.profiles.includes(effectiveProfile));
|
|
38
38
|
return {
|
|
39
39
|
...fullConfig,
|
|
@@ -55,7 +55,7 @@ export const loadSyncConfig = async (syncDirectory, options = {}) => {
|
|
|
55
55
|
const rawAge = fullConfig.age;
|
|
56
56
|
if (rawAge === undefined) {
|
|
57
57
|
const configPath = resolveSyncConfigFilePath(syncDirectory);
|
|
58
|
-
throw new DotweaveError(`Age configuration is missing from ${
|
|
58
|
+
throw new DotweaveError(`Age configuration is missing from ${AppConstants.SYNC.CONFIG_FILE_NAME}.`, {
|
|
59
59
|
code: "AGE_CONFIG_MISSING",
|
|
60
60
|
details: [`Config file: ${configPath}`],
|
|
61
61
|
hint: "Run 'dotweave init' to set up encryption.",
|
|
@@ -68,4 +68,11 @@ export const loadSyncConfig = async (syncDirectory, options = {}) => {
|
|
|
68
68
|
...(globalConfig === undefined ? {} : { globalConfig }),
|
|
69
69
|
};
|
|
70
70
|
};
|
|
71
|
-
|
|
71
|
+
export const loadWritableSyncConfig = async () => {
|
|
72
|
+
const { syncDirectory, configPath } = resolveSyncPaths();
|
|
73
|
+
const context = resolveSyncConfigResolutionContext();
|
|
74
|
+
await requireGitRepository(syncDirectory);
|
|
75
|
+
const config = await readSyncConfig(syncDirectory, context);
|
|
76
|
+
return { config, configPath, context, syncDirectory };
|
|
77
|
+
};
|
|
78
|
+
//# sourceMappingURL=sync-context.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sync-context.js","sourceRoot":"","sources":["../../src/services/sync-context.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type
|
|
1
|
+
import { type ResolvedSyncConfig, type SyncMode } from "#app/config/sync-schema.ts";
|
|
2
2
|
export type SetModeRequest = Readonly<{
|
|
3
3
|
mode: SyncMode;
|
|
4
4
|
target: string;
|
|
@@ -7,21 +7,19 @@ type SyncSetAction = "added" | "removed" | "unchanged" | "updated";
|
|
|
7
7
|
type SyncSetReason = "already-set";
|
|
8
8
|
export type SetModeResult = Readonly<{
|
|
9
9
|
action: SyncSetAction;
|
|
10
|
-
configPath: string;
|
|
11
10
|
entryRepoPath: string;
|
|
12
11
|
localPath: string;
|
|
13
12
|
mode: SyncMode;
|
|
14
13
|
repoPath: string;
|
|
15
14
|
reason?: SyncSetReason;
|
|
16
|
-
syncDirectory: string;
|
|
17
15
|
}>;
|
|
18
|
-
export declare const resolveSetTarget: (target: string, config:
|
|
16
|
+
export declare const resolveSetTarget: (target: string, config: ResolvedSyncConfig, cwd: string, homeDirectory: string) => Promise<{
|
|
19
17
|
entry: Readonly<{
|
|
20
|
-
configuredMode: PlatformSyncMode;
|
|
18
|
+
configuredMode: import("#app/config/sync-schema.ts").PlatformSyncMode;
|
|
21
19
|
configuredLocalPath: import("../config/platform.ts").PlatformStringValue;
|
|
22
|
-
configuredPermission?: import("#app/config/sync.ts").PlatformPermission;
|
|
23
|
-
configuredRepoPath?: import("#app/config/sync.ts").ConfiguredSyncRepoPath;
|
|
24
|
-
kind: import("#app/config/sync.ts").SyncConfigEntryKind;
|
|
20
|
+
configuredPermission?: import("#app/config/sync-schema.ts").PlatformPermission;
|
|
21
|
+
configuredRepoPath?: import("#app/config/sync-schema.ts").ConfiguredSyncRepoPath;
|
|
22
|
+
kind: import("#app/config/sync-schema.ts").SyncConfigEntryKind;
|
|
25
23
|
localPath: string;
|
|
26
24
|
profiles: readonly string[];
|
|
27
25
|
profilesExplicit: boolean;
|
|
@@ -38,4 +36,4 @@ export declare const resolveSetTarget: (target: string, config: Awaited<ReturnTy
|
|
|
38
36
|
}>;
|
|
39
37
|
export declare const setTargetMode: (request: SetModeRequest, cwd: string) => Promise<SetModeResult>;
|
|
40
38
|
export {};
|
|
41
|
-
//# sourceMappingURL=
|
|
39
|
+
//# sourceMappingURL=sync-mode.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sync-mode.d.ts","sourceRoot":"","sources":["../../src/services/sync-mode.ts"],"names":[],"mappings":"AAOA,OAAO,EAEL,KAAK,kBAAkB,EAEvB,KAAK,QAAQ,EACd,MAAM,4BAA4B,CAAC;AAiBpC,MAAM,MAAM,cAAc,GAAG,QAAQ,CAAC;IACpC,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC,CAAC;AAEH,KAAK,aAAa,GAAG,OAAO,GAAG,SAAS,GAAG,WAAW,GAAG,SAAS,CAAC;AACnE,KAAK,aAAa,GAAG,aAAa,CAAC;AAEnC,MAAM,MAAM,aAAa,GAAG,QAAQ,CAAC;IACnC,MAAM,EAAE,aAAa,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,QAAQ,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,aAAa,CAAC;CACxB,CAAC,CAAC;AA8DH,eAAO,MAAM,gBAAgB,GAC3B,QAAQ,MAAM,EACd,QAAQ,kBAAkB,EAC1B,KAAK,MAAM,EACX,eAAe,MAAM;;;;;;;;;;;;;;;;;;;;EAgLtB,CAAC;AAEF,eAAO,MAAM,aAAa,GACxB,SAAS,cAAc,EACvB,KAAK,MAAM,KACV,OAAO,CAAC,aAAa,CAiJvB,CAAC"}
|
|
@@ -1,25 +1,16 @@
|
|
|
1
1
|
import { isAbsolute, join, posix, relative, resolve } from "node:path";
|
|
2
|
-
import {
|
|
2
|
+
import { buildDefaultPlatformMode, findOwningSyncEntry, hasPlatformSpecificModeOverride, resolveEntryRelativeRepoPath, } from "#app/config/sync-queries.ts";
|
|
3
|
+
import { normalizeSyncRepoPath, } from "#app/config/sync-schema.ts";
|
|
3
4
|
import { expandHomePath } from "#app/config/xdg.ts";
|
|
4
5
|
import { DotweaveError } from "#app/lib/error.ts";
|
|
5
6
|
import { getPathStats } from "#app/lib/filesystem.ts";
|
|
6
|
-
import { ensureGitRepository } from "#app/lib/git.ts";
|
|
7
7
|
import { isExplicitLocalPath } from "#app/lib/path.ts";
|
|
8
8
|
import { buildSyncConfigDocument, writeValidatedSyncConfig, } from "./config-file.js";
|
|
9
|
-
import {
|
|
10
|
-
import {
|
|
11
|
-
const buildDefaultPlatformMode = (mode) => ({
|
|
12
|
-
default: mode,
|
|
13
|
-
});
|
|
9
|
+
import { loadWritableSyncConfig } from "./sync-context.js";
|
|
10
|
+
import { buildConfiguredHomeLocalPath, buildRepoPathWithinRoot, tryBuildRepoPathWithinRoot, tryNormalizeRepoPathInput, } from "./sync-paths.js";
|
|
14
11
|
const buildDefaultConfiguredRepoPath = (repoPath) => ({
|
|
15
12
|
default: normalizeSyncRepoPath(repoPath),
|
|
16
13
|
});
|
|
17
|
-
const hasPlatformSpecificModeOverride = (configuredMode) => {
|
|
18
|
-
return (configuredMode.win !== undefined ||
|
|
19
|
-
configuredMode.mac !== undefined ||
|
|
20
|
-
configuredMode.linux !== undefined ||
|
|
21
|
-
configuredMode.wsl !== undefined);
|
|
22
|
-
};
|
|
23
14
|
const computeLocalPath = (entry, repoPath) => {
|
|
24
15
|
const relativePath = resolveEntryRelativeRepoPath(entry, repoPath);
|
|
25
16
|
if (relativePath === undefined || relativePath === "") {
|
|
@@ -179,19 +170,14 @@ export const resolveSetTarget = async (target, config, cwd, homeDirectory) => {
|
|
|
179
170
|
};
|
|
180
171
|
};
|
|
181
172
|
export const setTargetMode = async (request, cwd) => {
|
|
182
|
-
const {
|
|
183
|
-
const context = resolveSyncConfigResolutionContext();
|
|
184
|
-
await ensureGitRepository(syncDirectory);
|
|
185
|
-
const config = await readSyncConfig(syncDirectory, context);
|
|
173
|
+
const { config, context, syncDirectory } = await loadWritableSyncConfig();
|
|
186
174
|
const target = await resolveSetTarget(request.target, config, cwd, context.homeDirectory);
|
|
187
175
|
const buildResult = (action, extras) => ({
|
|
188
176
|
action,
|
|
189
|
-
configPath,
|
|
190
177
|
entryRepoPath: target.entry.repoPath,
|
|
191
178
|
localPath: target.localPath,
|
|
192
179
|
mode: request.mode,
|
|
193
180
|
repoPath: target.repoPath,
|
|
194
|
-
syncDirectory,
|
|
195
181
|
...extras,
|
|
196
182
|
});
|
|
197
183
|
if (target.relativePath === "") {
|
|
@@ -215,7 +201,7 @@ export const setTargetMode = async (request, cwd) => {
|
|
|
215
201
|
}),
|
|
216
202
|
});
|
|
217
203
|
if (action !== "unchanged") {
|
|
218
|
-
await writeValidatedSyncConfig(syncDirectory, nextConfig
|
|
204
|
+
await writeValidatedSyncConfig(syncDirectory, nextConfig);
|
|
219
205
|
}
|
|
220
206
|
return buildResult(action);
|
|
221
207
|
}
|
|
@@ -255,7 +241,7 @@ export const setTargetMode = async (request, cwd) => {
|
|
|
255
241
|
};
|
|
256
242
|
}),
|
|
257
243
|
});
|
|
258
|
-
await writeValidatedSyncConfig(syncDirectory, nextConfig
|
|
244
|
+
await writeValidatedSyncConfig(syncDirectory, nextConfig);
|
|
259
245
|
return buildResult("updated");
|
|
260
246
|
}
|
|
261
247
|
if (request.mode === target.entry.mode) {
|
|
@@ -282,7 +268,7 @@ export const setTargetMode = async (request, cwd) => {
|
|
|
282
268
|
...config,
|
|
283
269
|
entries: [...config.entries, newEntry],
|
|
284
270
|
});
|
|
285
|
-
await writeValidatedSyncConfig(syncDirectory, nextConfig
|
|
271
|
+
await writeValidatedSyncConfig(syncDirectory, nextConfig);
|
|
286
272
|
return buildResult("added");
|
|
287
273
|
};
|
|
288
|
-
//# sourceMappingURL=
|
|
274
|
+
//# sourceMappingURL=sync-mode.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sync-mode.js","sourceRoot":"","sources":["../../src/services/sync-mode.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import type { PlatformStringValue } from "#app/config/platform.ts";
|
|
2
|
-
import { type ResolvedSyncConfigEntry } from "#app/config/sync.ts";
|
|
2
|
+
import { type ResolvedSyncConfigEntry } from "#app/config/sync-schema.ts";
|
|
3
3
|
export declare const buildRepoPathWithinRoot: (absolutePath: string, rootPath: string, description: string) => string;
|
|
4
4
|
export declare const buildConfiguredHomeLocalPath: (repoPath: string) => PlatformStringValue;
|
|
5
5
|
export declare const tryBuildRepoPathWithinRoot: (absolutePath: string, rootPath: string, description: string) => string | undefined;
|
|
6
6
|
export declare const tryNormalizeRepoPathInput: (value: string) => string | undefined;
|
|
7
7
|
export declare const resolveTrackedEntry: (target: string, entries: readonly ResolvedSyncConfigEntry[], cwd: string, homeDirectory: string) => ResolvedSyncConfigEntry | undefined;
|
|
8
|
-
//# sourceMappingURL=paths.d.ts.map
|
|
8
|
+
//# sourceMappingURL=sync-paths.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sync-paths.d.ts","sourceRoot":"","sources":["../../src/services/sync-paths.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,EAEL,KAAK,uBAAuB,EAC7B,MAAM,4BAA4B,CAAC;AASpC,eAAO,MAAM,uBAAuB,GAClC,cAAc,MAAM,EACpB,UAAU,MAAM,EAChB,aAAa,MAAM,WA+BpB,CAAC;AAEF,eAAO,MAAM,4BAA4B,GACvC,UAAU,MAAM,KACf,mBAIF,CAAC;AAEF,eAAO,MAAM,0BAA0B,GACrC,cAAc,MAAM,EACpB,UAAU,MAAM,EAChB,aAAa,MAAM,uBAOpB,CAAC;AAEF,eAAO,MAAM,yBAAyB,GAAI,OAAO,MAAM,uBAMtD,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAC9B,QAAQ,MAAM,EACd,SAAS,SAAS,uBAAuB,EAAE,EAC3C,KAAK,MAAM,EACX,eAAe,MAAM,KACpB,uBAAuB,GAAG,SA6B5B,CAAC"}
|
|
@@ -1,10 +1,8 @@
|
|
|
1
1
|
import { isAbsolute, relative, resolve } from "node:path";
|
|
2
|
-
import { normalizeSyncRepoPath, } from "#app/config/sync.ts";
|
|
2
|
+
import { normalizeSyncRepoPath, } from "#app/config/sync-schema.ts";
|
|
3
3
|
import { expandHomePath } from "#app/config/xdg.ts";
|
|
4
4
|
import { DotweaveError } from "#app/lib/error.ts";
|
|
5
|
-
import { isExplicitLocalPath } from "#app/lib/path.ts";
|
|
6
|
-
const homePrefix = "~";
|
|
7
|
-
const shellPathSeparator = "/";
|
|
5
|
+
import { homeSymbol as homePrefix, isExplicitLocalPath, pathSeparator, } from "#app/lib/path.ts";
|
|
8
6
|
export const buildRepoPathWithinRoot = (absolutePath, rootPath, description) => {
|
|
9
7
|
const relativePath = relative(rootPath, absolutePath);
|
|
10
8
|
if (relativePath === "") {
|
|
@@ -27,7 +25,7 @@ export const buildRepoPathWithinRoot = (absolutePath, rootPath, description) =>
|
|
|
27
25
|
};
|
|
28
26
|
export const buildConfiguredHomeLocalPath = (repoPath) => {
|
|
29
27
|
return {
|
|
30
|
-
default: `${homePrefix}${
|
|
28
|
+
default: `${homePrefix}${pathSeparator}${repoPath}`,
|
|
31
29
|
};
|
|
32
30
|
};
|
|
33
31
|
export const tryBuildRepoPathWithinRoot = (absolutePath, rootPath, description) => {
|
|
@@ -68,4 +66,4 @@ export const resolveTrackedEntry = (target, entries, cwd, homeDirectory) => {
|
|
|
68
66
|
}
|
|
69
67
|
return matches[0];
|
|
70
68
|
};
|
|
71
|
-
//# sourceMappingURL=paths.js.map
|
|
69
|
+
//# sourceMappingURL=sync-paths.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sync-paths.js","sourceRoot":"","sources":["../../src/services/sync-paths.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,34 @@
|
|
|
1
|
-
import { type
|
|
2
|
-
export
|
|
1
|
+
import { type Spinner } from "./spinner.ts";
|
|
2
|
+
export interface CliLogger {
|
|
3
|
+
log(message: string): void;
|
|
4
|
+
info(message: string): void;
|
|
5
|
+
success(message: string): void;
|
|
6
|
+
fail(message: string): void;
|
|
7
|
+
warn(message: string): void;
|
|
8
|
+
error(message: string): void;
|
|
9
|
+
start(message: string): void;
|
|
10
|
+
section(title: string): void;
|
|
11
|
+
/** Render a key/value pair aligned to the configured label width. */
|
|
12
|
+
kv(key: string, value: string): void;
|
|
13
|
+
/** Render each item as a list entry using optional bullet and optional last-item highlight. */
|
|
14
|
+
list(items: string[], opts?: {
|
|
15
|
+
bullet?: string;
|
|
16
|
+
highlightLast?: boolean;
|
|
17
|
+
}): void;
|
|
18
|
+
/** Render key/value pairs as aligned list lines, preserving empty-value keys. */
|
|
19
|
+
listKeyValue(items: {
|
|
20
|
+
key: string;
|
|
21
|
+
value?: string;
|
|
22
|
+
}[]): void;
|
|
23
|
+
/** Render a visual divider line. */
|
|
24
|
+
divider(): void;
|
|
25
|
+
/** Start and return a spinner bound to stdout for long-running operations. */
|
|
26
|
+
spinner(text: string): Spinner;
|
|
27
|
+
}
|
|
28
|
+
export type Stream = Pick<NodeJS.WriteStream, "write" | "isTTY" | "clearLine" | "cursorTo">;
|
|
3
29
|
export declare const createCliLogger: (options?: Readonly<{
|
|
4
|
-
stderr?:
|
|
5
|
-
stdout?:
|
|
30
|
+
stderr?: Stream;
|
|
31
|
+
stdout?: Stream;
|
|
6
32
|
tag?: string;
|
|
7
|
-
verbose?: boolean;
|
|
8
33
|
}>) => CliLogger;
|
|
9
34
|
//# sourceMappingURL=logger.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../../src/services/terminal/logger.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../../src/services/terminal/logger.ts"],"names":[],"mappings":"AACA,OAAO,EAAiB,KAAK,OAAO,EAAE,MAAM,cAAc,CAAC;AAG3D,MAAM,WAAW,SAAS;IACxB,GAAG,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAE7B,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAE7B,qEAAqE;IACrE,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAErC,+FAA+F;IAC/F,IAAI,CACF,KAAK,EAAE,MAAM,EAAE,EACf,IAAI,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,aAAa,CAAC,EAAE,OAAO,CAAA;KAAE,GAClD,IAAI,CAAC;IAER,iFAAiF;IACjF,YAAY,CAAC,KAAK,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,GAAG,IAAI,CAAC;IAE7D,oCAAoC;IACpC,OAAO,IAAI,IAAI,CAAC;IAEhB,8EAA8E;IAC9E,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;CAChC;AAED,MAAM,MAAM,MAAM,GAAG,IAAI,CACvB,MAAM,CAAC,WAAW,EAClB,OAAO,GAAG,OAAO,GAAG,WAAW,GAAG,UAAU,CAC7C,CAAC;AAIF,eAAO,MAAM,eAAe,GAC1B,UAAS,QAAQ,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAM,KACN,SA+DG,CAAC"}
|