@tinyrack/dotweave 0.42.13 → 0.42.21

package/dist/services/profile.js

@@ -1,25 +1,54 @@
-import { CONSTANTS } from "#app/config/constants.ts";
-import { formatGlobalDotweaveConfig, readGlobalDotweaveConfig, } from "#app/config/global-config.ts";
-import { collectAllProfileNames, normalizeSyncProfileName, readSyncConfig, } from "#app/config/sync.ts";
+import { AppConstants } from "#app/config/constants.ts";
+import { formatGlobalDotweaveConfig, isProfileActive, readGlobalDotweaveConfig, resolveActiveProfileSelection, } from "#app/config/global-config.ts";
+import { normalizeSyncProfileName, readSyncConfig, } from "#app/config/sync-schema.ts";
 import { DotweaveError } from "#app/lib/error.ts";
 import { writeTextFileAtomically } from "#app/lib/filesystem.ts";
-import { ensureGitRepository } from "#app/lib/git.ts";
+import { requireGitRepository } from "#app/lib/git.ts";
 import { buildSyncConfigDocument, writeValidatedSyncConfig, } from "./config-file.js";
-import { resolveTrackedEntry } from "./paths.js";
-import { resolveSyncConfigResolutionContext, resolveSyncPaths, } from "./runtime.js";
+import { loadWritableSyncConfig, resolveSyncConfigResolutionContext, resolveSyncPaths, } from "./sync-context.js";
+import { resolveTrackedEntry } from "./sync-paths.js";
+const availableProfilesForConfig = (config) => [AppConstants.SYNC.DEFAULT_PROFILE, ...(config.profiles ?? [])];
+const isKnownProfile = (config, profile) => {
+    return availableProfilesForConfig(config).includes(profile);
+};
+const createUnknownProfileError = (profile) => new DotweaveError(`Unknown profile '${profile}'.`, {
+    code: "UNKNOWN_PROFILE",
+    hint: `Add it with 'dotweave profile add ${profile}', or choose an existing profile.`,
+});
+const requireNonDefaultProfile = (profile, action) => {
+    if (profile === AppConstants.SYNC.DEFAULT_PROFILE) {
+        throw new DotweaveError(`Cannot ${action} the implicit default profile.`, {
+            code: "DEFAULT_PROFILE_IMPLICIT",
+            hint: `The '${AppConstants.SYNC.DEFAULT_PROFILE}' profile always exists automatically.`,
+        });
+    }
+};
+const normalizeAndRequireKnownProfiles = (profiles, config) => {
+    const normalizedProfiles = profiles.map((profile) => normalizeSyncProfileName(profile));
+    for (const profile of normalizedProfiles) {
+        if (!isKnownProfile(config, profile)) {
+            throw createUnknownProfileError(profile);
+        }
+    }
+    return normalizedProfiles;
+};
 export const listProfiles = async () => {
     const { syncDirectory, globalConfigPath } = resolveSyncPaths();
     const context = resolveSyncConfigResolutionContext();
-    await ensureGitRepository(syncDirectory);
+    await requireGitRepository(syncDirectory);
     const [globalConfig, syncConfig] = await Promise.all([
         readGlobalDotweaveConfig(globalConfigPath),
         readSyncConfig(syncDirectory, context),
     ]);
+    const availableProfiles = availableProfilesForConfig(syncConfig);
+    const activeProfile = globalConfig?.activeProfile;
+    const activeProfileWarning = activeProfile !== undefined && !availableProfiles.includes(activeProfile)
+        ? `Active profile '${activeProfile}' is not registered in ${AppConstants.SYNC.CONFIG_FILE_NAME}.`
+        : undefined;
     return {
-        ...(globalConfig?.activeProfile === undefined
-            ? {}
-            : { activeProfile: globalConfig.activeProfile }),
-        activeProfileMode: globalConfig?.activeProfile === undefined ? "none" : "single",
+        ...(activeProfile === undefined ? {} : { activeProfile }),
+        ...(activeProfileWarning === undefined ? {} : { activeProfileWarning }),
+        activeProfileMode: activeProfile === undefined ? "none" : "single",
         assignments: syncConfig.entries
             .filter((entry) => entry.profilesExplicit && entry.profiles.length > 0)
             .map((entry) => ({
@@ -28,47 +57,101 @@ export const listProfiles = async () => {
             profiles: entry.profiles,
         }))
             .sort((left, right) => left.entryRepoPath.localeCompare(right.entryRepoPath)),
-        availableProfiles: collectAllProfileNames(syncConfig.entries),
+        availableProfiles,
         globalConfigExists: globalConfig !== undefined,
         globalConfigPath,
-        syncDirectory,
     };
 };
 export const setActiveProfile = async (profile) => {
     const normalizedProfile = normalizeSyncProfileName(profile);
     const { syncDirectory, globalConfigPath } = resolveSyncPaths();
     const context = resolveSyncConfigResolutionContext();
-    await ensureGitRepository(syncDirectory);
+    await requireGitRepository(syncDirectory);
     const syncConfig = await readSyncConfig(syncDirectory, context);
-    const knownProfiles = collectAllProfileNames(syncConfig.entries);
-    const warning = knownProfiles.includes(normalizedProfile)
-        ? undefined
-        : `Profile '${normalizedProfile}' is not referenced by any tracked entry.`;
+    if (!isKnownProfile(syncConfig, normalizedProfile)) {
+        throw createUnknownProfileError(normalizedProfile);
+    }
     await writeTextFileAtomically(globalConfigPath, formatGlobalDotweaveConfig({
         activeProfile: normalizedProfile,
-        version: CONSTANTS.GLOBAL_CONFIG.CURRENT_VERSION,
+        version: AppConstants.GLOBAL_CONFIG.CURRENT_VERSION,
     }));
     return {
         activeProfile: normalizedProfile,
         globalConfigPath,
         action: "use",
         profile: normalizedProfile,
-        syncDirectory,
-        ...(warning !== undefined ? { warning } : {}),
+    };
+};
+export const addProfile = async (profile) => {
+    const normalizedProfile = normalizeSyncProfileName(profile);
+    requireNonDefaultProfile(normalizedProfile, "add");
+    const { config, syncDirectory } = await loadWritableSyncConfig();
+    if ((config.profiles ?? []).includes(normalizedProfile)) {
+        throw new DotweaveError(`Profile '${normalizedProfile}' already exists.`, {
+            code: "PROFILE_ALREADY_EXISTS",
+            hint: "Choose a different profile name.",
+        });
+    }
+    const nextConfig = buildSyncConfigDocument({
+        ...config,
+        profiles: [...(config.profiles ?? []), normalizedProfile].sort((left, right) => left.localeCompare(right)),
+    });
+    await writeValidatedSyncConfig(syncDirectory, nextConfig);
+    return {
+        action: "added",
+        profile: normalizedProfile,
+    };
+};
+export const removeProfile = async (profile) => {
+    const normalizedProfile = normalizeSyncProfileName(profile);
+    requireNonDefaultProfile(normalizedProfile, "remove");
+    const { globalConfigPath } = resolveSyncPaths();
+    const { config, syncDirectory } = await loadWritableSyncConfig();
+    if (!(config.profiles ?? []).includes(normalizedProfile)) {
+        throw createUnknownProfileError(normalizedProfile);
+    }
+    const globalConfig = await readGlobalDotweaveConfig(globalConfigPath);
+    const activeProfile = resolveActiveProfileSelection(globalConfig);
+    if (isProfileActive(activeProfile, normalizedProfile)) {
+        throw new DotweaveError(`Cannot remove active profile '${normalizedProfile}'.`, {
+            code: "PROFILE_ACTIVE",
+            hint: "Switch profiles first with 'dotweave profile use default' or clear it with 'dotweave profile use'.",
+        });
+    }
+    const referencingEntries = config.entries.filter((entry) => entry.profiles.includes(normalizedProfile));
+    if (referencingEntries.length > 0) {
+        const entryCount = referencingEntries.length;
+        throw new DotweaveError(`Cannot remove profile '${normalizedProfile}' because it is still referenced by ${entryCount} sync ${entryCount === 1 ? "entry" : "entries"}.`, {
+            code: "PROFILE_IN_USE",
+            details: referencingEntries.map((entry) => `Entry: ${entry.repoPath}`),
+            hint: "Reassign or clear these entry profile assignments before removing the profile.",
+        });
+    }
+    const nextConfig = buildSyncConfigDocument({
+        ...config,
+        profiles: (config.profiles ?? []).filter((p) => p !== normalizedProfile),
+    });
+    await writeValidatedSyncConfig(syncDirectory, nextConfig);
+    return {
+        action: "removed",
+        profile: normalizedProfile,
     };
 };
 export const clearActiveProfile = async () => {
     const { syncDirectory, globalConfigPath } = resolveSyncPaths();
-    await ensureGitRepository(syncDirectory);
+    await requireGitRepository(syncDirectory);
     await writeTextFileAtomically(globalConfigPath, formatGlobalDotweaveConfig({
-        version: CONSTANTS.GLOBAL_CONFIG.CURRENT_VERSION,
+        version: AppConstants.GLOBAL_CONFIG.CURRENT_VERSION,
     }));
     return {
         globalConfigPath,
         action: "clear",
-        syncDirectory,
     };
 };
+export const validateProfilesExist = async (profiles) => {
+    const { config } = await loadWritableSyncConfig();
+    return normalizeAndRequireKnownProfiles(profiles, config);
+};
 export const assignProfiles = async (request, cwd) => {
     const target = request.target.trim();
     if (target.length === 0) {
@@ -77,10 +160,7 @@ export const assignProfiles = async (request, cwd) => {
             hint: "Pass a tracked entry path, for example 'dotweave track ~/.gitconfig --profile default --profile work'.",
         });
     }
-    const { syncDirectory, configPath } = resolveSyncPaths();
-    const context = resolveSyncConfigResolutionContext();
-    await ensureGitRepository(syncDirectory);
-    const config = await readSyncConfig(syncDirectory, context);
+    const { config, context, syncDirectory } = await loadWritableSyncConfig();
     const entry = resolveTrackedEntry(target, config.entries, cwd, context.homeDirectory);
     if (entry === undefined) {
         throw new DotweaveError(`No tracked sync entry matches: ${target}`, {
@@ -88,15 +168,13 @@ export const assignProfiles = async (request, cwd) => {
             hint: "Track the root first with 'dotweave track'.",
         });
     }
-    const normalizedProfiles = request.profiles.map((m) => normalizeSyncProfileName(m));
+    const normalizedProfiles = normalizeAndRequireKnownProfiles(request.profiles, config);
     if (entry.profiles.length === normalizedProfiles.length &&
         normalizedProfiles.every((m) => entry.profiles.includes(m))) {
         return {
             action: "unchanged",
-            configPath,
             entryRepoPath: entry.repoPath,
             profiles: normalizedProfiles,
-            syncDirectory,
         };
     }
     const nextConfig = buildSyncConfigDocument({
@@ -112,13 +190,11 @@ export const assignProfiles = async (request, cwd) => {
             };
         }),
     });
