@tinyrack/devsync 1.7.0 → 1.8.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -0
- package/dist/cli/base-command.d.ts +2 -0
- package/dist/cli/base-command.d.ts.map +1 -1
- package/dist/cli/base-command.js +5 -1
- package/dist/cli/base-command.js.map +1 -1
- package/dist/cli/commands/doctor.d.ts.map +1 -1
- package/dist/cli/commands/doctor.js +1 -1
- package/dist/cli/commands/doctor.js.map +1 -1
- package/dist/cli/commands/init.d.ts.map +1 -1
- package/dist/cli/commands/init.js +2 -1
- package/dist/cli/commands/init.js.map +1 -1
- package/dist/cli/commands/pull.d.ts.map +1 -1
- package/dist/cli/commands/pull.js +2 -1
- package/dist/cli/commands/pull.js.map +1 -1
- package/dist/cli/commands/push.d.ts.map +1 -1
- package/dist/cli/commands/push.js +2 -1
- package/dist/cli/commands/push.js.map +1 -1
- package/dist/cli/commands/status.d.ts.map +1 -1
- package/dist/cli/commands/status.js +2 -0
- package/dist/cli/commands/status.js.map +1 -1
- package/dist/cli/commands/track.d.ts.map +1 -1
- package/dist/cli/commands/track.js +6 -4
- package/dist/cli/commands/track.js.map +1 -1
- package/dist/cli/progress-reporter.d.ts +5 -0
- package/dist/cli/progress-reporter.d.ts.map +1 -0
- package/dist/cli/progress-reporter.js +17 -0
- package/dist/cli/progress-reporter.js.map +1 -0
- package/dist/index.js +7 -1
- package/dist/index.js.map +1 -1
- package/dist/lib/output.d.ts +4 -0
- package/dist/lib/output.d.ts.map +1 -1
- package/dist/lib/output.js +5 -0
- package/dist/lib/output.js.map +1 -1
- package/dist/lib/progress.d.ts +8 -0
- package/dist/lib/progress.d.ts.map +1 -0
- package/dist/lib/progress.js +7 -0
- package/dist/lib/progress.js.map +1 -0
- package/dist/services/doctor.d.ts +2 -1
- package/dist/services/doctor.d.ts.map +1 -1
- package/dist/services/doctor.js +15 -1
- package/dist/services/doctor.js.map +1 -1
- package/dist/services/git.d.ts +2 -1
- package/dist/services/git.d.ts.map +1 -1
- package/dist/services/git.js +81 -4
- package/dist/services/git.js.map +1 -1
- package/dist/services/init.d.ts +2 -1
- package/dist/services/init.d.ts.map +1 -1
- package/dist/services/init.js +25 -4
- package/dist/services/init.js.map +1 -1
- package/dist/services/local-materialization.d.ts +4 -3
- package/dist/services/local-materialization.d.ts.map +1 -1
- package/dist/services/local-materialization.js +52 -19
- package/dist/services/local-materialization.js.map +1 -1
- package/dist/services/local-snapshot.d.ts +2 -1
- package/dist/services/local-snapshot.d.ts.map +1 -1
- package/dist/services/local-snapshot.js +32 -4
- package/dist/services/local-snapshot.js.map +1 -1
- package/dist/services/pull.d.ts +3 -2
- package/dist/services/pull.d.ts.map +1 -1
- package/dist/services/pull.js +15 -7
- package/dist/services/pull.js.map +1 -1
- package/dist/services/push.d.ts +5 -2
- package/dist/services/push.d.ts.map +1 -1
- package/dist/services/push.js +30 -10
- package/dist/services/push.js.map +1 -1
- package/dist/services/repo-artifacts.d.ts +4 -3
- package/dist/services/repo-artifacts.d.ts.map +1 -1
- package/dist/services/repo-artifacts.js +46 -7
- package/dist/services/repo-artifacts.js.map +1 -1
- package/dist/services/repo-snapshot.d.ts +2 -1
- package/dist/services/repo-snapshot.d.ts.map +1 -1
- package/dist/services/repo-snapshot.js +20 -4
- package/dist/services/repo-snapshot.js.map +1 -1
- package/dist/services/status.d.ts +2 -0
- package/dist/services/status.d.ts.map +1 -1
- package/dist/services/status.js +9 -2
- package/dist/services/status.js.map +1 -1
- package/package.json +3 -3
|
@@ -2,11 +2,22 @@ import { lstat, readFile, readlink } from "node:fs/promises";
|
|
|
2
2
|
import { join } from "node:path";
|
|
3
3
|
import { resolveManagedSyncMode, resolveSyncArtifactsDirectoryPath, resolveSyncRule, } from "#app/config/sync.js";
|
|
4
4
|
import { isExecutableMode } from "#app/lib/file-mode.js";
|
|
5
|
+
import { reportDetail, reportPhase, } from "#app/lib/progress.js";
|
|
5
6
|
import { decryptSecretFile } from "./crypto.js";
|
|
6
7
|
import { DevsyncError, wrapUnknownError } from "./error.js";
|
|
7
8
|
import { getPathStats, listDirectoryEntries } from "./filesystem.js";
|
|
8
9
|
import { addSnapshotNode } from "./local-snapshot.js";
|
|
9
10
|
import { assertStorageSafeRepoPath, collectArtifactNamespaces, parseArtifactRelativePath, } from "./repo-artifacts.js";
|
|
11
|
+
const reportRepositoryScanProgress = (reporter, state, storagePath, kind) => {
|
|
12
|
+
state.scannedStorageEntryCount += 1;
|
|
13
|
+
if (reporter?.verbose) {
|
|
14
|
+
reportDetail(reporter, `scanned repository ${kind} ${storagePath}`);
|
|
15
|
+
return;
|
|
16
|
+
}
|
|
17
|
+
if (state.scannedStorageEntryCount % 100 === 0) {
|
|
18
|
+
reportPhase(reporter, `Scanned ${state.scannedStorageEntryCount} repository entries...`);
|
|
19
|
+
}
|
|
20
|
+
};
|
|
10
21
|
const isActiveStorageProfile = (storageProfile, config, repoPath) => {
|
|
11
22
|
const rule = resolveSyncRule(config, repoPath, config.activeProfile);
|
|
12
23
|
if (rule === undefined || rule.mode === "ignore") {
|
|
@@ -113,28 +124,33 @@ const readArtifactLeaf = async (absolutePath, storagePath, config, snapshot) =>
|
|
|
113
124
|
type: "file",
|
|
114
125
|
});
|
|
115
126
|
};
|
|
116
|
-
const walkArtifactTree = async (rootDirectory, config, snapshot, prefix = ""
|
|
127
|
+
const walkArtifactTree = async (rootDirectory, config, snapshot, prefix = "", reporter, progressState = {
|
|
128
|
+
scannedStorageEntryCount: 0,
|
|
129
|
+
}) => {
|
|
117
130
|
const entries = await listDirectoryEntries(rootDirectory);
|
|
118
131
|
for (const entry of entries) {
|
|
119
132
|
const absolutePath = join(rootDirectory, entry.name);
|
|
120
133
|
const storagePath = prefix === "" ? entry.name : `${prefix}/${entry.name}`;
|
|
121
134
|
const stats = await lstat(absolutePath);
|
|
135
|
+
reportRepositoryScanProgress(reporter, progressState, storagePath, stats.isDirectory() ? "directory" : "file");
|
|
122
136
|
if (stats.isDirectory()) {
|
|
123
|
-
await walkArtifactTree(absolutePath, config, snapshot, storagePath);
|
|
137
|
+
await walkArtifactTree(absolutePath, config, snapshot, storagePath, reporter, progressState);
|
|
124
138
|
continue;
|
|
125
139
|
}
|
|
126
140
|
await readArtifactLeaf(absolutePath, storagePath, config, snapshot);
|
|
127
141
|
}
|
|
128
142
|
};
|
|
129
|
-
export const buildRepositorySnapshot = async (syncDirectory, config) => {
|
|
143
|
+
export const buildRepositorySnapshot = async (syncDirectory, config, reporter) => {
|
|
130
144
|
const snapshot = new Map();
|
|
131
145
|
const artifactsDirectory = resolveSyncArtifactsDirectoryPath(syncDirectory);
|
|
132
146
|
const namespaces = collectArtifactNamespaces(config.entries);
|
|
147
|
+
const progressState = { scannedStorageEntryCount: 0 };
|
|
133
148
|
await Promise.all([...namespaces].map(async (namespace) => {
|
|
134
149
|
const namespaceDirectory = join(artifactsDirectory, namespace);
|
|
135
150
|
const namespaceStats = await getPathStats(namespaceDirectory);
|
|
136
151
|
if (namespaceStats?.isDirectory()) {
|
|
137
|
-
|
|
152
|
+
reportPhase(reporter, `Scanning repository namespace ${namespace}...`);
|
|
153
|
+
await walkArtifactTree(namespaceDirectory, config, snapshot, namespace, reporter, progressState);
|
|
138
154
|
}
|
|
139
155
|
}));
|
|
140
156
|
for (const entry of config.entries) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repo-snapshot.js","sourceRoot":"","sources":["../../src/services/repo-snapshot.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"repo-snapshot.js","sourceRoot":"","sources":["../../src/services/repo-snapshot.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { type SyncConfigEntryKind, type SyncMode } from "#app/config/sync.js";
|
|
2
|
+
import { type ProgressReporter } from "#app/lib/progress.js";
|
|
2
3
|
import { buildPullResultFromPlan } from "./pull.js";
|
|
3
4
|
import { buildPushResultFromPlan } from "./push.js";
|
|
4
5
|
export type SyncStatusEntry = Readonly<{
|
|
@@ -24,5 +25,6 @@ export type SyncStatusResult = Readonly<{
|
|
|
24
25
|
}>;
|
|
25
26
|
export declare const getSyncStatus: (environment: NodeJS.ProcessEnv, options?: Readonly<{
|
|
26
27
|
profile?: string;
|
|
28
|
+
reporter?: ProgressReporter;
|
|
27
29
|
}>) => Promise<SyncStatusResult>;
|
|
28
30
|
//# sourceMappingURL=status.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../src/services/status.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,mBAAmB,EACxB,KAAK,QAAQ,EACd,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../src/services/status.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,mBAAmB,EACxB,KAAK,QAAQ,EACd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,gBAAgB,EAAe,MAAM,sBAAsB,CAAC;AAE1E,OAAO,EAGL,uBAAuB,EACxB,MAAM,WAAW,CAAC;AACnB,OAAO,EAGL,uBAAuB,EACxB,MAAM,WAAW,CAAC;AAOnB,MAAM,MAAM,eAAe,GAAG,QAAQ,CAAC;IACrC,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,gBAAgB,GAAG,QAAQ,CAAC;IACtC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,SAAS,eAAe,EAAE,CAAC;IACpC,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,UAAU,CAAC,OAAO,uBAAuB,CAAC,GAAG;QACjD,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;KAC5B,CAAC;IACF,IAAI,EAAE,UAAU,CAAC,OAAO,uBAAuB,CAAC,GAAG;QACjD,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;KAC5B,CAAC;IACF,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC,CAAC;AAEH,eAAO,MAAM,aAAa,GACxB,aAAa,MAAM,CAAC,UAAU,EAC9B,UAAS,QAAQ,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,gBAAgB,CAAC;CAC7B,CAAM,KACN,OAAO,CAAC,gBAAgB,CAqD1B,CAAC"}
|
package/dist/services/status.js
CHANGED
|
@@ -1,14 +1,21 @@
|
|
|
1
1
|
import { resolveSyncConfigFilePath, } from "#app/config/sync.js";
|
|
2
|
+
import { reportPhase } from "#app/lib/progress.js";
|
|
2
3
|
import { buildPullPlan, buildPullPlanPreview, buildPullResultFromPlan, } from "./pull.js";
|
|
3
4
|
import { buildPushPlan, buildPushPlanPreview, buildPushResultFromPlan, } from "./push.js";
|
|
4
5
|
import { ensureSyncRepository, loadSyncConfig, resolveSyncPaths, } from "./runtime.js";
|
|
5
6
|
export const getSyncStatus = async (environment, options = {}) => {
|
|
7
|
+
const reporter = options.reporter;
|
|
8
|
+
reportPhase(reporter, "Analyzing sync status...");
|
|
6
9
|
const { syncDirectory } = resolveSyncPaths(environment);
|
|
7
10
|
const configPath = resolveSyncConfigFilePath(syncDirectory);
|
|
11
|
+
reportPhase(reporter, "Checking sync repository...");
|
|
8
12
|
await ensureSyncRepository(syncDirectory);
|
|
13
|
+
reportPhase(reporter, "Loading sync configuration...");
|
|
9
14
|
const { effectiveConfig, fullConfig } = await loadSyncConfig(syncDirectory, environment, options);
|
|
10
|
-
|
|
11
|
-
const
|
|
15
|
+
reportPhase(reporter, "Building push plan...");
|
|
16
|
+
const pushPlan = await buildPushPlan(effectiveConfig, syncDirectory, reporter);
|
|
17
|
+
reportPhase(reporter, "Building pull plan...");
|
|
18
|
+
const pullPlan = await buildPullPlan(effectiveConfig, syncDirectory, reporter);
|
|
12
19
|
return {
|
|
13
20
|
...(effectiveConfig.activeProfile === undefined
|
|
14
21
|
? {}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../src/services/status.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,yBAAyB,GAG1B,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../src/services/status.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,yBAAyB,GAG1B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAyB,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAE1E,OAAO,EACL,aAAa,EACb,oBAAoB,EACpB,uBAAuB,GACxB,MAAM,WAAW,CAAC;AACnB,OAAO,EACL,aAAa,EACb,oBAAoB,EACpB,uBAAuB,GACxB,MAAM,WAAW,CAAC;AACnB,OAAO,EACL,oBAAoB,EACpB,cAAc,EACd,gBAAgB,GACjB,MAAM,cAAc,CAAC;AAyBtB,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAChC,WAA8B,EAC9B,UAGK,EAAE,EACoB,EAAE;IAC7B,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;IAElC,WAAW,CAAC,QAAQ,EAAE,0BAA0B,CAAC,CAAC;IAClD,MAAM,EAAE,aAAa,EAAE,GAAG,gBAAgB,CAAC,WAAW,CAAC,CAAC;IACxD,MAAM,UAAU,GAAG,yBAAyB,CAAC,aAAa,CAAC,CAAC;IAE5D,WAAW,CAAC,QAAQ,EAAE,6BAA6B,CAAC,CAAC;IACrD,MAAM,oBAAoB,CAAC,aAAa,CAAC,CAAC;IAE1C,WAAW,CAAC,QAAQ,EAAE,+BAA+B,CAAC,CAAC;IACvD,MAAM,EAAE,eAAe,EAAE,UAAU,EAAE,GAAG,MAAM,cAAc,CAC1D,aAAa,EACb,WAAW,EACX,OAAO,CACR,CAAC;IACF,WAAW,CAAC,QAAQ,EAAE,uBAAuB,CAAC,CAAC;IAC/C,MAAM,QAAQ,GAAG,MAAM,aAAa,CAClC,eAAe,EACf,aAAa,EACb,QAAQ,CACT,CAAC;IACF,WAAW,CAAC,QAAQ,EAAE,uBAAuB,CAAC,CAAC;IAC/C,MAAM,QAAQ,GAAG,MAAM,aAAa,CAClC,eAAe,EACf,aAAa,EACb,QAAQ,CACT,CAAC;IAEF,OAAO;QACL,GAAG,CAAC,eAAe,CAAC,aAAa,KAAK,SAAS;YAC7C,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,EAAE,aAAa,EAAE,eAAe,CAAC,aAAa,EAAE,CAAC;QACrD,UAAU;QACV,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAC1C,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,QAAQ,EAAE,KAAK,CAAC,QAAQ;SACzB,CAAC,CAAC;QACH,UAAU,EAAE,UAAU,CAAC,OAAO,CAAC,MAAM;QACrC,IAAI,EAAE;YACJ,GAAG,uBAAuB,CAAC,QAAQ,EAAE,aAAa,EAAE,IAAI,CAAC;YACzD,OAAO,EAAE,oBAAoB,CAAC,QAAQ,CAAC;SACxC;QACD,IAAI,EAAE;YACJ,GAAG,uBAAuB,CAAC,QAAQ,EAAE,aAAa,EAAE,IAAI,CAAC;YACzD,OAAO,EAAE,oBAAoB,CAAC,QAAQ,CAAC;SACxC;QACD,cAAc,EAAE,eAAe,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM;QACrD,aAAa;KACd,CAAC;AACJ,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tinyrack/devsync",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.8.0",
|
|
4
4
|
"description": "A personal CLI tool for git-backed configuration sync.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"license": "MIT",
|
|
@@ -59,8 +59,8 @@
|
|
|
59
59
|
"scripts": {
|
|
60
60
|
"dev": "tsc -p tsconfig.build.json --watch",
|
|
61
61
|
"build": "tsc -p tsconfig.build.json",
|
|
62
|
-
"clean": "
|
|
63
|
-
"prebuild": "
|
|
62
|
+
"clean": "node -e \"require('fs').rmSync('dist',{recursive:true,force:true})\"",
|
|
63
|
+
"prebuild": "node -e \"require('fs').rmSync('dist',{recursive:true,force:true})\"",
|
|
64
64
|
"start": "node dist/index.js",
|
|
65
65
|
"prepack": "npm run build",
|
|
66
66
|
"typecheck": "tsc -p tsconfig.json",
|