@prostgles/prostgles 2.3.6-dev.1788628254 → 2.3.6-dev.1788629123
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/server/package.json +1 -1
- package/dist/server/src/cli/cliTemplateFiles.d.ts.map +1 -1
- package/dist/server/src/cli/cliTemplateFiles.js +3 -2
- package/dist/server/src/cli/cliTemplateFiles.js.map +1 -1
- package/dist/server/src/cli/upgradeCli.d.ts +2 -0
- package/dist/server/src/cli/upgradeCli.d.ts.map +1 -1
- package/dist/server/src/cli/upgradeCli.js +62 -17
- package/dist/server/src/cli/upgradeCli.js.map +1 -1
- package/dist/server/src/cli/upgradeCli.spec.js +38 -2
- package/dist/server/src/cli/upgradeCli.spec.js.map +1 -1
- package/package.json +1 -1
package/dist/server/package.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cliTemplateFiles.d.ts","sourceRoot":"","sources":["../../../../src/cli/cliTemplateFiles.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,oBAAoB,GAAI,2BAGlC;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB,SAEA,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAAI,2BAGjC;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB,SAWA,CAAC;AAEF,eAAO,MAAM,aAAa,QAAQ,CAAC;AACnC,eAAO,MAAM,mBAAmB,cAAc,CAAC;AAI/C,eAAO,MAAM,iBAAiB,kFAMpB,CAAC;
|
|
1
|
+
{"version":3,"file":"cliTemplateFiles.d.ts","sourceRoot":"","sources":["../../../../src/cli/cliTemplateFiles.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,oBAAoB,GAAI,2BAGlC;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB,SAEA,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAAI,2BAGjC;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB,SAWA,CAAC;AAEF,eAAO,MAAM,aAAa,QAAQ,CAAC;AACnC,eAAO,MAAM,mBAAmB,cAAc,CAAC;AAI/C,eAAO,MAAM,iBAAiB,kFAMpB,CAAC;AAyNX,eAAO,MAAM,kBAAkB,GAAI,cAAc;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgFxD,CAAC"}
|
|
@@ -65,9 +65,10 @@ const getCliTemplateFiles = ({ configId }) => ({
|
|
|
65
65
|
Run \`npm run upgrade\` to compare this app with the latest scaffold.
|
|
66
66
|
Each new file prompts for skip/save (default: save). Each differing file prompts for
|
|
67
67
|
skip/merge/overwrite (default: merge). Identical files are left alone.
|
|
68
|
-
Merge opens
|
|
68
|
+
Merge opens each changed section with inline Accept Current/Incoming/Both actions in VS Code.
|
|
69
|
+
The \`git\` and \`code\` commands must be on PATH; no Git repository is required.
|
|
69
70
|
There is no historical template baseline, so merge is a manual comparison of both versions.
|
|
70
|
-
Save the result and close the
|
|
71
|
+
Save the result and close the file to continue to the next file.
|
|
71
72
|
Changes are applied as you go. Run \`npm install\` after resolving the files.
|
|
72
73
|
|
|
73
74
|
## Deployment
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cliTemplateFiles.js","sourceRoot":"","sources":["../../../../src/cli/cliTemplateFiles.ts"],"names":[],"mappings":";;;;AAAA,yCAA0C;AAC1C,mCAAqC;AAErC,8EAA6C;AAC7C,qDAAwD;AACxD,+BAAqC;AACrC,2BAAwE;AAEjE,MAAM,oBAAoB,GAAG,CAAC,EACnC,QAAQ,EACR,UAAU,GAIX,EAAE,EAAE;IACH,eAAe,CAAC,UAAU,EAAE,mBAAmB,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;AACjE,CAAC,CAAC;AARW,QAAA,oBAAoB,wBAQ/B;AAEK,MAAM,mBAAmB,GAAG,CAAC,EAClC,QAAQ,EACR,UAAU,GAIX,EAAE,EAAE;IACH,MAAM,KAAK,GAAG,IAAA,0BAAkB,EAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC/C,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAC3D,IAAA,eAAU,EAAC,IAAA,WAAI,EAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CACvC,CAAC;IACF,IAAI,aAAa,CAAC,MAAM,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CACb,oDAAoD,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAC/E,CAAC;IACJ,CAAC;IACD,eAAe,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;AACrC,CAAC,CAAC;AAjBW,QAAA,mBAAmB,uBAiB9B;AAEW,QAAA,aAAa,GAAG,KAAK,CAAC;AACtB,QAAA,mBAAmB,GAAG,WAAW,CAAC;AAC/C,MAAM,eAAe,GAAG,OAAO,CAAC;AAEhC,MAAM,kBAAkB,GAAG,UAAU,CAAC;AACzB,QAAA,iBAAiB,GAAG;IAC/B,WAAW;IACX,cAAc;IACd,cAAc;IACd,YAAY;IACZ,kBAAkB;CACV,CAAC;AAMX,MAAM,eAAe,GAAG,CAAC,UAAkB,EAAE,WAAwB,EAAE,EAAE;IACvE,KAAK,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;QAClE,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,UAAU,EAAE,YAAY,CAAC,CAAC;QAChD,MAAM,iBAAiB,GAAG,IAAA,cAAO,EAAC,QAAQ,CAAC,CAAC;QAC5C,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;YAChC,IAAA,cAAS,EAAC,iBAAiB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAClD,IAAA,kBAAa,EAAC,QAAQ,EAAE,IAAA,iBAAS,EAAC,OAAO,CAAC,CAAC,CAAC;QAC9C,CAAC;aAAM,CAAC;YACN,IAAA,cAAS,EAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACzC,eAAe,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAAC,EAAE,QAAQ,EAAwB,EAAE,EAAE,CACjE,CAAC;IACC,GAAG,IAAA,0BAAkB,EAAC,EAAE,QAAQ,EAAE,CAAC;IACnC,WAAW,EAAE;UACP,QAAQ
|
|
1
|
+
{"version":3,"file":"cliTemplateFiles.js","sourceRoot":"","sources":["../../../../src/cli/cliTemplateFiles.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
type FileAction = "skip" | "save" | "merge" | "overwrite";
|
|
2
2
|
type ChooseFileAction = (file: string, choices: readonly FileAction[], defaultAction: FileAction) => Promise<FileAction>;
|
|
3
|
+
/** Use Git's line diff to offer each changed section as an inline conflict. */
|
|
4
|
+
export declare const getCliUpgradeConflicts: (local: string, incoming: string) => string;
|
|
3
5
|
export declare const applyCliUpgradeFiles: (incomingPath: string, targetPath: string, chooseAction: ChooseFileAction, merge?: (local: string, incoming: string) => void) => Promise<void>;
|
|
4
6
|
export declare const upgradeCli: (configId: string, targetPath: string) => Promise<void>;
|
|
5
7
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgradeCli.d.ts","sourceRoot":"","sources":["../../../../src/cli/upgradeCli.ts"],"names":[],"mappings":"AAgBA,KAAK,UAAU,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,WAAW,CAAC;AAC1D,KAAK,gBAAgB,GAAG,CACtB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,SAAS,UAAU,EAAE,EAC9B,aAAa,EAAE,UAAU,KACtB,OAAO,CAAC,UAAU,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"upgradeCli.d.ts","sourceRoot":"","sources":["../../../../src/cli/upgradeCli.ts"],"names":[],"mappings":"AAgBA,KAAK,UAAU,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,WAAW,CAAC;AAC1D,KAAK,gBAAgB,GAAG,CACtB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,SAAS,UAAU,EAAE,EAC9B,aAAa,EAAE,UAAU,KACtB,OAAO,CAAC,UAAU,CAAC,CAAC;AAEzB,+EAA+E;AAC/E,eAAO,MAAM,sBAAsB,GAAI,OAAO,MAAM,EAAE,UAAU,MAAM,WAyDrE,CAAC;AAkBF,eAAO,MAAM,oBAAoB,GAC/B,cAAc,MAAM,EACpB,YAAY,MAAM,EAClB,cAAc,gBAAgB,EAC9B,gBApB8B,MAAM,YAAY,MAAM,SAoB/B,kBA8BxB,CAAC;AAEF,eAAO,MAAM,UAAU,GAAU,UAAU,MAAM,EAAE,YAAY,MAAM,kBAgCpE,CAAC"}
|
|
@@ -1,31 +1,76 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.upgradeCli = exports.applyCliUpgradeFiles = void 0;
|
|
3
|
+
exports.upgradeCli = exports.applyCliUpgradeFiles = exports.getCliUpgradeConflicts = void 0;
|
|
4
4
|
const node_child_process_1 = require("node:child_process");
|
|
5
5
|
const node_fs_1 = require("node:fs");
|
|
6
6
|
const node_os_1 = require("node:os");
|
|
7
7
|
const promises_1 = require("node:readline/promises");
|
|
8
8
|
const node_path_1 = require("node:path");
|
|
9
9
|
const cliTemplateFiles_1 = require("./cliTemplateFiles");
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
10
|
+
/** Use Git's line diff to offer each changed section as an inline conflict. */
|
|
11
|
+
const getCliUpgradeConflicts = (local, incoming) => {
|
|
12
|
+
const diff = (0, node_child_process_1.spawnSync)("git", [
|
|
13
|
+
"diff",
|
|
14
|
+
"--no-index",
|
|
15
|
+
"--no-ext-diff",
|
|
16
|
+
"--no-textconv",
|
|
17
|
+
"--text",
|
|
18
|
+
"--no-color",
|
|
19
|
+
"--unified=0",
|
|
20
|
+
"--inter-hunk-context=0",
|
|
21
|
+
"--",
|
|
22
|
+
local,
|
|
23
|
+
incoming,
|
|
24
|
+
], { encoding: "utf8", maxBuffer: 16 * 1024 * 1024 });
|
|
25
|
+
if (diff.error)
|
|
26
|
+
throw new Error("Could not compare files. Ensure git is on PATH.", {
|
|
27
|
+
cause: diff.error,
|
|
20
28
|
});
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
29
|
+
if (diff.status !== 0 && diff.status !== 1)
|
|
30
|
+
throw new Error(`git diff failed: ${diff.stderr}`);
|
|
31
|
+
const currentText = (0, node_fs_1.readFileSync)(local, "utf8");
|
|
32
|
+
const currentLines = currentText.match(/[^\n]*\n|[^\n]+$/g) ?? [];
|
|
33
|
+
const incomingLines = (0, node_fs_1.readFileSync)(incoming, "utf8").match(/[^\n]*\n|[^\n]+$/g) ?? [];
|
|
34
|
+
const newline = currentText.includes("\r\n") ? "\r\n" : "\n";
|
|
35
|
+
const section = (lines) => {
|
|
36
|
+
const text = lines.join("");
|
|
37
|
+
return text && !text.endsWith("\n") ? text + newline : text;
|
|
38
|
+
};
|
|
39
|
+
const range = (value) => {
|
|
40
|
+
const [start, count = "1"] = value.slice(1).split(",");
|
|
41
|
+
const length = Number(count);
|
|
42
|
+
return { index: Number(start) - (length ? 1 : 0), length };
|
|
43
|
+
};
|
|
44
|
+
let result = "";
|
|
45
|
+
let cursor = 0;
|
|
46
|
+
for (const line of diff.stdout.split("\n")) {
|
|
47
|
+
if (!line.startsWith("@@ "))
|
|
48
|
+
continue;
|
|
49
|
+
const [, oldRange, newRange] = line.split(" ");
|
|
50
|
+
const old = range(oldRange);
|
|
51
|
+
const next = range(newRange);
|
|
52
|
+
result += currentLines.slice(cursor, old.index).join("");
|
|
53
|
+
result += `<<<<<<< Current${newline}`;
|
|
54
|
+
result += section(currentLines.slice(old.index, old.index + old.length));
|
|
55
|
+
result += `=======${newline}`;
|
|
56
|
+
result += section(incomingLines.slice(next.index, next.index + next.length));
|
|
57
|
+
result += `>>>>>>> Incoming${newline}`;
|
|
58
|
+
cursor = old.index + old.length;
|
|
25
59
|
}
|
|
26
|
-
|
|
27
|
-
|
|
60
|
+
return result + currentLines.slice(cursor).join("");
|
|
61
|
+
};
|
|
62
|
+
exports.getCliUpgradeConflicts = getCliUpgradeConflicts;
|
|
63
|
+
const mergeWithVSCode = (local, incoming) => {
|
|
64
|
+
const original = (0, node_fs_1.readFileSync)(local);
|
|
65
|
+
const conflicts = (0, exports.getCliUpgradeConflicts)(local, incoming);
|
|
66
|
+
(0, node_fs_1.writeFileSync)(local, conflicts);
|
|
67
|
+
const result = (0, node_child_process_1.spawnSync)("code", ["--wait", local], { stdio: "inherit" });
|
|
68
|
+
if (result.error) {
|
|
69
|
+
(0, node_fs_1.writeFileSync)(local, original);
|
|
70
|
+
throw new Error("Could not open VS Code. Ensure the code command is on PATH.", { cause: result.error });
|
|
28
71
|
}
|
|
72
|
+
if (result.status !== 0)
|
|
73
|
+
throw new Error(`VS Code exited with status ${result.status ?? 1}`);
|
|
29
74
|
};
|
|
30
75
|
const applyCliUpgradeFiles = async (incomingPath, targetPath, chooseAction, merge = mergeWithVSCode) => {
|
|
31
76
|
for (const entry of (0, node_fs_1.readdirSync)(incomingPath, { withFileTypes: true })) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgradeCli.js","sourceRoot":"","sources":["../../../../src/cli/upgradeCli.ts"],"names":[],"mappings":";;;AAAA,2DAA+C;AAC/C,qCASiB;AACjB,qCAAiC;AACjC,qDAAyD;AACzD,yCAA0C;AAC1C,yDAA0D;AAS1D,MAAM,
|
|
1
|
+
{"version":3,"file":"upgradeCli.js","sourceRoot":"","sources":["../../../../src/cli/upgradeCli.ts"],"names":[],"mappings":";;;AAAA,2DAA+C;AAC/C,qCASiB;AACjB,qCAAiC;AACjC,qDAAyD;AACzD,yCAA0C;AAC1C,yDAA0D;AAS1D,+EAA+E;AACxE,MAAM,sBAAsB,GAAG,CAAC,KAAa,EAAE,QAAgB,EAAE,EAAE;IACxE,MAAM,IAAI,GAAG,IAAA,8BAAS,EACpB,KAAK,EACL;QACE,MAAM;QACN,YAAY;QACZ,eAAe;QACf,eAAe;QACf,QAAQ;QACR,YAAY;QACZ,aAAa;QACb,wBAAwB;QACxB,IAAI;QACJ,KAAK;QACL,QAAQ;KACT,EACD,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,GAAG,IAAI,GAAG,IAAI,EAAE,CAClD,CAAC;IACF,IAAI,IAAI,CAAC,KAAK;QACZ,MAAM,IAAI,KAAK,CAAC,iDAAiD,EAAE;YACjE,KAAK,EAAE,IAAI,CAAC,KAAK;SAClB,CAAC,CAAC;IACL,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QACxC,MAAM,IAAI,KAAK,CAAC,oBAAoB,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IAErD,MAAM,WAAW,GAAG,IAAA,sBAAY,EAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAChD,MAAM,YAAY,GAAG,WAAW,CAAC,KAAK,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAAC;IAClE,MAAM,aAAa,GACjB,IAAA,sBAAY,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAAC;IAClE,MAAM,OAAO,GAAG,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;IAC7D,MAAM,OAAO,GAAG,CAAC,KAAe,EAAE,EAAE;QAClC,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC5B,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;IAC9D,CAAC,CAAC;IACF,MAAM,KAAK,GAAG,CAAC,KAAa,EAAE,EAAE;QAC9B,MAAM,CAAC,KAAK,EAAE,KAAK,GAAG,GAAG,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACvD,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;QAC7B,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7D,CAAC,CAAC;IACF,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QAC3C,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;YAAE,SAAS;QACtC,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC/C,MAAM,GAAG,GAAG,KAAK,CAAC,QAAS,CAAC,CAAC;QAC7B,MAAM,IAAI,GAAG,KAAK,CAAC,QAAS,CAAC,CAAC;QAC9B,MAAM,IAAI,YAAY,CAAC,KAAK,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACzD,MAAM,IAAI,kBAAkB,OAAO,EAAE,CAAC;QACtC,MAAM,IAAI,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;QACzE,MAAM,IAAI,UAAU,OAAO,EAAE,CAAC;QAC9B,MAAM,IAAI,OAAO,CACf,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,CAC1D,CAAC;QACF,MAAM,IAAI,mBAAmB,OAAO,EAAE,CAAC;QACvC,MAAM,GAAG,GAAG,CAAC,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC;IAClC,CAAC;IACD,OAAO,MAAM,GAAG,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACtD,CAAC,CAAC;AAzDW,QAAA,sBAAsB,0BAyDjC;AAEF,MAAM,eAAe,GAAG,CAAC,KAAa,EAAE,QAAgB,EAAE,EAAE;IAC1D,MAAM,QAAQ,GAAG,IAAA,sBAAY,EAAC,KAAK,CAAC,CAAC;IACrC,MAAM,SAAS,GAAG,IAAA,8BAAsB,EAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAC1D,IAAA,uBAAa,EAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IAChC,MAAM,MAAM,GAAG,IAAA,8BAAS,EAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IAC1E,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;QACjB,IAAA,uBAAa,EAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAC/B,MAAM,IAAI,KAAK,CACb,6DAA6D,EAC7D,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CACxB,CAAC;IACJ,CAAC;IACD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,8BAA8B,MAAM,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC;AACxE,CAAC,CAAC;AAEK,MAAM,oBAAoB,GAAG,KAAK,EACvC,YAAoB,EACpB,UAAkB,EAClB,YAA8B,EAC9B,KAAK,GAAG,eAAe,EACvB,EAAE;IACF,KAAK,MAAM,KAAK,IAAI,IAAA,qBAAW,EAAC,YAAY,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;QACvE,MAAM,QAAQ,GAAG,IAAA,gBAAI,EAAC,YAAY,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QAChD,MAAM,MAAM,GAAG,IAAA,gBAAI,EAAC,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QAC5C,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;YACxB,MAAM,IAAA,4BAAoB,EAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,KAAK,CAAC,CAAC;YAClE,SAAS;QACX,CAAC;QACD,IAAI,CAAC,IAAA,oBAAU,EAAC,MAAM,CAAC,EAAE,CAAC;YACxB,IAAI,CAAC,MAAM,YAAY,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,KAAK,MAAM,EAAE,CAAC;gBACtE,IAAA,mBAAS,EAAC,IAAA,mBAAO,EAAC,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;gBAChD,IAAA,sBAAY,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;gBAC/B,OAAO,CAAC,GAAG,CAAC,SAAS,MAAM,EAAE,CAAC,CAAC;YACjC,CAAC;QACH,CAAC;aAAM,IAAI,CAAC,IAAA,sBAAY,EAAC,MAAM,CAAC,CAAC,MAAM,CAAC,IAAA,sBAAY,EAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;YAChE,MAAM,MAAM,GAAG,MAAM,YAAY,CAC/B,MAAM,EACN,CAAC,MAAM,EAAE,OAAO,EAAE,WAAW,CAAC,EAC9B,OAAO,CACR,CAAC;YACF,IAAI,MAAM,KAAK,WAAW,EAAE,CAAC;gBAC3B,IAAA,sBAAY,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;gBAC/B,OAAO,CAAC,GAAG,CAAC,aAAa,MAAM,EAAE,CAAC,CAAC;YACrC,CAAC;iBAAM,IAAI,MAAM,KAAK,OAAO,EAAE,CAAC;gBAC9B,OAAO,CAAC,GAAG,CAAC,WAAW,MAAM,EAAE,CAAC,CAAC;gBACjC,KAAK,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YAC1B,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC,CAAC;AAlCW,QAAA,oBAAoB,wBAkC/B;AAEK,MAAM,UAAU,GAAG,KAAK,EAAE,QAAgB,EAAE,UAAkB,EAAE,EAAE;IACvE,MAAM,YAAY,GAAG,IAAA,qBAAW,EAAC,IAAA,gBAAI,EAAC,IAAA,gBAAM,GAAE,EAAE,oBAAoB,CAAC,CAAC,CAAC;IACvE,MAAM,QAAQ,GAAG,IAAA,0BAAe,EAAC;QAC/B,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,MAAM,EAAE,OAAO,CAAC,MAAM;KACvB,CAAC,CAAC;IACH,IAAI,CAAC;QACH,IAAA,uCAAoB,EAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,YAAY,EAAE,CAAC,CAAC;QAC7D,MAAM,IAAA,4BAAoB,EACxB,YAAY,EACZ,UAAU,EACV,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE;YACrC,uEAAuE;YACvE,OAAO,IAAI,EAAE,CAAC;gBACZ,MAAM,MAAM,GAAG,CACb,MAAM,QAAQ,CAAC,QAAQ,CACrB,GAAG,IAAI,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,aAAa,KAAK,CACtD,CACF;qBACE,IAAI,EAAE;qBACN,WAAW,EAAE,CAAC;gBACjB,IAAI,CAAC,MAAM;oBAAE,OAAO,aAAa,CAAC;gBAClC,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC;gBAC3D,IAAI,MAAM;oBAAE,OAAO,MAAM,CAAC;gBAC1B,OAAO,CAAC,GAAG,CAAC,UAAU,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC/C,CAAC;QACH,CAAC,CACF,CAAC;IACJ,CAAC;YAAS,CAAC;QACT,QAAQ,CAAC,KAAK,EAAE,CAAC;QACjB,IAAA,gBAAM,EAAC,YAAY,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACzD,CAAC;AACH,CAAC,CAAC;AAhCW,QAAA,UAAU,cAgCrB"}
|
|
@@ -33,13 +33,13 @@ void (0, node_test_1.default)("upgrade prompts per file with defaults and respec
|
|
|
33
33
|
(0, node_fs_1.writeFileSync)((0, node_path_1.join)(incoming, "nested", "new-save"), "incoming");
|
|
34
34
|
const prompted = [];
|
|
35
35
|
const merged = [];
|
|
36
|
-
await (0, upgradeCli_1.applyCliUpgradeFiles)(incoming, target,
|
|
36
|
+
await (0, upgradeCli_1.applyCliUpgradeFiles)(incoming, target, (file, choices, defaultAction) => {
|
|
37
37
|
const name = file.split("/").at(-1);
|
|
38
38
|
prompted.push(file);
|
|
39
39
|
const isNew = name.startsWith("new");
|
|
40
40
|
strict_1.default.deepEqual(choices, isNew ? ["skip", "save"] : ["skip", "merge", "overwrite"]);
|
|
41
41
|
strict_1.default.equal(defaultAction, isNew ? "save" : "merge");
|
|
42
|
-
return actions[name];
|
|
42
|
+
return Promise.resolve(actions[name]);
|
|
43
43
|
}, (local, remote) => {
|
|
44
44
|
strict_1.default.equal((0, node_fs_1.readFileSync)(local, "utf8"), "local");
|
|
45
45
|
strict_1.default.equal((0, node_fs_1.readFileSync)(remote, "utf8"), "incoming");
|
|
@@ -56,4 +56,40 @@ void (0, node_test_1.default)("upgrade prompts per file with defaults and respec
|
|
|
56
56
|
strict_1.default.equal((0, node_fs_1.existsSync)((0, node_path_1.join)(target, "new-skip")), false);
|
|
57
57
|
strict_1.default.equal((0, node_fs_1.readFileSync)((0, node_path_1.join)(target, "app-only"), "utf8"), "custom");
|
|
58
58
|
});
|
|
59
|
+
void (0, node_test_1.default)("inline conflicts separate changed sections and preserve shared lines", (context) => {
|
|
60
|
+
const root = (0, node_fs_1.mkdtempSync)((0, node_path_1.join)((0, node_os_1.tmpdir)(), "prostgles-conflicts-test-"));
|
|
61
|
+
context.after(() => (0, node_fs_1.rmSync)(root, { recursive: true, force: true }));
|
|
62
|
+
const local = (0, node_path_1.join)(root, "local");
|
|
63
|
+
const incoming = (0, node_path_1.join)(root, "incoming");
|
|
64
|
+
(0, node_fs_1.writeFileSync)(local, "header\nold\nshared\nold2\nfooter\n");
|
|
65
|
+
(0, node_fs_1.writeFileSync)(incoming, "header\nnew\nshared\nnew2\nfooter\n");
|
|
66
|
+
strict_1.default.equal((0, upgradeCli_1.getCliUpgradeConflicts)(local, incoming), "header\n<<<<<<< Current\nold\n=======\nnew\n>>>>>>> Incoming\nshared\n<<<<<<< Current\nold2\n=======\nnew2\n>>>>>>> Incoming\nfooter\n");
|
|
67
|
+
strict_1.default.equal((0, node_fs_1.readFileSync)(local, "utf8"), "header\nold\nshared\nold2\nfooter\n");
|
|
68
|
+
});
|
|
69
|
+
void (0, node_test_1.default)("inline conflicts handle additions, removals, empty files and line endings", (context) => {
|
|
70
|
+
const root = (0, node_fs_1.mkdtempSync)((0, node_path_1.join)((0, node_os_1.tmpdir)(), "prostgles-conflicts-test-"));
|
|
71
|
+
context.after(() => (0, node_fs_1.rmSync)(root, { recursive: true, force: true }));
|
|
72
|
+
const local = (0, node_path_1.join)(root, "local");
|
|
73
|
+
const incoming = (0, node_path_1.join)(root, "incoming");
|
|
74
|
+
const conflict = (before, after, newline = "\n") => `<<<<<<< Current${newline}${before}=======${newline}${after}>>>>>>> Incoming${newline}`;
|
|
75
|
+
for (const [before, after, expected] of [
|
|
76
|
+
["same\n", "added\nsame\n", conflict("", "added\n") + "same\n"],
|
|
77
|
+
["same\n", "same\nadded\n", "same\n" + conflict("", "added\n")],
|
|
78
|
+
["removed\nsame\n", "same\n", conflict("removed\n", "") + "same\n"],
|
|
79
|
+
["same\nremoved\n", "same\n", "same\n" + conflict("removed\n", "")],
|
|
80
|
+
["", "added\n", conflict("", "added\n")],
|
|
81
|
+
["removed\n", "", conflict("removed\n", "")],
|
|
82
|
+
["old", "new", conflict("old\n", "new\n")],
|
|
83
|
+
[
|
|
84
|
+
"same\r\nold\r\n",
|
|
85
|
+
"same\r\nnew\r\n",
|
|
86
|
+
"same\r\n" + conflict("old\r\n", "new\r\n", "\r\n"),
|
|
87
|
+
],
|
|
88
|
+
["same", "same", "same"],
|
|
89
|
+
]) {
|
|
90
|
+
(0, node_fs_1.writeFileSync)(local, before);
|
|
91
|
+
(0, node_fs_1.writeFileSync)(incoming, after);
|
|
92
|
+
strict_1.default.equal((0, upgradeCli_1.getCliUpgradeConflicts)(local, incoming), expected);
|
|
93
|
+
}
|
|
94
|
+
});
|
|
59
95
|
//# sourceMappingURL=upgradeCli.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgradeCli.spec.js","sourceRoot":"","sources":["../../../../src/cli/upgradeCli.spec.ts"],"names":[],"mappings":";;;AAAA,wEAAwC;AACxC,qCAOiB;AACjB,qCAAiC;AACjC,yCAAiC;AACjC,kEAA6B;AAC7B,
|
|
1
|
+
{"version":3,"file":"upgradeCli.spec.js","sourceRoot":"","sources":["../../../../src/cli/upgradeCli.spec.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED