@tinyrack/dotweave 0.42.21 → 0.44.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 +21 -6
- package/dist/application.d.ts +2 -0
- package/dist/application.d.ts.map +1 -1
- package/dist/application.js +20 -2
- package/dist/application.js.map +1 -1
- package/dist/assets/dotweave-skill.d.ts +2 -0
- package/dist/assets/dotweave-skill.d.ts.map +1 -0
- package/dist/assets/dotweave-skill.js +34 -0
- package/dist/assets/dotweave-skill.js.map +1 -0
- package/dist/cli/init.d.ts.map +1 -1
- package/dist/cli/init.js +3 -3
- package/dist/cli/init.js.map +1 -1
- package/dist/cli/pull.d.ts.map +1 -1
- package/dist/cli/pull.js +23 -4
- package/dist/cli/pull.js.map +1 -1
- package/dist/cli/push.d.ts.map +1 -1
- package/dist/cli/push.js +11 -4
- package/dist/cli/push.js.map +1 -1
- package/dist/cli/root-commands.d.ts +1 -0
- package/dist/cli/root-commands.d.ts.map +1 -1
- package/dist/cli/root-commands.js +2 -0
- package/dist/cli/root-commands.js.map +1 -1
- package/dist/cli/skill/index.d.ts +3 -0
- package/dist/cli/skill/index.d.ts.map +1 -0
- package/dist/cli/skill/index.js +13 -0
- package/dist/cli/skill/index.js.map +1 -0
- package/dist/cli/skill/install.d.ts +4 -0
- package/dist/cli/skill/install.d.ts.map +1 -0
- package/dist/cli/skill/install.js +63 -0
- package/dist/cli/skill/install.js.map +1 -0
- package/dist/cli/status.d.ts.map +1 -1
- package/dist/cli/status.js +12 -4
- package/dist/cli/status.js.map +1 -1
- package/dist/config/constants.d.ts +1 -1
- package/dist/config/constants.js +1 -1
- package/dist/config/constants.js.map +1 -1
- package/dist/config/identity-file.d.ts +1 -1
- package/dist/config/identity-file.d.ts.map +1 -1
- package/dist/config/identity-file.js +3 -3
- package/dist/config/identity-file.js.map +1 -1
- package/dist/config/runtime-env.d.ts +1 -0
- package/dist/config/runtime-env.d.ts.map +1 -1
- package/dist/config/runtime-env.js +16 -6
- package/dist/config/runtime-env.js.map +1 -1
- package/dist/config/sync-queries.d.ts.map +1 -1
- package/dist/config/sync-queries.js +4 -0
- package/dist/config/sync-queries.js.map +1 -1
- package/dist/config/sync-schema.d.ts.map +1 -1
- package/dist/config/sync-schema.js +7 -0
- package/dist/config/sync-schema.js.map +1 -1
- package/dist/config/xdg.d.ts +13 -0
- package/dist/config/xdg.d.ts.map +1 -1
- package/dist/config/xdg.js +22 -0
- package/dist/config/xdg.js.map +1 -1
- package/dist/lib/env.d.ts +4 -0
- package/dist/lib/env.d.ts.map +1 -1
- package/dist/lib/env.js +25 -0
- package/dist/lib/env.js.map +1 -1
- package/dist/lib/error.d.ts.map +1 -1
- package/dist/lib/error.js +5 -1
- package/dist/lib/error.js.map +1 -1
- package/dist/lib/filesystem.d.ts.map +1 -1
- package/dist/lib/filesystem.js +3 -0
- package/dist/lib/filesystem.js.map +1 -1
- package/dist/lib/git.d.ts +52 -0
- package/dist/lib/git.d.ts.map +1 -1
- package/dist/lib/git.js +14 -4
- package/dist/lib/git.js.map +1 -1
- package/dist/lib/path.d.ts +12 -0
- package/dist/lib/path.d.ts.map +1 -1
- package/dist/lib/path.js +21 -10
- package/dist/lib/path.js.map +1 -1
- package/dist/services/init.d.ts.map +1 -1
- package/dist/services/init.js +5 -5
- package/dist/services/init.js.map +1 -1
- package/dist/services/profile.d.ts.map +1 -1
- package/dist/services/profile.js +4 -4
- package/dist/services/profile.js.map +1 -1
- package/dist/services/push.d.ts +4 -1
- package/dist/services/push.d.ts.map +1 -1
- package/dist/services/push.js +82 -23
- package/dist/services/push.js.map +1 -1
- package/dist/services/repo-artifacts.d.ts +8 -3
- package/dist/services/repo-artifacts.d.ts.map +1 -1
- package/dist/services/repo-artifacts.js +228 -18
- package/dist/services/repo-artifacts.js.map +1 -1
- package/dist/services/repo-snapshot.d.ts.map +1 -1
- package/dist/services/repo-snapshot.js +15 -5
- package/dist/services/repo-snapshot.js.map +1 -1
- package/dist/services/skill-install.d.ts +13 -0
- package/dist/services/skill-install.d.ts.map +1 -0
- package/dist/services/skill-install.js +39 -0
- package/dist/services/skill-install.js.map +1 -0
- package/dist/services/status.d.ts.map +1 -1
- package/dist/services/status.js +5 -12
- package/dist/services/status.js.map +1 -1
- package/dist/services/sync-context.d.ts.map +1 -1
- package/dist/services/sync-context.js +2 -2
- package/dist/services/sync-context.js.map +1 -1
- package/dist/services/track.d.ts.map +1 -1
- package/dist/services/track.js +2 -2
- package/dist/services/track.js.map +1 -1
- package/package.json +3 -1
package/dist/lib/path.d.ts
CHANGED
|
@@ -4,5 +4,17 @@ export declare const buildDirectoryKey: (repoPath: string) => string;
|
|
|
4
4
|
export declare const isPathEqualOrNested: (path: string, rootPath: string) => boolean;
|
|
5
5
|
export declare const doPathsOverlap: (leftPath: string, rightPath: string) => boolean;
|
|
6
6
|
export declare const isExplicitLocalPath: (target: string) => boolean;
|
|
7
|
+
export type LinkTargetNormalizerPlatform = NodeJS.Platform;
|
|
8
|
+
interface NormalizeLinkTargetDependencies {
|
|
9
|
+
platform?: LinkTargetNormalizerPlatform;
|
|
10
|
+
realpathSyncNative?: (path: string) => string;
|
|
11
|
+
resolvePath?: (...paths: string[]) => string;
|
|
12
|
+
dirnamePath?: (path: string) => string;
|
|
13
|
+
basenamePath?: (path: string) => string;
|
|
14
|
+
joinPath?: (...paths: string[]) => string;
|
|
15
|
+
isAbsolutePath?: (path: string) => boolean;
|
|
16
|
+
}
|
|
17
|
+
export declare const normalizeLinkTargetWithDependencies: (target: string, baseDir: string | undefined, deps?: NormalizeLinkTargetDependencies) => string;
|
|
7
18
|
export declare const normalizeLinkTarget: (target: string, baseDir?: string) => string;
|
|
19
|
+
export {};
|
|
8
20
|
//# sourceMappingURL=path.d.ts.map
|
package/dist/lib/path.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"path.d.ts","sourceRoot":"","sources":["../../src/lib/path.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"path.d.ts","sourceRoot":"","sources":["../../src/lib/path.ts"],"names":[],"mappings":"AAaA,eAAO,MAAM,UAAU,MAAa,CAAC;AACrC,eAAO,MAAM,aAAa,MAAqB,CAAC;AAEhD,eAAO,MAAM,iBAAiB,GAAI,UAAU,MAAM,WAEjD,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAAI,MAAM,MAAM,EAAE,UAAU,MAAM,YASjE,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,UAAU,MAAM,EAAE,WAAW,MAAM,YAKjE,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAAI,QAAQ,MAAM,YAYjD,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG,MAAM,CAAC,QAAQ,CAAC;AAE3D,UAAU,+BAA+B;IACvC,QAAQ,CAAC,EAAE,4BAA4B,CAAC;IACxC,kBAAkB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;IAC9C,WAAW,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,KAAK,MAAM,CAAC;IAC7C,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;IACvC,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;IACxC,QAAQ,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,KAAK,MAAM,CAAC;IAC1C,cAAc,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;CAC5C;AAED,eAAO,MAAM,mCAAmC,GAC9C,QAAQ,MAAM,EACd,SAAS,MAAM,GAAG,SAAS,EAC3B,OAAM,+BAAoC,WA2C3C,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAAI,QAAQ,MAAM,EAAE,UAAU,MAAM,WAEnE,CAAC"}
|
package/dist/lib/path.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { realpathSync } from "node:fs";
|
|
2
|
+
import { basename, dirname, isAbsolute, join, relative, resolve, } from "node:path";
|
|
2
3
|
const homePrefix = "~";
|
|
3
4
|
const posixPathSeparator = "/";
|
|
4
5
|
export const homeSymbol = homePrefix;
|
|
@@ -27,29 +28,36 @@ export const isExplicitLocalPath = (target) => {
|
|
|
27
28
|
target.startsWith(homePathPrefix) ||
|
|
28
29
|
isAbsolute(target));
|
|
29
30
|
};
|
|
30
|
-
export const
|
|
31
|
-
const
|
|
32
|
-
|
|
31
|
+
export const normalizeLinkTargetWithDependencies = (target, baseDir, deps = {}) => {
|
|
32
|
+
const platform = deps.platform ?? process.platform;
|
|
33
|
+
const realpathSyncNative = deps.realpathSyncNative ?? realpathSync.native;
|
|
34
|
+
const resolvePath = deps.resolvePath ?? resolve;
|
|
35
|
+
const dirnamePath = deps.dirnamePath ?? dirname;
|
|
36
|
+
const basenamePath = deps.basenamePath ?? basename;
|
|
37
|
+
const joinPath = deps.joinPath ?? join;
|
|
38
|
+
const isAbsolutePath = deps.isAbsolutePath ?? isAbsolute;
|
|
39
|
+
const absoluteTarget = baseDir !== undefined && !isAbsolutePath(target)
|
|
40
|
+
? resolvePath(baseDir, target)
|
|
33
41
|
: target;
|
|
34
|
-
if (
|
|
42
|
+
if (platform !== "win32") {
|
|
35
43
|
return absoluteTarget;
|
|
36
44
|
}
|
|
37
45
|
const normalizeSlashes = (p) => p.replaceAll("\\", "/").toLowerCase();
|
|
38
46
|
const resolveIfWindowsRootRelative = (p) => {
|
|
39
47
|
if (p.startsWith("\\") && !p.startsWith("\\\\")) {
|
|
40
|
-
return
|
|
48
|
+
return resolvePath(p);
|
|
41
49
|
}
|
|
42
50
|
return p;
|
|
43
51
|
};
|
|
44
52
|
try {
|
|
45
|
-
return normalizeSlashes(
|
|
53
|
+
return normalizeSlashes(realpathSyncNative(absoluteTarget));
|
|
46
54
|
}
|
|
47
55
|
catch {
|
|
48
56
|
if (baseDir !== undefined) {
|
|
49
57
|
try {
|
|
50
|
-
const dir =
|
|
51
|
-
const base =
|
|
52
|
-
return normalizeSlashes(
|
|
58
|
+
const dir = dirnamePath(absoluteTarget);
|
|
59
|
+
const base = basenamePath(absoluteTarget);
|
|
60
|
+
return normalizeSlashes(joinPath(realpathSyncNative(dir), base));
|
|
53
61
|
}
|
|
54
62
|
catch {
|
|
55
63
|
return normalizeSlashes(resolveIfWindowsRootRelative(absoluteTarget));
|
|
@@ -58,4 +66,7 @@ export const normalizeLinkTarget = (target, baseDir) => {
|
|
|
58
66
|
return normalizeSlashes(resolveIfWindowsRootRelative(absoluteTarget));
|
|
59
67
|
}
|
|
60
68
|
};
|
|
69
|
+
export const normalizeLinkTarget = (target, baseDir) => {
|
|
70
|
+
return normalizeLinkTargetWithDependencies(target, baseDir);
|
|
71
|
+
};
|
|
61
72
|
//# sourceMappingURL=path.js.map
|
package/dist/lib/path.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"path.js","sourceRoot":"","sources":["../../src/lib/path.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"path.js","sourceRoot":"","sources":["../../src/lib/path.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/services/init.ts"],"names":[],"mappings":"AAsBA,OAAO,EAAE,aAAa,EAAoB,MAAM,mBAAmB,CAAC;AAcpE,MAAM,MAAM,WAAW,GAAG,QAAQ,CAAC;IACjC,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,UAAU,GAAG,QAAQ,CAAC;IAChC,kBAAkB,EAAE,OAAO,CAAC;IAC5B,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;CACxB,CAAC,CAAC;AAKH,eAAO,MAAM,kCAAkC,qBAQ9C,CAAC;
|
|
1
|
+
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/services/init.ts"],"names":[],"mappings":"AAsBA,OAAO,EAAE,aAAa,EAAoB,MAAM,mBAAmB,CAAC;AAcpE,MAAM,MAAM,WAAW,GAAG,QAAQ,CAAC;IACjC,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,UAAU,GAAG,QAAQ,CAAC;IAChC,kBAAkB,EAAE,OAAO,CAAC;IAC5B,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;CACxB,CAAC,CAAC;AAKH,eAAO,MAAM,kCAAkC,qBAQ9C,CAAC;AAoJF,eAAO,MAAM,uBAAuB,GAClC,SAAS,WAAW,KACnB,OAAO,CAAC,UAAU,CAuJpB,CAAC"}
|
package/dist/services/init.js
CHANGED
|
@@ -3,7 +3,7 @@ import { dirname, join } from "node:path";
|
|
|
3
3
|
import { AppConstants } from "#app/config/constants.ts";
|
|
4
4
|
import { formatGlobalDotweaveConfig, readGlobalDotweaveConfig, } from "#app/config/global-config.ts";
|
|
5
5
|
import { resolveDefaultIdentityFile } from "#app/config/identity-file.ts";
|
|
6
|
-
import {
|
|
6
|
+
import { resolveDotweaveHomeDirectoryFromEnv } from "#app/config/runtime-env.ts";
|
|
7
7
|
import { createInitialSyncConfig, formatSyncConfig, parseSyncConfig, readSyncConfig, } from "#app/config/sync-schema.ts";
|
|
8
8
|
import { createAgeIdentityFile, readAgeRecipientsFromIdentityFile, writeAgeIdentityFile, } from "#app/lib/crypto.ts";
|
|
9
9
|
import { DotweaveError, wrapUnknownError } from "#app/lib/error.ts";
|
|
@@ -27,7 +27,7 @@ const normalizeRecipients = (recipients) => {
|
|
|
27
27
|
});
|
|
28
28
|
};
|
|
29
29
|
const resolveInitAgeBootstrap = async (request) => {
|
|
30
|
-
const identityFile = resolveDefaultIdentityFile(
|
|
30
|
+
const identityFile = resolveDefaultIdentityFile(resolveDotweaveHomeDirectoryFromEnv());
|
|
31
31
|
const explicitRecipients = normalizeRecipients(request.recipients);
|
|
32
32
|
if (request.ageIdentity !== undefined) {
|
|
33
33
|
const { recipient } = await writeAgeIdentityFile(identityFile, request.ageIdentity);
|
|
@@ -122,7 +122,7 @@ export const initializeSyncDirectory = async (request) => {
|
|
|
122
122
|
const context = resolveSyncConfigResolutionContext();
|
|
123
123
|
const resolvedConfigPath = await validateJsoncConfigPath(configPath);
|
|
124
124
|
const configExists = await pathExists(resolvedConfigPath);
|
|
125
|
-
const identityFile = resolveDefaultIdentityFile(
|
|
125
|
+
const identityFile = resolveDefaultIdentityFile(resolveDotweaveHomeDirectoryFromEnv());
|
|
126
126
|
const importingRepository = request.repository !== undefined && request.repository.trim() !== "";
|
|
127
127
|
if (importingRepository &&
|
|
128
128
|
request.ageIdentity === undefined &&
|
|
@@ -207,7 +207,7 @@ export const initializeSyncDirectory = async (request) => {
|
|
|
207
207
|
...(gitSource === undefined ? {} : { gitSource }),
|
|
208
208
|
generatedIdentity: ageBootstrap.generatedIdentity,
|
|
209
209
|
identityFile: age?.identityFile ??
|
|
210
|
-
resolveDefaultIdentityFile(
|
|
210
|
+
resolveDefaultIdentityFile(resolveDotweaveHomeDirectoryFromEnv()),
|
|
211
211
|
recipientCount: age?.recipients.length ?? 0,
|
|
212
212
|
};
|
|
213
213
|
}
|
|
@@ -224,7 +224,7 @@ export const initializeSyncDirectory = async (request) => {
|
|
|
224
224
|
gitAction,
|
|
225
225
|
...(gitSource === undefined ? {} : { gitSource }),
|
|
226
226
|
generatedIdentity: ageBootstrap.generatedIdentity,
|
|
227
|
-
identityFile: resolveDefaultIdentityFile(
|
|
227
|
+
identityFile: resolveDefaultIdentityFile(resolveDotweaveHomeDirectoryFromEnv()),
|
|
228
228
|
recipientCount: ageBootstrap.recipients.length,
|
|
229
229
|
};
|
|
230
230
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/services/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EACL,0BAA0B,EAE1B,wBAAwB,GACzB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/services/init.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"profile.d.ts","sourceRoot":"","sources":["../../src/services/profile.ts"],"names":[],"mappings":"AA0BA,MAAM,MAAM,iBAAiB,GAAG,QAAQ,CAAC;IACvC,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;CAC7B,CAAC,CAAC;AAEH,MAAM,MAAM,iBAAiB,GAAG,QAAQ,CAAC;IACvC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,MAAM,GAAG,QAAQ,CAAC;IACrC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,WAAW,EAAE,SAAS,iBAAiB,EAAE,CAAC;IAC1C,iBAAiB,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,kBAAkB,EAAE,OAAO,CAAC;IAC5B,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC,CAAC;AAEH,MAAM,MAAM,mBAAmB,GAAG,QAAQ,CAAC;IACzC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,OAAO,GAAG,KAAK,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC,CAAC;AAEH,MAAM,MAAM,2BAA2B,GAAG,QAAQ,CAAC;IACjD,MAAM,EAAE,OAAO,GAAG,SAAS,CAAC;IAC5B,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC,CAAC;AAEH,KAAK,qBAAqB,GAAG,QAAQ,CAAC;IACpC,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC,CAAC;AAEH,KAAK,oBAAoB,GAAG,QAAQ,CAAC;IACnC,MAAM,EAAE,UAAU,GAAG,WAAW,CAAC;IACjC,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;CAC7B,CAAC,CAAC;AA6CH,eAAO,MAAM,YAAY,QAAa,OAAO,CAAC,iBAAiB,
|
|
1
|
+
{"version":3,"file":"profile.d.ts","sourceRoot":"","sources":["../../src/services/profile.ts"],"names":[],"mappings":"AA0BA,MAAM,MAAM,iBAAiB,GAAG,QAAQ,CAAC;IACvC,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;CAC7B,CAAC,CAAC;AAEH,MAAM,MAAM,iBAAiB,GAAG,QAAQ,CAAC;IACvC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,MAAM,GAAG,QAAQ,CAAC;IACrC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,WAAW,EAAE,SAAS,iBAAiB,EAAE,CAAC;IAC1C,iBAAiB,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,kBAAkB,EAAE,OAAO,CAAC;IAC5B,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC,CAAC;AAEH,MAAM,MAAM,mBAAmB,GAAG,QAAQ,CAAC;IACzC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,OAAO,GAAG,KAAK,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC,CAAC;AAEH,MAAM,MAAM,2BAA2B,GAAG,QAAQ,CAAC;IACjD,MAAM,EAAE,OAAO,GAAG,SAAS,CAAC;IAC5B,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC,CAAC;AAEH,KAAK,qBAAqB,GAAG,QAAQ,CAAC;IACpC,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC,CAAC;AAEH,KAAK,oBAAoB,GAAG,QAAQ,CAAC;IACnC,MAAM,EAAE,UAAU,GAAG,WAAW,CAAC;IACjC,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;CAC7B,CAAC,CAAC;AA6CH,eAAO,MAAM,YAAY,QAAa,OAAO,CAAC,iBAAiB,CAoC9D,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAC3B,SAAS,MAAM,KACd,OAAO,CAAC,mBAAmB,CA2B7B,CAAC;AAEF,eAAO,MAAM,UAAU,GACrB,SAAS,MAAM,KACd,OAAO,CAAC,2BAA2B,CA0BrC,CAAC;AAEF,eAAO,MAAM,aAAa,GACxB,SAAS,MAAM,KACd,OAAO,CAAC,2BAA2B,CAmDrC,CAAC;AAEF,eAAO,MAAM,kBAAkB,QAAa,OAAO,CAAC,mBAAmB,CAgBtE,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAChC,UAAU,SAAS,MAAM,EAAE,KAC1B,OAAO,CAAC,SAAS,MAAM,EAAE,CAG3B,CAAC;AAEF,eAAO,MAAM,cAAc,GACzB,SAAS,qBAAqB,EAC9B,KAAK,MAAM,KACV,OAAO,CAAC,oBAAoB,CA+D9B,CAAC"}
|
package/dist/services/profile.js
CHANGED
|
@@ -41,14 +41,14 @@ export const listProfiles = async () => {
|
|
|
41
41
|
readSyncConfig(syncDirectory, context),
|
|
42
42
|
]);
|
|
43
43
|
const availableProfiles = availableProfilesForConfig(syncConfig);
|
|
44
|
-
const activeProfile = globalConfig?.activeProfile;
|
|
45
|
-
const activeProfileWarning =
|
|
44
|
+
const activeProfile = globalConfig?.activeProfile ?? AppConstants.SYNC.DEFAULT_PROFILE;
|
|
45
|
+
const activeProfileWarning = !availableProfiles.includes(activeProfile)
|
|
46
46
|
? `Active profile '${activeProfile}' is not registered in ${AppConstants.SYNC.CONFIG_FILE_NAME}.`
|
|
47
47
|
: undefined;
|
|
48
48
|
return {
|
|
49
|
-
|
|
49
|
+
activeProfile,
|
|
50
50
|
...(activeProfileWarning === undefined ? {} : { activeProfileWarning }),
|
|
51
|
-
activeProfileMode: activeProfile === undefined ? "none" : "single",
|
|
51
|
+
activeProfileMode: globalConfig?.activeProfile === undefined ? "none" : "single",
|
|
52
52
|
assignments: syncConfig.entries
|
|
53
53
|
.filter((entry) => entry.profilesExplicit && entry.profiles.length > 0)
|
|
54
54
|
.map((entry) => ({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"profile.js","sourceRoot":"","sources":["../../src/services/profile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EACL,0BAA0B,EAC1B,eAAe,EACf,wBAAwB,EACxB,6BAA6B,GAC9B,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,wBAAwB,EAExB,cAAc,GACf,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EACL,uBAAuB,EACvB,wBAAwB,GACzB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,sBAAsB,EACtB,kCAAkC,EAClC,gBAAgB,GACjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AA0CtD,MAAM,0BAA0B,GAAG,CACjC,MAA4C,EAC5C,EAAE,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,CAAC;AAErE,MAAM,cAAc,GAAG,CACrB,MAA4C,EAC5C,OAAe,EACf,EAAE;IACF,OAAO,0BAA0B,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;AAC9D,CAAC,CAAC;AAEF,MAAM,yBAAyB,GAAG,CAAC,OAAe,EAAE,EAAE,CACpD,IAAI,aAAa,CAAC,oBAAoB,OAAO,IAAI,EAAE;IACjD,IAAI,EAAE,iBAAiB;IACvB,IAAI,EAAE,qCAAqC,OAAO,mCAAmC;CACtF,CAAC,CAAC;AAEL,MAAM,wBAAwB,GAAG,CAAC,OAAe,EAAE,MAAc,EAAE,EAAE;IACnE,IAAI,OAAO,KAAK,YAAY,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC;QAClD,MAAM,IAAI,aAAa,CAAC,UAAU,MAAM,gCAAgC,EAAE;YACxE,IAAI,EAAE,0BAA0B;YAChC,IAAI,EAAE,QAAQ,YAAY,CAAC,IAAI,CAAC,eAAe,wCAAwC;SACxF,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,gCAAgC,GAAG,CACvC,QAA2B,EAC3B,MAA4C,EAC5C,EAAE;IACF,MAAM,kBAAkB,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAClD,wBAAwB,CAAC,OAAO,CAAC,CAClC,CAAC;IAEF,KAAK,MAAM,OAAO,IAAI,kBAAkB,EAAE,CAAC;QACzC,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;YACrC,MAAM,yBAAyB,CAAC,OAAO,CAAC,CAAC;QAC3C,CAAC;IACH,CAAC;IAED,OAAO,kBAAkB,CAAC;AAC5B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,IAAgC,EAAE;IACjE,MAAM,EAAE,aAAa,EAAE,gBAAgB,EAAE,GAAG,gBAAgB,EAAE,CAAC;IAC/D,MAAM,OAAO,GAAG,kCAAkC,EAAE,CAAC;IAErD,MAAM,oBAAoB,CAAC,aAAa,CAAC,CAAC;IAE1C,MAAM,CAAC,YAAY,EAAE,UAAU,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACnD,wBAAwB,CAAC,gBAAgB,CAAC;QAC1C,cAAc,CAAC,aAAa,EAAE,OAAO,CAAC;KACvC,CAAC,CAAC;IACH,MAAM,iBAAiB,GAAG,0BAA0B,CAAC,UAAU,CAAC,CAAC;IACjE,MAAM,aAAa,
|
|
1
|
+
{"version":3,"file":"profile.js","sourceRoot":"","sources":["../../src/services/profile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EACL,0BAA0B,EAC1B,eAAe,EACf,wBAAwB,EACxB,6BAA6B,GAC9B,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,wBAAwB,EAExB,cAAc,GACf,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EACL,uBAAuB,EACvB,wBAAwB,GACzB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,sBAAsB,EACtB,kCAAkC,EAClC,gBAAgB,GACjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AA0CtD,MAAM,0BAA0B,GAAG,CACjC,MAA4C,EAC5C,EAAE,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,CAAC;AAErE,MAAM,cAAc,GAAG,CACrB,MAA4C,EAC5C,OAAe,EACf,EAAE;IACF,OAAO,0BAA0B,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;AAC9D,CAAC,CAAC;AAEF,MAAM,yBAAyB,GAAG,CAAC,OAAe,EAAE,EAAE,CACpD,IAAI,aAAa,CAAC,oBAAoB,OAAO,IAAI,EAAE;IACjD,IAAI,EAAE,iBAAiB;IACvB,IAAI,EAAE,qCAAqC,OAAO,mCAAmC;CACtF,CAAC,CAAC;AAEL,MAAM,wBAAwB,GAAG,CAAC,OAAe,EAAE,MAAc,EAAE,EAAE;IACnE,IAAI,OAAO,KAAK,YAAY,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC;QAClD,MAAM,IAAI,aAAa,CAAC,UAAU,MAAM,gCAAgC,EAAE;YACxE,IAAI,EAAE,0BAA0B;YAChC,IAAI,EAAE,QAAQ,YAAY,CAAC,IAAI,CAAC,eAAe,wCAAwC;SACxF,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,gCAAgC,GAAG,CACvC,QAA2B,EAC3B,MAA4C,EAC5C,EAAE;IACF,MAAM,kBAAkB,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAClD,wBAAwB,CAAC,OAAO,CAAC,CAClC,CAAC;IAEF,KAAK,MAAM,OAAO,IAAI,kBAAkB,EAAE,CAAC;QACzC,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;YACrC,MAAM,yBAAyB,CAAC,OAAO,CAAC,CAAC;QAC3C,CAAC;IACH,CAAC;IAED,OAAO,kBAAkB,CAAC;AAC5B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,IAAgC,EAAE;IACjE,MAAM,EAAE,aAAa,EAAE,gBAAgB,EAAE,GAAG,gBAAgB,EAAE,CAAC;IAC/D,MAAM,OAAO,GAAG,kCAAkC,EAAE,CAAC;IAErD,MAAM,oBAAoB,CAAC,aAAa,CAAC,CAAC;IAE1C,MAAM,CAAC,YAAY,EAAE,UAAU,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACnD,wBAAwB,CAAC,gBAAgB,CAAC;QAC1C,cAAc,CAAC,aAAa,EAAE,OAAO,CAAC;KACvC,CAAC,CAAC;IACH,MAAM,iBAAiB,GAAG,0BAA0B,CAAC,UAAU,CAAC,CAAC;IACjE,MAAM,aAAa,GACjB,YAAY,EAAE,aAAa,IAAI,YAAY,CAAC,IAAI,CAAC,eAAe,CAAC;IACnE,MAAM,oBAAoB,GAAG,CAAC,iBAAiB,CAAC,QAAQ,CAAC,aAAa,CAAC;QACrE,CAAC,CAAC,mBAAmB,aAAa,0BAA0B,YAAY,CAAC,IAAI,CAAC,gBAAgB,GAAG;QACjG,CAAC,CAAC,SAAS,CAAC;IAEd,OAAO;QACL,aAAa;QACb,GAAG,CAAC,oBAAoB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,oBAAoB,EAAE,CAAC;QACvE,iBAAiB,EACf,YAAY,EAAE,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ;QAC/D,WAAW,EAAE,UAAU,CAAC,OAAO;aAC5B,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,gBAAgB,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;aACtE,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YACf,cAAc,EAAE,KAAK,CAAC,SAAS;YAC/B,aAAa,EAAE,KAAK,CAAC,QAAQ;YAC7B,QAAQ,EAAE,KAAK,CAAC,QAAQ;SACzB,CAAC,CAAC;aACF,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CACpB,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,KAAK,CAAC,aAAa,CAAC,CACtD;QACH,iBAAiB;QACjB,kBAAkB,EAAE,YAAY,KAAK,SAAS;QAC9C,gBAAgB;KACjB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EACnC,OAAe,EACe,EAAE;IAChC,MAAM,iBAAiB,GAAG,wBAAwB,CAAC,OAAO,CAAC,CAAC;IAC5D,MAAM,EAAE,aAAa,EAAE,gBAAgB,EAAE,GAAG,gBAAgB,EAAE,CAAC;IAC/D,MAAM,OAAO,GAAG,kCAAkC,EAAE,CAAC;IAErD,MAAM,oBAAoB,CAAC,aAAa,CAAC,CAAC;IAE1C,MAAM,UAAU,GAAG,MAAM,cAAc,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;IAEhE,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,iBAAiB,CAAC,EAAE,CAAC;QACnD,MAAM,yBAAyB,CAAC,iBAAiB,CAAC,CAAC;IACrD,CAAC;IAED,MAAM,uBAAuB,CAC3B,gBAAgB,EAChB,0BAA0B,CAAC;QACzB,aAAa,EAAE,iBAAiB;QAChC,OAAO,EAAE,YAAY,CAAC,aAAa,CAAC,eAAe;KACpD,CAAC,CACH,CAAC;IAEF,OAAO;QACL,aAAa,EAAE,iBAAiB;QAChC,gBAAgB;QAChB,MAAM,EAAE,KAAK;QACb,OAAO,EAAE,iBAAiB;KAC3B,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,UAAU,GAAG,KAAK,EAC7B,OAAe,EACuB,EAAE;IACxC,MAAM,iBAAiB,GAAG,wBAAwB,CAAC,OAAO,CAAC,CAAC;IAC5D,wBAAwB,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC;IAEnD,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,sBAAsB,EAAE,CAAC;IAEjE,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACxD,MAAM,IAAI,aAAa,CAAC,YAAY,iBAAiB,mBAAmB,EAAE;YACxE,IAAI,EAAE,wBAAwB;YAC9B,IAAI,EAAE,kCAAkC;SACzC,CAAC,CAAC;IACL,CAAC;IAED,MAAM,UAAU,GAAG,uBAAuB,CAAC;QACzC,GAAG,MAAM;QACT,QAAQ,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,EAAE,iBAAiB,CAAC,CAAC,IAAI,CAC5D,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAC3C;KACF,CAAC,CAAC;IAEH,MAAM,wBAAwB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;IAE1D,OAAO;QACL,MAAM,EAAE,OAAO;QACf,OAAO,EAAE,iBAAiB;KAC3B,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAChC,OAAe,EACuB,EAAE;IACxC,MAAM,iBAAiB,GAAG,wBAAwB,CAAC,OAAO,CAAC,CAAC;IAC5D,wBAAwB,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAC;IAEtD,MAAM,EAAE,gBAAgB,EAAE,GAAG,gBAAgB,EAAE,CAAC;IAChD,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,sBAAsB,EAAE,CAAC;IAEjE,IAAI,CAAC,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACzD,MAAM,yBAAyB,CAAC,iBAAiB,CAAC,CAAC;IACrD,CAAC;IAED,MAAM,YAAY,GAAG,MAAM,wBAAwB,CAAC,gBAAgB,CAAC,CAAC;IACtE,MAAM,aAAa,GAAG,6BAA6B,CAAC,YAAY,CAAC,CAAC;IAElE,IAAI,eAAe,CAAC,aAAa,EAAE,iBAAiB,CAAC,EAAE,CAAC;QACtD,MAAM,IAAI,aAAa,CACrB,iCAAiC,iBAAiB,IAAI,EACtD;YACE,IAAI,EAAE,gBAAgB;YACtB,IAAI,EAAE,oGAAoG;SAC3G,CACF,CAAC;IACJ,CAAC;IAED,MAAM,kBAAkB,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CACzD,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAC3C,CAAC;IAEF,IAAI,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAClC,MAAM,UAAU,GAAG,kBAAkB,CAAC,MAAM,CAAC;QAC7C,MAAM,IAAI,aAAa,CACrB,0BAA0B,iBAAiB,uCAAuC,UAAU,SAAS,UAAU,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,GAAG,EAC9I;YACE,IAAI,EAAE,gBAAgB;YACtB,OAAO,EAAE,kBAAkB,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,KAAK,CAAC,QAAQ,EAAE,CAAC;YACtE,IAAI,EAAE,gFAAgF;SACvF,CACF,CAAC;IACJ,CAAC;IAED,MAAM,UAAU,GAAG,uBAAuB,CAAC;QACzC,GAAG,MAAM;QACT,QAAQ,EAAE,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,iBAAiB,CAAC;KACzE,CAAC,CAAC;IAEH,MAAM,wBAAwB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;IAE1D,OAAO;QACL,MAAM,EAAE,SAAS;QACjB,OAAO,EAAE,iBAAiB;KAC3B,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,IAAkC,EAAE;IACzE,MAAM,EAAE,aAAa,EAAE,gBAAgB,EAAE,GAAG,gBAAgB,EAAE,CAAC;IAE/D,MAAM,oBAAoB,CAAC,aAAa,CAAC,CAAC;IAE1C,MAAM,uBAAuB,CAC3B,gBAAgB,EAChB,0BAA0B,CAAC;QACzB,OAAO,EAAE,YAAY,CAAC,aAAa,CAAC,eAAe;KACpD,CAAC,CACH,CAAC;IAEF,OAAO;QACL,gBAAgB;QAChB,MAAM,EAAE,OAAO;KAChB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAG,KAAK,EACxC,QAA2B,EACC,EAAE;IAC9B,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,sBAAsB,EAAE,CAAC;IAClD,OAAO,gCAAgC,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;AAC5D,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EACjC,OAA8B,EAC9B,GAAW,EACoB,EAAE;IACjC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IAErC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,MAAM,IAAI,aAAa,CAAC,0BAA0B,EAAE;YAClD,IAAI,EAAE,iBAAiB;YACvB,IAAI,EAAE,wGAAwG;SAC/G,CAAC,CAAC;IACL,CAAC;IAED,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,MAAM,sBAAsB,EAAE,CAAC;IAC1E,MAAM,KAAK,GAAG,mBAAmB,CAC/B,MAAM,EACN,MAAM,CAAC,OAAO,EACd,GAAG,EACH,OAAO,CAAC,aAAa,CACtB,CAAC;IAEF,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxB,MAAM,IAAI,aAAa,CAAC,kCAAkC,MAAM,EAAE,EAAE;YAClE,IAAI,EAAE,oBAAoB;YAC1B,IAAI,EAAE,6CAA6C;SACpD,CAAC,CAAC;IACL,CAAC;IAED,MAAM,kBAAkB,GAAG,gCAAgC,CACzD,OAAO,CAAC,QAAQ,EAChB,MAAM,CACP,CAAC;IAEF,IACE,KAAK,CAAC,QAAQ,CAAC,MAAM,KAAK,kBAAkB,CAAC,MAAM;QACnD,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAC3D,CAAC;QACD,OAAO;YACL,MAAM,EAAE,WAAW;YACnB,aAAa,EAAE,KAAK,CAAC,QAAQ;YAC7B,QAAQ,EAAE,kBAAkB;SAC7B,CAAC;IACJ,CAAC;IAED,MAAM,UAAU,GAAG,uBAAuB,CAAC;QACzC,GAAG,MAAM;QACT,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YAChC,IAAI,CAAC,CAAC,QAAQ,KAAK,KAAK,CAAC,QAAQ,EAAE,CAAC;gBAClC,OAAO,CAAC,CAAC;YACX,CAAC;YAED,OAAO;gBACL,GAAG,CAAC;gBACJ,QAAQ,EAAE,kBAAkB;gBAC5B,gBAAgB,EAAE,kBAAkB,CAAC,MAAM,GAAG,CAAC;aAChD,CAAC;QACJ,CAAC,CAAC;KACH,CAAC,CAAC;IAEH,MAAM,wBAAwB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;IAE1D,OAAO;QACL,MAAM,EAAE,UAAU;QAClB,aAAa,EAAE,KAAK,CAAC,QAAQ;QAC7B,QAAQ,EAAE,kBAAkB;KAC7B,CAAC;AACJ,CAAC,CAAC"}
|
package/dist/services/push.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { ResolvedSyncConfig } from "#app/config/sync-schema.ts";
|
|
1
2
|
import { type SnapshotNode } from "./local-snapshot.ts";
|
|
2
3
|
import { type RepoArtifact } from "./repo-artifacts.ts";
|
|
3
4
|
import { type EffectiveSyncConfig } from "./sync-context.ts";
|
|
@@ -16,9 +17,11 @@ export type PushResult = Readonly<{
|
|
|
16
17
|
export type PushPlan = Readonly<{
|
|
17
18
|
artifacts: readonly RepoArtifact[];
|
|
18
19
|
counts: ReturnType<typeof buildPushCounts>;
|
|
20
|
+
deletedArtifactKeys?: ReadonlySet<string>;
|
|
19
21
|
deletedArtifactCount: number;
|
|
20
22
|
desiredArtifactKeys: ReadonlySet<string>;
|
|
21
23
|
existingArtifactKeys: ReadonlySet<string>;
|
|
24
|
+
staleReplacementDirectoryRoots?: readonly string[];
|
|
22
25
|
snapshot: ReadonlyMap<string, SnapshotNode>;
|
|
23
26
|
}>;
|
|
24
27
|
declare const buildPushCounts: (snapshot: ReadonlyMap<string, SnapshotNode>) => {
|
|
@@ -27,7 +30,7 @@ declare const buildPushCounts: (snapshot: ReadonlyMap<string, SnapshotNode>) =>
|
|
|
27
30
|
plainFileCount: number;
|
|
28
31
|
symlinkCount: number;
|
|
29
32
|
};
|
|
30
|
-
export declare const buildPushPlan: (config: EffectiveSyncConfig, syncDirectory: string) => Promise<PushPlan>;
|
|
33
|
+
export declare const buildPushPlan: (config: EffectiveSyncConfig, syncDirectory: string, ownershipConfig?: Pick<ResolvedSyncConfig, "entries" | "profiles">) => Promise<PushPlan>;
|
|
31
34
|
export declare const buildPushPlanPreview: (plan: PushPlan) => string[];
|
|
32
35
|
export declare const buildPushResultFromPlan: (plan: PushPlan, dryRun: boolean) => PushResult;
|
|
33
36
|
export declare const pushChanges: (request: PushRequest) => Promise<PushResult>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"push.d.ts","sourceRoot":"","sources":["../../src/services/push.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"push.d.ts","sourceRoot":"","sources":["../../src/services/push.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAIrE,OAAO,EAAsB,KAAK,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAC5E,OAAO,EAOL,KAAK,YAAY,EAIlB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,mBAAmB,EAGzB,MAAM,mBAAmB,CAAC;AAE3B,MAAM,MAAM,WAAW,GAAG,QAAQ,CAAC;IACjC,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC,CAAC;AAEH,MAAM,MAAM,UAAU,GAAG,QAAQ,CAAC;IAChC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,OAAO,CAAC;IAChB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC,CAAC;AAEH,MAAM,MAAM,QAAQ,GAAG,QAAQ,CAAC;IAC9B,SAAS,EAAE,SAAS,YAAY,EAAE,CAAC;IACnC,MAAM,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC;IAC3C,mBAAmB,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC1C,oBAAoB,EAAE,MAAM,CAAC;IAC7B,mBAAmB,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACzC,oBAAoB,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC1C,8BAA8B,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACnD,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;CAC7C,CAAC,CAAC;AAEH,QAAA,MAAM,eAAe,GAAI,UAAU,WAAW,CAAC,MAAM,EAAE,YAAY,CAAC;;;;;CA8BnE,CAAC;AAEF,eAAO,MAAM,aAAa,GACxB,QAAQ,mBAAmB,EAC3B,eAAe,MAAM,EACrB,kBAAiB,IAAI,CAAC,kBAAkB,EAAE,SAAS,GAAG,UAAU,CAAU,KACzE,OAAO,CAAC,QAAQ,CAiDlB,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAI,MAAM,QAAQ,aAkBlD,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAClC,MAAM,QAAQ,EACd,QAAQ,OAAO,KACd,UAMF,CAAC;AAoEF,eAAO,MAAM,WAAW,GACtB,SAAS,WAAW,KACnB,OAAO,CAAC,UAAU,CA4CpB,CAAC"}
|
package/dist/services/push.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { join } from "node:path";
|
|
2
2
|
import { AppConstants } from "#app/config/constants.ts";
|
|
3
|
-
import { removePathAtomically } from "#app/lib/filesystem.ts";
|
|
3
|
+
import { getPathStats, removePathAtomically } from "#app/lib/filesystem.ts";
|
|
4
4
|
import { requireGitRepository } from "#app/lib/git.ts";
|
|
5
5
|
import { limitConcurrency } from "#app/lib/promise.ts";
|
|
6
6
|
import { buildLocalSnapshot } from "./local-snapshot.js";
|
|
7
|
-
import { buildArtifactKey, buildRepoArtifacts, collectExistingArtifactKeys, writeArtifactsToDirectory, } from "./repo-artifacts.js";
|
|
7
|
+
import { buildArtifactKey, buildRepoArtifacts, collectArtifactLeafKeys, collectExistingArtifactKeys, nearestEntryOwnsArtifact, parseArtifactRelativePath, resolveArtifactLogicalPath, resolveArtifactRelativePath, writeArtifactsToDirectory, } from "./repo-artifacts.js";
|
|
8
8
|
import { loadSyncConfig, resolveSyncPaths, } from "./sync-context.js";
|
|
9
9
|
const buildPushCounts = (snapshot) => {
|
|
10
10
|
let directoryCount = 0;
|
|
@@ -34,34 +34,53 @@ const buildPushCounts = (snapshot) => {
|
|
|
34
34
|
symlinkCount,
|
|
35
35
|
};
|
|
36
36
|
};
|
|
37
|
-
export const buildPushPlan = async (config, syncDirectory) => {
|
|
37
|
+
export const buildPushPlan = async (config, syncDirectory, ownershipConfig = config) => {
|
|
38
38
|
const snapshot = await buildLocalSnapshot(config);
|
|
39
39
|
const artifacts = await buildRepoArtifacts(snapshot, config);
|
|
40
|
-
const
|
|
41
|
-
return buildArtifactKey(artifact);
|
|
40
|
+
const artifactKeyPairs = artifacts.map((artifact) => {
|
|
41
|
+
return { artifact, key: buildArtifactKey(artifact) };
|
|
42
|
+
});
|
|
43
|
+
const desiredArtifactKeys = new Set(artifactKeyPairs.map(({ key }) => {
|
|
44
|
+
return key;
|
|
42
45
|
}));
|
|
43
|
-
const existingArtifactKeys = await collectExistingArtifactKeys(syncDirectory, config);
|
|
44
|
-
const
|
|
46
|
+
const existingArtifactKeys = await collectExistingArtifactKeys(syncDirectory, config, ownershipConfig);
|
|
47
|
+
const staleArtifactKeys = [...existingArtifactKeys].filter((key) => {
|
|
45
48
|
return !desiredArtifactKeys.has(key);
|
|
46
|
-
})
|
|
49
|
+
});
|
|
50
|
+
const staleArtifactKeySet = new Set(staleArtifactKeys);
|
|
51
|
+
const replacementPlan = await collectStaleReplacementDirectoryRoots(syncDirectory, artifacts, staleArtifactKeySet, ownershipConfig);
|
|
52
|
+
const writableArtifacts = artifactKeyPairs.flatMap(({ artifact, key }) => {
|
|
53
|
+
return replacementPlan.protectedArtifactKeys.has(key) ? [] : [artifact];
|
|
54
|
+
});
|
|
55
|
+
const writableArtifactKeys = new Set(writableArtifacts.map((artifact) => {
|
|
56
|
+
return buildArtifactKey(artifact);
|
|
57
|
+
}));
|
|
58
|
+
const deletedArtifactKeys = new Set([
|
|
59
|
+
...staleArtifactKeys,
|
|
60
|
+
...replacementPlan.deletedArtifactKeys,
|
|
61
|
+
]);
|
|
47
62
|
return {
|
|
48
|
-
artifacts,
|
|
63
|
+
artifacts: writableArtifacts,
|
|
49
64
|
counts: buildPushCounts(snapshot),
|
|
50
|
-
deletedArtifactCount,
|
|
51
|
-
|
|
65
|
+
deletedArtifactCount: deletedArtifactKeys.size,
|
|
66
|
+
deletedArtifactKeys,
|
|
67
|
+
desiredArtifactKeys: writableArtifactKeys,
|
|
52
68
|
existingArtifactKeys,
|
|
69
|
+
staleReplacementDirectoryRoots: replacementPlan.roots,
|
|
53
70
|
snapshot,
|
|
54
71
|
};
|
|
55
72
|
};
|
|
56
73
|
export const buildPushPlanPreview = (plan) => {
|
|
57
|
-
const createdOrUpdated = [
|
|
74
|
+
const createdOrUpdated = [
|
|
75
|
+
...new Set(plan.artifacts.map((artifact) => artifact.repoPath)),
|
|
76
|
+
].sort((left, right) => {
|
|
58
77
|
return left.localeCompare(right);
|
|
59
78
|
});
|
|
60
|
-
const
|
|
61
|
-
.filter((key) => {
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
79
|
+
const deletedArtifactKeys = plan.deletedArtifactKeys ??
|
|
80
|
+
new Set([...plan.existingArtifactKeys].filter((key) => {
|
|
81
|
+
return !plan.desiredArtifactKeys.has(key);
|
|
82
|
+
}));
|
|
83
|
+
const deleted = [...deletedArtifactKeys].sort((left, right) => {
|
|
65
84
|
return left.localeCompare(right);
|
|
66
85
|
});
|
|
67
86
|
return [...createdOrUpdated.slice(0, 4), ...deleted.slice(0, 4)].slice(0, 6);
|
|
@@ -73,22 +92,62 @@ export const buildPushResultFromPlan = (plan, dryRun) => {
|
|
|
73
92
|
...plan.counts,
|
|
74
93
|
};
|
|
75
94
|
};
|
|
95
|
+
const collectStaleReplacementDirectoryRoots = async (syncDirectory, artifacts, staleArtifactKeys, ownershipConfig) => {
|
|
96
|
+
const roots = [];
|
|
97
|
+
const deletedArtifactKeys = new Set();
|
|
98
|
+
const protectedArtifactKeys = new Set();
|
|
99
|
+
for (const artifact of artifacts) {
|
|
100
|
+
if (artifact.kind === "directory") {
|
|
101
|
+
continue;
|
|
102
|
+
}
|
|
103
|
+
const relativePath = resolveArtifactRelativePath(artifact);
|
|
104
|
+
const logicalPath = resolveArtifactLogicalPath(artifact);
|
|
105
|
+
const artifactPath = join(syncDirectory, ...relativePath.split("/"));
|
|
106
|
+
const stats = await getPathStats(artifactPath);
|
|
107
|
+
if (stats?.isDirectory() !== true) {
|
|
108
|
+
continue;
|
|
109
|
+
}
|
|
110
|
+
const parsedRoot = parseArtifactRelativePath(relativePath);
|
|
111
|
+
const inactiveDirectoryOwner = nearestEntryOwnsArtifact(ownershipConfig.entries, parsedRoot, "directory");
|
|
112
|
+
if (inactiveDirectoryOwner) {
|
|
113
|
+
protectedArtifactKeys.add(buildArtifactKey(artifact));
|
|
114
|
+
continue;
|
|
115
|
+
}
|
|
116
|
+
const leafKeys = new Set();
|
|
117
|
+
await collectArtifactLeafKeys(artifactPath, leafKeys, logicalPath, undefined, true);
|
|
118
|
+
if (leafKeys.size === 0) {
|
|
119
|
+
roots.push(relativePath);
|
|
120
|
+
deletedArtifactKeys.add(`${logicalPath}/`);
|
|
121
|
+
continue;
|
|
122
|
+
}
|
|
123
|
+
if ([...leafKeys].every((leafKey) => {
|
|
124
|
+
return staleArtifactKeys.has(leafKey);
|
|
125
|
+
})) {
|
|
126
|
+
roots.push(relativePath);
|
|
127
|
+
continue;
|
|
128
|
+
}
|
|
129
|
+
protectedArtifactKeys.add(buildArtifactKey(artifact));
|
|
130
|
+
}
|
|
131
|
+
return { deletedArtifactKeys, protectedArtifactKeys, roots };
|
|
132
|
+
};
|
|
76
133
|
export const pushChanges = async (request) => {
|
|
77
134
|
const { syncDirectory } = resolveSyncPaths();
|
|
78
135
|
await requireGitRepository(syncDirectory);
|
|
79
|
-
const { effectiveConfig: config } = await loadSyncConfig(syncDirectory, {
|
|
136
|
+
const { effectiveConfig: config, fullConfig } = await loadSyncConfig(syncDirectory, {
|
|
80
137
|
...(request.profile === undefined ? {} : { profile: request.profile }),
|
|
81
138
|
});
|
|
82
|
-
const plan = await buildPushPlan(config, syncDirectory);
|
|
139
|
+
const plan = await buildPushPlan(config, syncDirectory, fullConfig);
|
|
83
140
|
if (!request.dryRun) {
|
|
84
|
-
|
|
85
|
-
|
|
141
|
+
await limitConcurrency(AppConstants.SYNC.DEFAULT_CONCURRENCY, plan.staleReplacementDirectoryRoots ?? [], async (relativePath) => {
|
|
142
|
+
await removePathAtomically(join(syncDirectory, ...relativePath.split("/")));
|
|
86
143
|
});
|
|
87
|
-
await limitConcurrency(AppConstants.SYNC.DEFAULT_CONCURRENCY,
|
|
144
|
+
await limitConcurrency(AppConstants.SYNC.DEFAULT_CONCURRENCY, [...plan.existingArtifactKeys].filter((key) => {
|
|
145
|
+
return !plan.desiredArtifactKeys.has(key);
|
|
146
|
+
}), async (staleKey) => {
|
|
88
147
|
const relativePath = staleKey.endsWith("/")
|
|
89
148
|
? staleKey.slice(0, -1)
|
|
90
149
|
: staleKey;
|
|
91
|
-
await removePathAtomically(join(syncDirectory, ...relativePath.split("/")));
|
|
150
|
+
await removePathAtomically(join(syncDirectory, "profiles", ...relativePath.split("/")));
|
|
92
151
|
});
|
|
93
152
|
await writeArtifactsToDirectory(syncDirectory, plan.artifacts, config.age);
|
|
94
153
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"push.js","sourceRoot":"","sources":["../../src/services/push.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"push.js","sourceRoot":"","sources":["../../src/services/push.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,11 @@
|
|
|
1
|
-
import { type ResolvedSyncConfigEntry } from "#app/config/sync-schema.ts";
|
|
1
|
+
import { type ResolvedSyncConfig, type ResolvedSyncConfigEntry } from "#app/config/sync-schema.ts";
|
|
2
2
|
import type { SnapshotNode } from "./local-snapshot.ts";
|
|
3
3
|
import type { EffectiveSyncConfig } from "./sync-context.ts";
|
|
4
4
|
type ArtifactConfig = EffectiveSyncConfig;
|
|
5
|
-
export declare const collectArtifactProfiles: (
|
|
5
|
+
export declare const collectArtifactProfiles: (configOrEntries: readonly Pick<ResolvedSyncConfigEntry, "profiles">[] | Pick<ResolvedSyncConfig, "entries" | "profiles">) => Set<string>;
|
|
6
|
+
export declare const readCommittedProfileRegistry: (syncDirectory: string) => Promise<Set<string> | undefined>;
|
|
7
|
+
export declare const nearestEntryOwnsArtifact: (entries: readonly Pick<ResolvedSyncConfigEntry, "configuredRepoPath" | "kind" | "profiles" | "repoPath">[], artifact: ReturnType<typeof parseArtifactRelativePath>, artifactKind: "directory" | "file") => boolean;
|
|
8
|
+
export declare const entryOwnsArtifact: (entry: Pick<ResolvedSyncConfigEntry, "configuredRepoPath" | "kind" | "profiles" | "repoPath">, artifact: ReturnType<typeof parseArtifactRelativePath>) => boolean;
|
|
6
9
|
export type RepoArtifact = Readonly<{
|
|
7
10
|
category: "plain";
|
|
8
11
|
kind: "directory";
|
|
@@ -30,6 +33,7 @@ export type RepoArtifact = Readonly<{
|
|
|
30
33
|
executable: boolean;
|
|
31
34
|
}>;
|
|
32
35
|
export declare const buildArtifactKey: (artifact: RepoArtifact) => string;
|
|
36
|
+
export declare const resolveArtifactLogicalPath: (artifact: Pick<RepoArtifact, "category" | "profile" | "repoPath">) => string;
|
|
33
37
|
export declare const isSecretArtifactPath: (relativePath: string) => boolean;
|
|
34
38
|
export declare const stripSecretArtifactSuffix: (relativePath: string) => string | undefined;
|
|
35
39
|
export declare const assertStorageSafeRepoPath: (repoPath: string) => void;
|
|
@@ -40,7 +44,8 @@ export declare const parseArtifactRelativePath: (relativePath: string) => {
|
|
|
40
44
|
secret: boolean;
|
|
41
45
|
};
|
|
42
46
|
export declare const buildRepoArtifacts: (snapshot: ReadonlyMap<string, SnapshotNode>, config: ArtifactConfig) => Promise<RepoArtifact[]>;
|
|
43
|
-
export declare const
|
|
47
|
+
export declare const collectArtifactLeafKeys: (rootDirectory: string, keys: Set<string>, prefix?: string, onKey?: (key: string) => void, includeEmptyDirectories?: boolean) => Promise<void>;
|
|
48
|
+
export declare const collectExistingArtifactKeys: (syncDirectory: string, config: ArtifactConfig, ownershipConfig?: Pick<ResolvedSyncConfig, "entries" | "profiles">) => Promise<Set<string>>;
|
|
44
49
|
type AgeWriteConfig = Readonly<{
|
|
45
50
|
identityFile: string;
|
|
46
51
|
recipients: readonly string[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repo-artifacts.d.ts","sourceRoot":"","sources":["../../src/services/repo-artifacts.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"repo-artifacts.d.ts","sourceRoot":"","sources":["../../src/services/repo-artifacts.ts"],"names":[],"mappings":"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"}
|