@tinyrack/dotweave 0.42.13 → 0.42.19

package/dist/services/profile.d.ts

@@ -10,14 +10,12 @@ export type ProfileListResult = Readonly<{
     availableProfiles: readonly string[];
     globalConfigExists: boolean;
     globalConfigPath: string;
-    syncDirectory: string;
 }>;
 export type ProfileUpdateResult = Readonly<{
     activeProfile?: string;
     action: "clear" | "use";
     globalConfigPath: string;
     profile?: string;
-    syncDirectory: string;
     warning?: string;
 }>;
 type AssignProfilesRequest = Readonly<{
@@ -26,10 +24,8 @@ type AssignProfilesRequest = Readonly<{
 }>;
 type AssignProfilesResult = Readonly<{
     action: "assigned" | "unchanged";
-    configPath: string;
     entryRepoPath: string;
     profiles: readonly string[];
-    syncDirectory: string;
 }>;
 export declare const listProfiles: () => Promise<ProfileListResult>;
 export declare const setActiveProfile: (profile: string) => Promise<ProfileUpdateResult>;

package/dist/services/profile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"profile.d.ts","sourceRoot":"","sources":["../../src/services/profile.ts"],"names":[],"mappings":"AAuBA,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,WAAW,EAAE,SAAS,iBAAiB,EAAE,CAAC;IAC1C,iBAAiB,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,kBAAkB,EAAE,OAAO,CAAC;IAC5B,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,MAAM,CAAC;CACvB,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,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,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,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5B,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC,CAAC;AAEH,eAAO,MAAM,YAAY,QAAa,OAAO,CAAC,iBAAiB,CAgC9D,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAC3B,SAAS,MAAM,KACd,OAAO,CAAC,mBAAmB,CA6B7B,CAAC;AAEF,eAAO,MAAM,kBAAkB,QAAa,OAAO,CAAC,mBAAmB,CAiBtE,CAAC;AAEF,eAAO,MAAM,cAAc,GACzB,SAAS,qBAAqB,EAC9B,KAAK,MAAM,KACV,OAAO,CAAC,oBAAoB,CAuE9B,CAAC"}
+{"version":3,"file":"profile.d.ts","sourceRoot":"","sources":["../../src/services/profile.ts"],"names":[],"mappings":"AAwBA,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,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,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;AAEH,eAAO,MAAM,YAAY,QAAa,OAAO,CAAC,iBAAiB,CA+B9D,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAC3B,SAAS,MAAM,KACd,OAAO,CAAC,mBAAmB,CA4B7B,CAAC;AAEF,eAAO,MAAM,kBAAkB,QAAa,OAAO,CAAC,mBAAmB,CAgBtE,CAAC;AAEF,eAAO,MAAM,cAAc,GACzB,SAAS,qBAAqB,EAC9B,KAAK,MAAM,KACV,OAAO,CAAC,oBAAoB,CA8D9B,CAAC"}

package/dist/services/profile.js

@@ -1,16 +1,17 @@
-import { CONSTANTS } from "#app/config/constants.ts";
+import { AppConstants } from "#app/config/constants.ts";
 import { formatGlobalDotweaveConfig, readGlobalDotweaveConfig, } from "#app/config/global-config.ts";
-import { collectAllProfileNames, normalizeSyncProfileName, readSyncConfig, } from "#app/config/sync.ts";
+import { collectAllProfileNames } from "#app/config/sync-queries.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";
 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),
@@ -31,14 +32,13 @@ export const listProfiles = async () => {
         availableProfiles: collectAllProfileNames(syncConfig.entries),
         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)
@@ -46,27 +46,25 @@ export const setActiveProfile = async (profile) => {
         : `Profile '${normalizedProfile}' is not referenced by any tracked entry.`;
     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 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 assignProfiles = async (request, cwd) => {
@@ -77,10 +75,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}`, {
@@ -93,10 +88,8 @@ export const assignProfiles = async (request, cwd) => {
         normalizedProfiles.every((m) => entry.profiles.includes(m))) {
         return {
             action: "unchanged",
-            configPath,
             entryRepoPath: entry.repoPath,
             profiles: normalizedProfiles,
-            syncDirectory,
         };
     }
     const nextConfig = buildSyncConfigDocument({
@@ -112,13 +105,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"}