@applica-software-guru/sdd 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/dist/commands/pull.d.ts.map +1 -1
- package/dist/commands/pull.js +32 -6
- package/dist/commands/pull.js.map +1 -1
- package/dist/commands/push.d.ts.map +1 -1
- package/dist/commands/push.js +9 -3
- package/dist/commands/push.js.map +1 -1
- package/dist/commands/remote.d.ts.map +1 -1
- package/dist/commands/remote.js +2 -1
- package/dist/commands/remote.js.map +1 -1
- package/package.json +1 -1
- package/src/commands/pull.ts +23 -6
- package/src/commands/push.ts +8 -3
- package/src/commands/remote.ts +2 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pull.d.ts","sourceRoot":"","sources":["../../src/commands/pull.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKpC,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"pull.d.ts","sourceRoot":"","sources":["../../src/commands/pull.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKpC,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAqFnD"}
|
package/dist/commands/pull.js
CHANGED
|
@@ -33,14 +33,26 @@ function registerPull(program) {
|
|
|
33
33
|
console.log(chalk_1.default.yellow(` ~ ${p}`));
|
|
34
34
|
}
|
|
35
35
|
}
|
|
36
|
+
if (result.deleted.length > 0) {
|
|
37
|
+
for (const p of result.deleted) {
|
|
38
|
+
console.log(chalk_1.default.red(` - ${p}`));
|
|
39
|
+
}
|
|
40
|
+
}
|
|
36
41
|
if (result.conflicts.length > 0) {
|
|
37
42
|
for (const c of result.conflicts) {
|
|
38
43
|
console.log((0, format_js_1.warning)(`${c.path} — ${c.reason} (local: v${c.localVersion}, remote: v${c.remoteVersion})`));
|
|
39
44
|
}
|
|
40
45
|
}
|
|
41
|
-
const total = result.created.length + result.updated.length;
|
|
46
|
+
const total = result.created.length + result.updated.length + result.deleted.length;
|
|
42
47
|
if (total > 0) {
|
|
43
|
-
|
|
48
|
+
const parts = [];
|
|
49
|
+
if (result.created.length > 0)
|
|
50
|
+
parts.push(`${result.created.length} created`);
|
|
51
|
+
if (result.updated.length > 0)
|
|
52
|
+
parts.push(`${result.updated.length} updated`);
|
|
53
|
+
if (result.deleted.length > 0)
|
|
54
|
+
parts.push(`${result.deleted.length} deleted`);
|
|
55
|
+
console.log((0, format_js_1.success)(parts.join(', ')));
|
|
44
56
|
}
|
|
45
57
|
else if (result.conflicts.length === 0) {
|
|
46
58
|
console.log((0, format_js_1.info)('Documents up to date.'));
|
|
@@ -51,8 +63,15 @@ function registerPull(program) {
|
|
|
51
63
|
if (pullAll || options.crsOnly) {
|
|
52
64
|
console.log(chalk_1.default.dim(' Pulling change requests...'));
|
|
53
65
|
const crResult = await sdd.pullCRs(options.timeout);
|
|
54
|
-
if (crResult.created > 0 || crResult.updated > 0) {
|
|
55
|
-
|
|
66
|
+
if (crResult.created > 0 || crResult.updated > 0 || crResult.deleted > 0) {
|
|
67
|
+
const parts = [];
|
|
68
|
+
if (crResult.created > 0)
|
|
69
|
+
parts.push(`${crResult.created} created`);
|
|
70
|
+
if (crResult.updated > 0)
|
|
71
|
+
parts.push(`${crResult.updated} updated`);
|
|
72
|
+
if (crResult.deleted > 0)
|
|
73
|
+
parts.push(`${crResult.deleted} deleted`);
|
|
74
|
+
console.log((0, format_js_1.success)(parts.join(', ')));
|
|
56
75
|
}
|
|
57
76
|
else {
|
|
58
77
|
console.log((0, format_js_1.info)('No pending change requests on remote.'));
|
|
@@ -63,8 +82,15 @@ function registerPull(program) {
|
|
|
63
82
|
if (pullAll || options.bugsOnly) {
|
|
64
83
|
console.log(chalk_1.default.dim(' Pulling bugs...'));
|
|
65
84
|
const bugResult = await sdd.pullBugs(options.timeout);
|
|
66
|
-
if (bugResult.created > 0 || bugResult.updated > 0) {
|
|
67
|
-
|
|
85
|
+
if (bugResult.created > 0 || bugResult.updated > 0 || bugResult.deleted > 0) {
|
|
86
|
+
const parts = [];
|
|
87
|
+
if (bugResult.created > 0)
|
|
88
|
+
parts.push(`${bugResult.created} created`);
|
|
89
|
+
if (bugResult.updated > 0)
|
|
90
|
+
parts.push(`${bugResult.updated} updated`);
|
|
91
|
+
if (bugResult.deleted > 0)
|
|
92
|
+
parts.push(`${bugResult.deleted} deleted`);
|
|
93
|
+
console.log((0, format_js_1.success)(parts.join(', ')));
|
|
68
94
|
}
|
|
69
95
|
else {
|
|
70
96
|
console.log((0, format_js_1.info)('No open bugs on remote.'));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pull.js","sourceRoot":"","sources":["../../src/commands/pull.ts"],"names":[],"mappings":";;;;;AAKA,
|
|
1
|
+
{"version":3,"file":"pull.js","sourceRoot":"","sources":["../../src/commands/pull.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"push.d.ts","sourceRoot":"","sources":["../../src/commands/push.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKpC,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"push.d.ts","sourceRoot":"","sources":["../../src/commands/push.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKpC,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAiCnD"}
|
package/dist/commands/push.js
CHANGED
|
@@ -19,16 +19,22 @@ function registerPush(program) {
|
|
|
19
19
|
console.log(chalk_1.default.dim(' Pushing documents...'));
|
|
20
20
|
const paths = files.length > 0 ? files : undefined;
|
|
21
21
|
const result = await sdd.push(paths, { all: options.all, timeout: options.timeout });
|
|
22
|
-
if (result.pushed.length === 0) {
|
|
22
|
+
if (result.pushed.length === 0 && result.deleted.length === 0) {
|
|
23
23
|
console.log((0, format_js_1.info)('No pending files to push.\n'));
|
|
24
24
|
return;
|
|
25
25
|
}
|
|
26
26
|
for (const p of result.pushed) {
|
|
27
27
|
console.log(chalk_1.default.green(` ✓ ${p}`));
|
|
28
28
|
}
|
|
29
|
+
for (const p of result.deleted) {
|
|
30
|
+
console.log(chalk_1.default.red(` ✗ ${p} (deleted)`));
|
|
31
|
+
}
|
|
29
32
|
console.log('');
|
|
30
|
-
|
|
31
|
-
|
|
33
|
+
const parts = [`${result.created} created`, `${result.updated} updated`];
|
|
34
|
+
if (result.deleted.length > 0)
|
|
35
|
+
parts.push(`${result.deleted.length} deleted`);
|
|
36
|
+
console.log((0, format_js_1.success)(`${parts.join(', ')} on remote`));
|
|
37
|
+
console.log(chalk_1.default.dim(` ${result.pushed.length + result.deleted.length} file(s) synced.\n`));
|
|
32
38
|
});
|
|
33
39
|
}
|
|
34
40
|
//# sourceMappingURL=push.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"push.js","sourceRoot":"","sources":["../../src/commands/push.ts"],"names":[],"mappings":";;;;;AAKA,
|
|
1
|
+
{"version":3,"file":"push.js","sourceRoot":"","sources":["../../src/commands/push.ts"],"names":[],"mappings":";;;;;AAKA,oCAiCC;AArCD,kDAA0B;AAC1B,8DAAsD;AACtD,+CAAyD;AAEzD,SAAgB,YAAY,CAAC,OAAgB;IAC3C,OAAO;SACJ,OAAO,CAAC,iBAAiB,CAAC;SAC1B,WAAW,CAAC,kCAAkC,CAAC;SAC/C,MAAM,CAAC,OAAO,EAAE,iCAAiC,CAAC;SAClD,MAAM,CAAC,qBAAqB,EAAE,kDAAkD,EAAE,QAAQ,CAAC;SAC3F,MAAM,CAAC,KAAK,EAAE,KAAe,EAAE,OAA4C,EAAE,EAAE;QAC9E,MAAM,GAAG,GAAG,IAAI,cAAG,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QAE7C,OAAO,CAAC,GAAG,CAAC,IAAA,mBAAO,EAAC,gBAAgB,CAAC,CAAC,CAAC;QACvC,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC,CAAC;QAEjD,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;QACnD,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;QAErF,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC9D,OAAO,CAAC,GAAG,CAAC,IAAA,gBAAI,EAAC,6BAA6B,CAAC,CAAC,CAAC;YACjD,OAAO;QACT,CAAC;QAED,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YAC9B,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;QACvC,CAAC;QACD,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YAC/B,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC;QAC/C,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAChB,MAAM,KAAK,GAAG,CAAC,GAAG,MAAM,CAAC,OAAO,UAAU,EAAE,GAAG,MAAM,CAAC,OAAO,UAAU,CAAC,CAAC;QACzE,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;YAAE,KAAK,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,UAAU,CAAC,CAAC;QAC9E,OAAO,CAAC,GAAG,CAAC,IAAA,mBAAO,EAAC,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC;QACtD,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,oBAAoB,CAAC,CAAC,CAAC;IAChG,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote.d.ts","sourceRoot":"","sources":["../../src/commands/remote.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAMpC,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"remote.d.ts","sourceRoot":"","sources":["../../src/commands/remote.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAMpC,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAsHrD"}
|
package/dist/commands/remote.js
CHANGED
|
@@ -101,7 +101,8 @@ function registerRemote(program) {
|
|
|
101
101
|
console.log(chalk_1.default.dim(` Comments: ${result.deleted_comments}`));
|
|
102
102
|
console.log(chalk_1.default.dim(` Notifications: ${result.deleted_notifications}`));
|
|
103
103
|
console.log('');
|
|
104
|
-
console.log((0, format_js_1.info)('Local remote-state has been cleared.'));
|
|
104
|
+
console.log((0, format_js_1.info)('Local remote-state has been cleared and marked for reseed.'));
|
|
105
|
+
console.log((0, format_js_1.info)('The next "sdd push" without explicit file paths will repopulate the remote from local files.'));
|
|
105
106
|
}
|
|
106
107
|
catch (err) {
|
|
107
108
|
console.log((0, format_js_1.error)(err.message));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote.js","sourceRoot":"","sources":["../../src/commands/remote.ts"],"names":[],"mappings":";;;;;AAMA,
|
|
1
|
+
{"version":3,"file":"remote.js","sourceRoot":"","sources":["../../src/commands/remote.ts"],"names":[],"mappings":";;;;;AAMA,wCAsHC;AA3HD,kDAA0B;AAC1B,+CAAoD;AACpD,8DAA+E;AAC/E,+CAAqF;AAErF,SAAgB,cAAc,CAAC,OAAgB;IAC7C,MAAM,MAAM,GAAG,OAAO;SACnB,OAAO,CAAC,QAAQ,CAAC;SACjB,WAAW,CAAC,kCAAkC,CAAC,CAAC;IAEnD,MAAM;SACH,OAAO,CAAC,MAAM,CAAC;SACf,WAAW,CAAC,iCAAiC,CAAC;SAC9C,MAAM,CAAC,aAAa,EAAE,uBAAuB,CAAC;SAC9C,MAAM,CAAC,iBAAiB,EAAE,sCAAsC,CAAC;SACjE,MAAM,CAAC,qBAAqB,EAAE,kDAAkD,EAAE,QAAQ,CAAC;SAC3F,MAAM,CAAC,KAAK,EAAE,OAA4D,EAAE,EAAE;QAC7E,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QAC3B,MAAM,MAAM,GAAG,MAAM,IAAA,qBAAU,EAAC,IAAI,CAAC,CAAC;QAEtC,MAAM,GAAG,GACP,OAAO,CAAC,GAAG;YACX,CAAC,MAAM,IAAA,eAAK,EAAC;gBACX,OAAO,EAAE,kBAAkB;gBAC3B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,IAAI,iCAAiC;aACjE,CAAC,CAAC,CAAC;QAEN,MAAM,MAAM,GACV,OAAO,CAAC,MAAM;YACd,CAAC,MAAM,IAAA,kBAAQ,EAAC;gBACd,OAAO,EAAE,kDAAkD;aAC5D,CAAC,CAAC,CAAC;QAEN,MAAM,CAAC,MAAM,GAAG;YACd,GAAG,EAAE,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;SAC7B,CAAC;QACF,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC;QACpC,CAAC;QACD,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;YACpB,MAAM,CAAC,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAC1C,CAAC;QAED,MAAM,IAAA,sBAAW,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAChC,OAAO,CAAC,GAAG,CAAC,IAAA,mBAAO,EAAC,gDAAgD,CAAC,CAAC,CAAC;QAEvE,IAAI,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;YACxC,OAAO,CAAC,GAAG,CAAC,IAAA,mBAAO,EAAC,kFAAkF,CAAC,CAAC,CAAC;YACzG,OAAO;QACT,CAAC;QAED,kBAAkB;QAClB,OAAO,CAAC,GAAG,CAAC,IAAA,gBAAI,EAAC,uBAAuB,CAAC,CAAC,CAAC;QAC3C,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,IAAI,cAAG,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;YAC9B,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YACvD,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;gBACrB,OAAO,CAAC,GAAG,CAAC,IAAA,mBAAO,EAAC,yBAAyB,MAAM,CAAC,UAAU,eAAe,CAAC,CAAC,CAAC;YAClF,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,GAAG,CAAC,IAAA,iBAAQ,EAAC,qDAAqD,CAAC,CAAC,CAAC;YAC/E,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,GAAG,CAAC,IAAA,iBAAQ,EAAC,sBAAuB,GAAa,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QACxE,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;IAEL,MAAM;SACH,OAAO,CAAC,QAAQ,CAAC;SACjB,WAAW,CAAC,yBAAyB,CAAC;SACtC,MAAM,CAAC,qBAAqB,EAAE,kDAAkD,EAAE,QAAQ,CAAC;SAC3F,MAAM,CAAC,KAAK,EAAE,OAA6B,EAAE,EAAE;QAC9C,MAAM,GAAG,GAAG,IAAI,cAAG,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QAC7C,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAEvD,OAAO,CAAC,GAAG,CAAC,IAAA,mBAAO,EAAC,eAAe,CAAC,CAAC,CAAC;QAEtC,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;YACvB,OAAO,CAAC,GAAG,CAAC,IAAA,gBAAI,EAAC,2DAA2D,CAAC,CAAC,CAAC;YAC/E,OAAO;QACT,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,KAAK,eAAK,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,eAAK,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACzE,OAAO,CAAC,GAAG,CACT,KAAK,eAAK,CAAC,GAAG,CAAC,aAAa,CAAC,KAC3B,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,eAAK,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAClF,EAAE,CACH,CAAC;QACF,OAAO,CAAC,GAAG,CAAC,KAAK,eAAK,CAAC,GAAG,CAAC,gBAAgB,CAAC,IAAI,eAAK,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,UAAU,CAAC,CAAC;QAC1G,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;YACrB,OAAO,CAAC,GAAG,CAAC,KAAK,eAAK,CAAC,GAAG,CAAC,cAAc,CAAC,KAAK,eAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,cAAc,CAAC,CAAC;QAC3G,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;IAEL,MAAM;SACH,OAAO,CAAC,OAAO,CAAC;SAChB,WAAW,CAAC,uDAAuD,CAAC;SACpE,cAAc,CAAC,kBAAkB,EAAE,mCAAmC,CAAC;SACvE,MAAM,CAAC,qBAAqB,EAAE,kDAAkD,EAAE,QAAQ,CAAC;SAC3F,MAAM,CAAC,KAAK,EAAE,OAA8C,EAAE,EAAE;QAC/D,MAAM,GAAG,GAAG,IAAI,cAAG,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QAE7C,OAAO,CAAC,GAAG,CAAC,IAAA,mBAAO,EAAC,sBAAsB,CAAC,CAAC,CAAC;QAC7C,OAAO,CAAC,GAAG,CAAC,IAAA,mBAAO,EAAC,oFAAoF,CAAC,CAAC,CAAC;QAC3G,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAEhB,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;YACvE,OAAO,CAAC,GAAG,CAAC,IAAA,mBAAO,EAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;YACrC,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,sBAAsB,MAAM,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC;YACzE,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,sBAAsB,MAAM,CAAC,uBAAuB,EAAE,CAAC,CAAC,CAAC;YAC/E,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,sBAAsB,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;YACpE,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,sBAAsB,MAAM,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC;YACxE,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,sBAAsB,MAAM,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAAC;YAC7E,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAChB,OAAO,CAAC,GAAG,CAAC,IAAA,gBAAI,EAAC,4DAA4D,CAAC,CAAC,CAAC;YAChF,OAAO,CAAC,GAAG,CAAC,IAAA,gBAAI,EAAC,8FAA8F,CAAC,CAAC,CAAC;QACpH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,GAAG,CAAC,IAAA,iBAAQ,EAAE,GAAa,CAAC,OAAO,CAAC,CAAC,CAAC;QAChD,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACP,CAAC"}
|
package/package.json
CHANGED
package/src/commands/pull.ts
CHANGED
|
@@ -32,15 +32,24 @@ export function registerPull(program: Command): void {
|
|
|
32
32
|
console.log(chalk.yellow(` ~ ${p}`));
|
|
33
33
|
}
|
|
34
34
|
}
|
|
35
|
+
if (result.deleted.length > 0) {
|
|
36
|
+
for (const p of result.deleted) {
|
|
37
|
+
console.log(chalk.red(` - ${p}`));
|
|
38
|
+
}
|
|
39
|
+
}
|
|
35
40
|
if (result.conflicts.length > 0) {
|
|
36
41
|
for (const c of result.conflicts) {
|
|
37
42
|
console.log(warning(`${c.path} — ${c.reason} (local: v${c.localVersion}, remote: v${c.remoteVersion})`));
|
|
38
43
|
}
|
|
39
44
|
}
|
|
40
45
|
|
|
41
|
-
const total = result.created.length + result.updated.length;
|
|
46
|
+
const total = result.created.length + result.updated.length + result.deleted.length;
|
|
42
47
|
if (total > 0) {
|
|
43
|
-
|
|
48
|
+
const parts = [];
|
|
49
|
+
if (result.created.length > 0) parts.push(`${result.created.length} created`);
|
|
50
|
+
if (result.updated.length > 0) parts.push(`${result.updated.length} updated`);
|
|
51
|
+
if (result.deleted.length > 0) parts.push(`${result.deleted.length} deleted`);
|
|
52
|
+
console.log(success(parts.join(', ')));
|
|
44
53
|
} else if (result.conflicts.length === 0) {
|
|
45
54
|
console.log(info('Documents up to date.'));
|
|
46
55
|
}
|
|
@@ -51,8 +60,12 @@ export function registerPull(program: Command): void {
|
|
|
51
60
|
if (pullAll || options.crsOnly) {
|
|
52
61
|
console.log(chalk.dim(' Pulling change requests...'));
|
|
53
62
|
const crResult = await sdd.pullCRs(options.timeout);
|
|
54
|
-
if (crResult.created > 0 || crResult.updated > 0) {
|
|
55
|
-
|
|
63
|
+
if (crResult.created > 0 || crResult.updated > 0 || crResult.deleted > 0) {
|
|
64
|
+
const parts = [];
|
|
65
|
+
if (crResult.created > 0) parts.push(`${crResult.created} created`);
|
|
66
|
+
if (crResult.updated > 0) parts.push(`${crResult.updated} updated`);
|
|
67
|
+
if (crResult.deleted > 0) parts.push(`${crResult.deleted} deleted`);
|
|
68
|
+
console.log(success(parts.join(', ')));
|
|
56
69
|
} else {
|
|
57
70
|
console.log(info('No pending change requests on remote.'));
|
|
58
71
|
}
|
|
@@ -63,8 +76,12 @@ export function registerPull(program: Command): void {
|
|
|
63
76
|
if (pullAll || options.bugsOnly) {
|
|
64
77
|
console.log(chalk.dim(' Pulling bugs...'));
|
|
65
78
|
const bugResult = await sdd.pullBugs(options.timeout);
|
|
66
|
-
if (bugResult.created > 0 || bugResult.updated > 0) {
|
|
67
|
-
|
|
79
|
+
if (bugResult.created > 0 || bugResult.updated > 0 || bugResult.deleted > 0) {
|
|
80
|
+
const parts = [];
|
|
81
|
+
if (bugResult.created > 0) parts.push(`${bugResult.created} created`);
|
|
82
|
+
if (bugResult.updated > 0) parts.push(`${bugResult.updated} updated`);
|
|
83
|
+
if (bugResult.deleted > 0) parts.push(`${bugResult.deleted} deleted`);
|
|
84
|
+
console.log(success(parts.join(', ')));
|
|
68
85
|
} else {
|
|
69
86
|
console.log(info('No open bugs on remote.'));
|
|
70
87
|
}
|
package/src/commands/push.ts
CHANGED
|
@@ -18,7 +18,7 @@ export function registerPush(program: Command): void {
|
|
|
18
18
|
const paths = files.length > 0 ? files : undefined;
|
|
19
19
|
const result = await sdd.push(paths, { all: options.all, timeout: options.timeout });
|
|
20
20
|
|
|
21
|
-
if (result.pushed.length === 0) {
|
|
21
|
+
if (result.pushed.length === 0 && result.deleted.length === 0) {
|
|
22
22
|
console.log(info('No pending files to push.\n'));
|
|
23
23
|
return;
|
|
24
24
|
}
|
|
@@ -26,9 +26,14 @@ export function registerPush(program: Command): void {
|
|
|
26
26
|
for (const p of result.pushed) {
|
|
27
27
|
console.log(chalk.green(` ✓ ${p}`));
|
|
28
28
|
}
|
|
29
|
+
for (const p of result.deleted) {
|
|
30
|
+
console.log(chalk.red(` ✗ ${p} (deleted)`));
|
|
31
|
+
}
|
|
29
32
|
|
|
30
33
|
console.log('');
|
|
31
|
-
|
|
32
|
-
|
|
34
|
+
const parts = [`${result.created} created`, `${result.updated} updated`];
|
|
35
|
+
if (result.deleted.length > 0) parts.push(`${result.deleted.length} deleted`);
|
|
36
|
+
console.log(success(`${parts.join(', ')} on remote`));
|
|
37
|
+
console.log(chalk.dim(` ${result.pushed.length + result.deleted.length} file(s) synced.\n`));
|
|
33
38
|
});
|
|
34
39
|
}
|
package/src/commands/remote.ts
CHANGED
|
@@ -115,7 +115,8 @@ export function registerRemote(program: Command): void {
|
|
|
115
115
|
console.log(chalk.dim(` Comments: ${result.deleted_comments}`));
|
|
116
116
|
console.log(chalk.dim(` Notifications: ${result.deleted_notifications}`));
|
|
117
117
|
console.log('');
|
|
118
|
-
console.log(info('Local remote-state has been cleared.'));
|
|
118
|
+
console.log(info('Local remote-state has been cleared and marked for reseed.'));
|
|
119
|
+
console.log(info('The next "sdd push" without explicit file paths will repopulate the remote from local files.'));
|
|
119
120
|
} catch (err) {
|
|
120
121
|
console.log(errorFmt((err as Error).message));
|
|
121
122
|
}
|