-    await writeValidatedSyncConfig(syncDirectory, nextConfig, context);
+    await writeValidatedSyncConfig(syncDirectory, nextConfig);
     return {
         action: "assigned",
-        configPath,
         entryRepoPath: entry.repoPath,
         profiles: normalizedProfiles,
-        syncDirectory,
     };
 };
 //# sourceMappingURL=profile.js.map

package/dist/services/profile.js.map

@@ -1 +1 @@
-{"version":3,"file":"profile.js","sourceRoot":"","sources":["../../src/services/profile.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"profile.js","sourceRoot":"","sources":["../../src/services/profile.ts"],"names":[],"mappings":"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"}

package/dist/services/pull-apply.d.ts

@@ -0,0 +1,30 @@
+import type { ResolvedSyncConfig, ResolvedSyncConfigEntry } from "#app/config/sync-schema.ts";
+import { getPathStats } from "#app/lib/filesystem.ts";
+import type { FileLikeSnapshotNode, SnapshotNode } from "./local-snapshot.ts";
+import type { EffectiveSyncConfig } from "./sync-context.ts";
+export type EntryMaterialization = Readonly<{
+    desiredKeys: ReadonlySet<string>;
+    type: "absent";
+}> | Readonly<{
+    desiredKeys: ReadonlySet<string>;
+    node: FileLikeSnapshotNode;
+    type: "file";
+}> | Readonly<{
+    desiredKeys: ReadonlySet<string>;
+    nodes: ReadonlyMap<string, FileLikeSnapshotNode>;
+    type: "directory";
+}>;
+export declare const buildDesiredDirectoryKeys: (entry: ResolvedSyncConfigEntry, desiredNodes: ReadonlyMap<string, FileLikeSnapshotNode>) => Set<string>;
+export declare const buildEntryMaterialization: (entry: ResolvedSyncConfigEntry, snapshot: ReadonlyMap<string, SnapshotNode>, config: Pick<ResolvedSyncConfig, "entries">) => EntryMaterialization;
+export declare const collectLocalLeafKeys: (targetPath: string, repoPathPrefix: string, keys: Set<string>, keyToLocalPath: Map<string, string> | undefined, childEntryPaths: ReadonlySet<string>, prefix?: string, providedStats?: Awaited<ReturnType<typeof getPathStats>>) => Promise<void>;
+export declare const collectDeletableLocalKeys: (existingKeys: ReadonlySet<string>, desiredKeys: ReadonlySet<string>, keyToLocalPath: ReadonlyMap<string, string>) => Promise<string[]>;
+export declare const countDeletedLocalNodes: (entry: ResolvedSyncConfigEntry, desiredKeys: ReadonlySet<string>, config: EffectiveSyncConfig, existingKeys?: Set<string>, keyToLocalPath?: Map<string, string>, deletedKeys?: Set<string>) => Promise<number>;
+export declare const collectChangedLocalPaths: (entry: ResolvedSyncConfigEntry, materialization: EntryMaterialization, config?: EffectiveSyncConfig) => Promise<string[]>;
+export declare const buildPullCounts: (materializations: readonly (EntryMaterialization | undefined)[]) => {
+    decryptedFileCount: number;
+    directoryCount: number;
+    plainFileCount: number;
+    symlinkCount: number;
+};
+export declare const applyEntryMaterialization: (entry: ResolvedSyncConfigEntry, materialization: EntryMaterialization, config: EffectiveSyncConfig) => Promise<void>;
+//# sourceMappingURL=pull-apply.d.ts.map

package/dist/services/pull-apply.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pull-apply.d.ts","sourceRoot":"","sources":["../../src/services/pull-apply.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EACV,kBAAkB,EAClB,uBAAuB,EACxB,MAAM,4BAA4B,CAAC;AAWpC,OAAO,EAGL,YAAY,EAKb,MAAM,wBAAwB,CAAC;AAGhC,OAAO,KAAK,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAC9E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAE7D,MAAM,MAAM,oBAAoB,GAC5B,QAAQ,CAAC;IACP,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACjC,IAAI,EAAE,QAAQ,CAAC;CAChB,CAAC,GACF,QAAQ,CAAC;IACP,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACjC,IAAI,EAAE,oBAAoB,CAAC;IAC3B,IAAI,EAAE,MAAM,CAAC;CACd,CAAC,GACF,QAAQ,CAAC;IACP,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACjC,KAAK,EAAE,WAAW,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;IACjD,IAAI,EAAE,WAAW,CAAC;CACnB,CAAC,CAAC;AAEP,eAAO,MAAM,yBAAyB,GACpC,OAAO,uBAAuB,EAC9B,cAAc,WAAW,CAAC,MAAM,EAAE,oBAAoB,CAAC,gBAmBxD,CAAC;AAEF,eAAO,MAAM,yBAAyB,GACpC,OAAO,uBAAuB,EAC9B,UAAU,WAAW,CAAC,MAAM,EAAE,YAAY,CAAC,EAC3C,QAAQ,IAAI,CAAC,kBAAkB,EAAE,SAAS,CAAC,KAC1C,oBA8EF,CAAC;AAuKF,eAAO,MAAM,oBAAoB,GAC/B,YAAY,MAAM,EAClB,gBAAgB,MAAM,EACtB,MAAM,GAAG,CAAC,MAAM,CAAC,EACjB,gBAAgB,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,EAC/C,iBAAiB,WAAW,CAAC,MAAM,CAAC,EACpC,SAAS,MAAM,EACf,gBAAgB,OAAO,CAAC,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC,kBAqDzD,CAAC;AAMF,eAAO,MAAM,yBAAyB,GACpC,cAAc,WAAW,CAAC,MAAM,CAAC,EACjC,aAAa,WAAW,CAAC,MAAM,CAAC,EAChC,gBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,sBA0D5C,CAAC;AAEF,eAAO,MAAM,sBAAsB,GACjC,OAAO,uBAAuB,EAC9B,aAAa,WAAW,CAAC,MAAM,CAAC,EAChC,QAAQ,mBAAmB,EAC3B,eAAc,GAAG,CAAC,MAAM,CAAqB,EAC7C,iBAAiB,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EACpC,cAAc,GAAG,CAAC,MAAM,CAAC,oBAuC1B,CAAC;AAEF,eAAO,MAAM,wBAAwB,GACnC,OAAO,uBAAuB,EAC9B,iBAAiB,oBAAoB,EACrC,SAAS,mBAAmB,sBAqG7B,CAAC;AAEF,eAAO,MAAM,eAAe,GAC1B,kBAAkB,SAAS,CAAC,oBAAoB,GAAG,SAAS,CAAC,EAAE;;;;;CA+ChE,CAAC;AAyFF,eAAO,MAAM,yBAAyB,GACpC,OAAO,uBAAuB,EAC9B,iBAAiB,oBAAoB,EACrC,QAAQ,mBAAmB,kBA2C5B,CAAC"}