@hanseltime/template-repo-sync 2.2.1 → 2.4.0-alpha.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/CHANGELOG.md +43 -45
- package/dist/cjs/checkout-drivers/git-checkout.js +37 -0
- package/dist/cjs/checkout-drivers/git-checkout.spec.js +60 -0
- package/dist/cjs/checkout-drivers/index.js +21 -0
- package/dist/cjs/checkout-drivers/types.js +11 -0
- package/dist/cjs/clone-drivers/git-clone.js +25 -0
- package/dist/cjs/clone-drivers/index.js +21 -0
- package/dist/cjs/clone-drivers/types.js +8 -0
- package/dist/cjs/diff-drivers/git-diff.js +30 -0
- package/dist/cjs/diff-drivers/git-diff.spec.js +138 -0
- package/dist/cjs/diff-drivers/index.js +21 -0
- package/dist/cjs/diff-drivers/types.js +6 -0
- package/dist/cjs/formatting/index.js +21 -0
- package/dist/cjs/formatting/infer-json-indent.js +26 -0
- package/dist/cjs/formatting/infer-json-indent.spec.js +50 -0
- package/dist/cjs/formatting/sync-results-to-md.js +62 -0
- package/dist/cjs/formatting/sync-results-to-md.spec.js +45 -0
- package/dist/cjs/index.js +22 -0
- package/dist/cjs/load-plugin.js +44 -0
- package/dist/cjs/match.js +51 -0
- package/dist/cjs/match.spec.js +75 -0
- package/dist/cjs/merge-file.js +91 -0
- package/dist/cjs/merge-file.spec.js +508 -0
- package/dist/cjs/plugins/index.js +20 -0
- package/dist/cjs/plugins/json-merge.js +228 -0
- package/dist/cjs/plugins/json-merge.spec.js +514 -0
- package/dist/cjs/ref-drivers/git-current-ref.js +18 -0
- package/dist/cjs/ref-drivers/git-current-ref.spec.js +15 -0
- package/dist/cjs/ref-drivers/index.js +20 -0
- package/dist/cjs/ref-drivers/types.js +11 -0
- package/dist/cjs/template-sync.js +236 -0
- package/dist/cjs/template-sync.spec.js +521 -0
- package/dist/cjs/test-utils/index.js +26 -0
- package/dist/cjs/types.js +12 -0
- package/dist/esm/checkout-drivers/git-checkout.mjs +27 -0
- package/dist/esm/checkout-drivers/git-checkout.spec.mjs +56 -0
- package/dist/esm/checkout-drivers/index.mjs +4 -0
- package/dist/esm/checkout-drivers/types.mjs +8 -0
- package/dist/esm/clone-drivers/git-clone.mjs +15 -0
- package/dist/esm/clone-drivers/index.mjs +4 -0
- package/dist/esm/clone-drivers/types.mjs +8 -0
- package/dist/esm/diff-drivers/git-diff.mjs +26 -0
- package/dist/esm/diff-drivers/git-diff.spec.mjs +93 -0
- package/dist/esm/diff-drivers/index.mjs +4 -0
- package/dist/esm/diff-drivers/types.mjs +6 -0
- package/dist/esm/formatting/index.mjs +4 -0
- package/dist/esm/formatting/infer-json-indent.mjs +16 -0
- package/dist/esm/formatting/infer-json-indent.spec.mjs +46 -0
- package/dist/esm/formatting/sync-results-to-md.mjs +52 -0
- package/dist/esm/formatting/sync-results-to-md.spec.mjs +41 -0
- package/dist/esm/index.mjs +5 -0
- package/dist/esm/load-plugin.mjs +40 -0
- package/dist/esm/match.mjs +40 -0
- package/dist/esm/match.spec.mjs +71 -0
- package/dist/esm/merge-file.mjs +88 -0
- package/dist/esm/merge-file.spec.mjs +504 -0
- package/dist/esm/plugins/index.mjs +10 -0
- package/dist/esm/plugins/json-merge.mjs +164 -0
- package/dist/esm/plugins/json-merge.spec.mjs +469 -0
- package/dist/esm/ref-drivers/git-current-ref.mjs +8 -0
- package/dist/esm/ref-drivers/git-current-ref.spec.mjs +11 -0
- package/dist/esm/ref-drivers/index.mjs +3 -0
- package/dist/esm/ref-drivers/types.mjs +8 -0
- package/dist/esm/template-sync.mjs +174 -0
- package/dist/esm/template-sync.spec.mjs +517 -0
- package/dist/esm/test-utils/index.mjs +10 -0
- package/dist/esm/types.mjs +9 -0
- package/{lib/cjs → dist/types}/checkout-drivers/git-checkout.d.ts +1 -0
- package/dist/types/checkout-drivers/git-checkout.d.ts.map +1 -0
- package/dist/types/checkout-drivers/git-checkout.spec.d.ts +2 -0
- package/dist/types/checkout-drivers/git-checkout.spec.d.ts.map +1 -0
- package/{lib/cjs → dist/types}/checkout-drivers/index.d.ts +1 -0
- package/dist/types/checkout-drivers/index.d.ts.map +1 -0
- package/{lib/cjs → dist/types}/checkout-drivers/types.d.ts +1 -0
- package/dist/types/checkout-drivers/types.d.ts.map +1 -0
- package/{lib/cjs → dist/types}/clone-drivers/git-clone.d.ts +2 -1
- package/dist/types/clone-drivers/git-clone.d.ts.map +1 -0
- package/{lib/cjs → dist/types}/clone-drivers/index.d.ts +2 -1
- package/dist/types/clone-drivers/index.d.ts.map +1 -0
- package/{lib/cjs → dist/types}/clone-drivers/types.d.ts +1 -0
- package/dist/types/clone-drivers/types.d.ts.map +1 -0
- package/{lib/cjs → dist/types}/diff-drivers/git-diff.d.ts +1 -0
- package/dist/types/diff-drivers/git-diff.d.ts.map +1 -0
- package/dist/types/diff-drivers/git-diff.spec.d.ts +2 -0
- package/dist/types/diff-drivers/git-diff.spec.d.ts.map +1 -0
- package/{lib/cjs → dist/types}/diff-drivers/index.d.ts +2 -1
- package/dist/types/diff-drivers/index.d.ts.map +1 -0
- package/{lib/cjs → dist/types}/diff-drivers/types.d.ts +1 -0
- package/dist/types/diff-drivers/types.d.ts.map +1 -0
- package/{lib/cjs → dist/types}/formatting/index.d.ts +2 -1
- package/dist/types/formatting/index.d.ts.map +1 -0
- package/{lib/cjs → dist/types}/formatting/infer-json-indent.d.ts +1 -0
- package/dist/types/formatting/infer-json-indent.d.ts.map +1 -0
- package/dist/types/formatting/infer-json-indent.spec.d.ts +2 -0
- package/dist/types/formatting/infer-json-indent.spec.d.ts.map +1 -0
- package/dist/types/formatting/sync-results-to-md.d.ts +3 -0
- package/dist/types/formatting/sync-results-to-md.d.ts.map +1 -0
- package/dist/types/formatting/sync-results-to-md.spec.d.ts +2 -0
- package/dist/types/formatting/sync-results-to-md.spec.d.ts.map +1 -0
- package/{lib/cjs → dist/types}/index.d.ts +3 -2
- package/dist/types/index.d.ts.map +1 -0
- package/{lib/cjs → dist/types}/load-plugin.d.ts +2 -1
- package/dist/types/load-plugin.d.ts.map +1 -0
- package/{lib/cjs → dist/types}/match.d.ts +1 -0
- package/dist/types/match.d.ts.map +1 -0
- package/dist/types/match.spec.d.ts +2 -0
- package/dist/types/match.spec.d.ts.map +1 -0
- package/{lib/cjs → dist/types}/merge-file.d.ts +3 -2
- package/dist/types/merge-file.d.ts.map +1 -0
- package/dist/types/merge-file.spec.d.ts +2 -0
- package/dist/types/merge-file.spec.d.ts.map +1 -0
- package/{lib/cjs → dist/types}/plugins/index.d.ts +2 -1
- package/dist/types/plugins/index.d.ts.map +1 -0
- package/{lib/cjs → dist/types}/plugins/json-merge.d.ts +2 -1
- package/dist/types/plugins/json-merge.d.ts.map +1 -0
- package/dist/types/plugins/json-merge.spec.d.ts +2 -0
- package/dist/types/plugins/json-merge.spec.d.ts.map +1 -0
- package/{lib/cjs → dist/types}/ref-drivers/git-current-ref.d.ts +1 -0
- package/dist/types/ref-drivers/git-current-ref.d.ts.map +1 -0
- package/dist/types/ref-drivers/git-current-ref.spec.d.ts +2 -0
- package/dist/types/ref-drivers/git-current-ref.spec.d.ts.map +1 -0
- package/{lib/cjs → dist/types}/ref-drivers/index.d.ts +1 -0
- package/dist/types/ref-drivers/index.d.ts.map +1 -0
- package/{lib/cjs → dist/types}/ref-drivers/types.d.ts +1 -0
- package/dist/types/ref-drivers/types.d.ts.map +1 -0
- package/{lib/cjs → dist/types}/template-sync.d.ts +6 -5
- package/dist/types/template-sync.d.ts.map +1 -0
- package/dist/types/template-sync.spec.d.ts +2 -0
- package/dist/types/template-sync.spec.d.ts.map +1 -0
- package/{lib/cjs → dist/types}/test-utils/index.d.ts +1 -0
- package/dist/types/test-utils/index.d.ts.map +1 -0
- package/{lib/cjs → dist/types}/types.d.ts +1 -0
- package/dist/types/types.d.ts.map +1 -0
- package/package.json +26 -23
- package/.eslintrc.js +0 -10
- package/.github/CODEOWNERS +0 -6
- package/.github/workflows/pr-checks.yaml +0 -12
- package/.github/workflows/release.yaml +0 -47
- package/.github/workflows/test-flow.yaml +0 -63
- package/.husky/commit-msg +0 -4
- package/.prettierignore +0 -1
- package/.prettierrc +0 -1
- package/action.yml +0 -13
- package/commitlint.config.js +0 -3
- package/docs/merge-plugins/CURRENT_PLUGINS.md +0 -168
- package/docs/merge-plugins/PLUGIN_DEVELOPMENT.md +0 -122
- package/docs/merge-plugins/README.md +0 -75
- package/jest.config.js +0 -19
- package/lib/cjs/checkout-drivers/git-checkout.js +0 -29
- package/lib/cjs/checkout-drivers/index.js +0 -18
- package/lib/cjs/checkout-drivers/types.js +0 -2
- package/lib/cjs/clone-drivers/git-clone.js +0 -17
- package/lib/cjs/clone-drivers/index.js +0 -18
- package/lib/cjs/clone-drivers/types.js +0 -2
- package/lib/cjs/diff-drivers/git-diff.js +0 -41
- package/lib/cjs/diff-drivers/index.js +0 -18
- package/lib/cjs/diff-drivers/types.js +0 -2
- package/lib/cjs/formatting/index.js +0 -18
- package/lib/cjs/formatting/infer-json-indent.js +0 -18
- package/lib/cjs/formatting/sync-results-to-md.d.ts +0 -2
- package/lib/cjs/formatting/sync-results-to-md.js +0 -57
- package/lib/cjs/index.js +0 -19
- package/lib/cjs/load-plugin.js +0 -69
- package/lib/cjs/match.js +0 -45
- package/lib/cjs/merge-file.js +0 -98
- package/lib/cjs/plugins/index.js +0 -11
- package/lib/cjs/plugins/json-merge.js +0 -208
- package/lib/cjs/ref-drivers/git-current-ref.js +0 -12
- package/lib/cjs/ref-drivers/index.js +0 -17
- package/lib/cjs/ref-drivers/types.js +0 -2
- package/lib/cjs/template-sync.js +0 -163
- package/lib/cjs/test-utils/index.js +0 -10
- package/lib/cjs/types.js +0 -2
- package/lib/esm/checkout-drivers/git-checkout.js +0 -29
- package/lib/esm/checkout-drivers/index.js +0 -18
- package/lib/esm/checkout-drivers/types.js +0 -2
- package/lib/esm/clone-drivers/git-clone.js +0 -17
- package/lib/esm/clone-drivers/index.js +0 -18
- package/lib/esm/clone-drivers/types.js +0 -2
- package/lib/esm/diff-drivers/git-diff.js +0 -41
- package/lib/esm/diff-drivers/index.js +0 -18
- package/lib/esm/diff-drivers/types.js +0 -2
- package/lib/esm/formatting/index.js +0 -18
- package/lib/esm/formatting/infer-json-indent.js +0 -18
- package/lib/esm/formatting/sync-results-to-md.js +0 -57
- package/lib/esm/index.js +0 -19
- package/lib/esm/load-plugin.js +0 -46
- package/lib/esm/match.js +0 -45
- package/lib/esm/merge-file.js +0 -98
- package/lib/esm/plugins/index.js +0 -11
- package/lib/esm/plugins/json-merge.js +0 -208
- package/lib/esm/ref-drivers/git-current-ref.js +0 -12
- package/lib/esm/ref-drivers/index.js +0 -17
- package/lib/esm/ref-drivers/types.js +0 -2
- package/lib/esm/template-sync.js +0 -163
- package/lib/esm/test-utils/index.js +0 -10
- package/lib/esm/types.js +0 -2
- package/release.config.js +0 -40
- package/src/checkout-drivers/git-checkout.spec.ts +0 -69
- package/src/checkout-drivers/git-checkout.ts +0 -38
- package/src/checkout-drivers/index.ts +0 -2
- package/src/checkout-drivers/types.ts +0 -14
- package/src/clone-drivers/git-clone.ts +0 -20
- package/src/clone-drivers/index.ts +0 -2
- package/src/clone-drivers/types.ts +0 -20
- package/src/diff-drivers/git-diff.spec.ts +0 -73
- package/src/diff-drivers/git-diff.ts +0 -39
- package/src/diff-drivers/index.ts +0 -2
- package/src/diff-drivers/types.ts +0 -14
- package/src/formatting/__snapshots__/sync-results-to-md.spec.ts.snap +0 -39
- package/src/formatting/index.ts +0 -2
- package/src/formatting/infer-json-indent.spec.ts +0 -49
- package/src/formatting/infer-json-indent.ts +0 -16
- package/src/formatting/sync-results-to-md.spec.ts +0 -31
- package/src/formatting/sync-results-to-md.ts +0 -63
- package/src/index.ts +0 -3
- package/src/load-plugin.ts +0 -51
- package/src/match.spec.ts +0 -68
- package/src/match.ts +0 -52
- package/src/merge-file.spec.ts +0 -506
- package/src/merge-file.ts +0 -154
- package/src/plugins/index.ts +0 -12
- package/src/plugins/json-merge.spec.ts +0 -436
- package/src/plugins/json-merge.ts +0 -215
- package/src/ref-drivers/git-current-ref.spec.ts +0 -12
- package/src/ref-drivers/git-current-ref.ts +0 -9
- package/src/ref-drivers/index.ts +0 -1
- package/src/ref-drivers/types.ts +0 -10
- package/src/template-sync.spec.ts +0 -509
- package/src/template-sync.ts +0 -256
- package/src/test-utils/index.ts +0 -13
- package/src/types.ts +0 -129
- package/templatesync.local.json +0 -15
- package/test-fixtures/downstream/README.md +0 -3
- package/test-fixtures/downstream/package.json +0 -18
- package/test-fixtures/downstream/plugins/custom-plugin.js +0 -11
- package/test-fixtures/downstream/src/index.js +0 -2
- package/test-fixtures/downstream/src/index.ts +0 -1
- package/test-fixtures/downstream/src/templated.js +0 -2
- package/test-fixtures/downstream/src/templated.ts +0 -1
- package/test-fixtures/downstream/templatesync.json +0 -16
- package/test-fixtures/downstream/templatesync.local.json +0 -10
- package/test-fixtures/dummy-plugin.js +0 -8
- package/test-fixtures/glob-test/folder1/something.js +0 -1
- package/test-fixtures/glob-test/folder1/something.ts +0 -0
- package/test-fixtures/glob-test/toplevel.js +0 -0
- package/test-fixtures/glob-test/toplevel.txt +0 -0
- package/test-fixtures/template/custom-bin/something.txt +0 -1
- package/test-fixtures/template/package.json +0 -17
- package/test-fixtures/template/src/index.js +0 -2
- package/test-fixtures/template/src/index.ts +0 -1
- package/test-fixtures/template/src/templated.js +0 -2
- package/test-fixtures/template/src/templated.ts +0 -1
- package/test-fixtures/template/templatesync.json +0 -16
- package/test-fixtures/testGitRepo/README.md +0 -17
- package/test-fixtures/testGitRepo/gitDir/COMMIT_EDITMSG +0 -14
- package/test-fixtures/testGitRepo/gitDir/HEAD +0 -1
- package/test-fixtures/testGitRepo/gitDir/config +0 -7
- package/test-fixtures/testGitRepo/gitDir/description +0 -1
- package/test-fixtures/testGitRepo/gitDir/hooks/applypatch-msg.sample +0 -15
- package/test-fixtures/testGitRepo/gitDir/hooks/commit-msg.sample +0 -24
- package/test-fixtures/testGitRepo/gitDir/hooks/fsmonitor-watchman.sample +0 -174
- package/test-fixtures/testGitRepo/gitDir/hooks/post-update.sample +0 -8
- package/test-fixtures/testGitRepo/gitDir/hooks/pre-applypatch.sample +0 -14
- package/test-fixtures/testGitRepo/gitDir/hooks/pre-commit.sample +0 -49
- package/test-fixtures/testGitRepo/gitDir/hooks/pre-merge-commit.sample +0 -13
- package/test-fixtures/testGitRepo/gitDir/hooks/pre-push.sample +0 -53
- package/test-fixtures/testGitRepo/gitDir/hooks/pre-rebase.sample +0 -169
- package/test-fixtures/testGitRepo/gitDir/hooks/pre-receive.sample +0 -24
- package/test-fixtures/testGitRepo/gitDir/hooks/prepare-commit-msg.sample +0 -42
- package/test-fixtures/testGitRepo/gitDir/hooks/push-to-checkout.sample +0 -78
- package/test-fixtures/testGitRepo/gitDir/hooks/sendemail-validate.sample +0 -77
- package/test-fixtures/testGitRepo/gitDir/hooks/update.sample +0 -128
- package/test-fixtures/testGitRepo/gitDir/index +0 -0
- package/test-fixtures/testGitRepo/gitDir/info/exclude +0 -6
- package/test-fixtures/testGitRepo/gitDir/logs/HEAD +0 -5
- package/test-fixtures/testGitRepo/gitDir/logs/refs/heads/master +0 -2
- package/test-fixtures/testGitRepo/gitDir/logs/refs/heads/test-branch +0 -2
- package/test-fixtures/testGitRepo/gitDir/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 +0 -0
- package/test-fixtures/testGitRepo/gitDir/objects/6e/187bee8d02f39d0a1be8331dd8fe6a00c9b613 +0 -0
- package/test-fixtures/testGitRepo/gitDir/objects/73/185f1f3f5a6345e087d9f46dc4af77cc59449f +0 -2
- package/test-fixtures/testGitRepo/gitDir/objects/90/e7ea1089f939840e9649fd617584c1ad117159 +0 -3
- package/test-fixtures/testGitRepo/gitDir/objects/ba/99a452b9097047e9bfa8d5a08b3e452fcb364a +0 -0
- package/test-fixtures/testGitRepo/gitDir/objects/c5/8d400177cd5180b8566f82a127fafc5bf394b7 +0 -0
- package/test-fixtures/testGitRepo/gitDir/objects/e2/e668265db019249a7e8296d85f79000e3d71cf +0 -0
- package/test-fixtures/testGitRepo/gitDir/objects/e4/243e430c1ab69f3e344249f5b1859e90abc883 +0 -1
- package/test-fixtures/testGitRepo/gitDir/objects/ec/6c1cb72312605282ac61858cf1eaf1ea9f1d02 +0 -0
- package/test-fixtures/testGitRepo/gitDir/objects/fc/89cecc4ac0b5b075bd7d0ce9e09b2f50598b82 +0 -0
- package/test-fixtures/testGitRepo/gitDir/refs/heads/master +0 -1
- package/test-fixtures/testGitRepo/gitDir/refs/heads/test-branch +0 -1
- package/tsconfig.cjs.json +0 -12
- package/tsconfig.esm.json +0 -10
- package/tsconfig.json +0 -22
|
@@ -0,0 +1,164 @@
|
|
|
1
|
+
import * as commentJSON from "comment-json";
|
|
2
|
+
import jp from "jsonpath";
|
|
3
|
+
import lodashMerge from "lodash.merge";
|
|
4
|
+
import { inferJSONIndent } from "../formatting/infer-json-indent.mjs";
|
|
5
|
+
function stringOptionError(value) {
|
|
6
|
+
if (value === "overwrite" || value === "merge-template" || value === "merge-current") {
|
|
7
|
+
return;
|
|
8
|
+
}
|
|
9
|
+
return `${value} must be one of type overwrite, merge-template, or merge-current`;
|
|
10
|
+
}
|
|
11
|
+
export function validate(options) {
|
|
12
|
+
const errors = [];
|
|
13
|
+
// check for flat options
|
|
14
|
+
if (typeof options === "string") {
|
|
15
|
+
const errMsg = stringOptionError(options);
|
|
16
|
+
if (errMsg) {
|
|
17
|
+
errors.push(errMsg);
|
|
18
|
+
}
|
|
19
|
+
return errors;
|
|
20
|
+
} else {
|
|
21
|
+
if (typeof options !== "object") {
|
|
22
|
+
errors.push(`Options must be an object and not ${typeof options}`);
|
|
23
|
+
return errors;
|
|
24
|
+
}
|
|
25
|
+
if (Array.isArray(options)) {
|
|
26
|
+
errors.push(`Options must be an object and not Array`);
|
|
27
|
+
return errors;
|
|
28
|
+
}
|
|
29
|
+
if (options === null) {
|
|
30
|
+
errors.push("Options cannot be null");
|
|
31
|
+
return errors;
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
const optionsCast = options;
|
|
35
|
+
const optionKeys = Object.keys(optionsCast);
|
|
36
|
+
optionKeys.forEach((k)=>{
|
|
37
|
+
if (k === "paths") {
|
|
38
|
+
optionsCast.paths.forEach((pathObj)=>{
|
|
39
|
+
const [jsonPath, opts] = pathObj;
|
|
40
|
+
if (jsonPath.startsWith("$.")) {
|
|
41
|
+
try {
|
|
42
|
+
jp.parse(jsonPath);
|
|
43
|
+
} catch (err) {
|
|
44
|
+
errors.push(`Invalid jsonpath key: ${err}`);
|
|
45
|
+
return;
|
|
46
|
+
}
|
|
47
|
+
const errMsg = stringOptionError(opts);
|
|
48
|
+
if (errMsg) {
|
|
49
|
+
errors.push(`jsonpath ${jsonPath}: ${errMsg}`);
|
|
50
|
+
}
|
|
51
|
+
} else {
|
|
52
|
+
errors.push(`Unrecognized jsonpath syntax: ${jsonPath}`);
|
|
53
|
+
}
|
|
54
|
+
});
|
|
55
|
+
} else {
|
|
56
|
+
if (k === "ignoreNewProperties" || k === "missingIsDelete") {
|
|
57
|
+
return;
|
|
58
|
+
}
|
|
59
|
+
errors.push(`Unrecognized key: ${k}`);
|
|
60
|
+
}
|
|
61
|
+
});
|
|
62
|
+
return errors;
|
|
63
|
+
}
|
|
64
|
+
export async function merge(current, fromTemplateRepo, context) {
|
|
65
|
+
if (context.mergeArguments === "overwrite") {
|
|
66
|
+
return fromTemplateRepo;
|
|
67
|
+
}
|
|
68
|
+
const currentJson = commentJSON.parse(current);
|
|
69
|
+
const fromTemplateJson = commentJSON.parse(fromTemplateRepo);
|
|
70
|
+
if (context.mergeArguments === "merge-current") {
|
|
71
|
+
// Performs Lodash Merge with current as the override
|
|
72
|
+
return commentJSON.stringify(lodashMerge(fromTemplateJson, currentJson), null, inferJSONIndent(current));
|
|
73
|
+
}
|
|
74
|
+
if (context.mergeArguments === "merge-template") {
|
|
75
|
+
// Performs Lodash Merge with current as the override
|
|
76
|
+
return commentJSON.stringify(lodashMerge(currentJson, fromTemplateJson), null, inferJSONIndent(current));
|
|
77
|
+
}
|
|
78
|
+
const { missingIsDelete, ignoreNewProperties, paths } = context.mergeArguments;
|
|
79
|
+
const returnJson = commentJSON.parse(current);
|
|
80
|
+
paths.forEach((p)=>{
|
|
81
|
+
const [jPath, overrideType] = p;
|
|
82
|
+
const fromTemplatePaths = new Map();
|
|
83
|
+
if (overrideType === "merge-template") {
|
|
84
|
+
// We want to make sure there aren't extra paths from the template that didn't get added
|
|
85
|
+
jp.nodes(fromTemplateJson, jPath).forEach((n)=>{
|
|
86
|
+
fromTemplatePaths.set(jp.stringify(n.path), n.path);
|
|
87
|
+
});
|
|
88
|
+
}
|
|
89
|
+
jp.nodes(currentJson, jPath).forEach(({ path, value })=>{
|
|
90
|
+
// This solves for wildcard operators
|
|
91
|
+
const fullPath = jp.stringify(path);
|
|
92
|
+
// track the paths in the template we've walked
|
|
93
|
+
fromTemplatePaths.delete(fullPath);
|
|
94
|
+
jp.apply(returnJson, fullPath, ()=>{
|
|
95
|
+
const templateValue = jp.value(fromTemplateJson, fullPath);
|
|
96
|
+
if (overrideType === "merge-template") {
|
|
97
|
+
if (templateValue === undefined) {
|
|
98
|
+
if (missingIsDelete) {
|
|
99
|
+
return templateValue;
|
|
100
|
+
}
|
|
101
|
+
} else {
|
|
102
|
+
return applyValueMerge(value, templateValue);
|
|
103
|
+
}
|
|
104
|
+
} else if (overrideType === "merge-current") {
|
|
105
|
+
return applyValueMerge(templateValue, value);
|
|
106
|
+
} else if (overrideType === "overwrite") {
|
|
107
|
+
if (templateValue !== undefined || missingIsDelete) {
|
|
108
|
+
return templateValue;
|
|
109
|
+
}
|
|
110
|
+
} else {
|
|
111
|
+
throw new Error(`Unexpected JsonPath merge value ${overrideType}`);
|
|
112
|
+
}
|
|
113
|
+
return value;
|
|
114
|
+
});
|
|
115
|
+
});
|
|
116
|
+
if (!ignoreNewProperties) {
|
|
117
|
+
for (const fromTemplatePath of fromTemplatePaths.values()){
|
|
118
|
+
applyPerPath(fromTemplatePath, returnJson, fromTemplateJson);
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
});
|
|
122
|
+
if (!ignoreNewProperties) {
|
|
123
|
+
Object.keys(fromTemplateJson).forEach((key)=>{
|
|
124
|
+
if (!returnJson[key]) {
|
|
125
|
+
returnJson[key] = fromTemplateJson[key];
|
|
126
|
+
}
|
|
127
|
+
});
|
|
128
|
+
}
|
|
129
|
+
return commentJSON.stringify(returnJson, null, inferJSONIndent(current));
|
|
130
|
+
}
|
|
131
|
+
/**
|
|
132
|
+
* A merge from a template to template perspective is either melding objects
|
|
133
|
+
* or completely overwriting primitive types
|
|
134
|
+
*/ function applyValueMerge(base, toMerge) {
|
|
135
|
+
if (typeof base === "object" && typeof toMerge === "object") {
|
|
136
|
+
return lodashMerge(base, toMerge);
|
|
137
|
+
} else {
|
|
138
|
+
return toMerge;
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
/**
|
|
142
|
+
* Given a nodePath on the "map" tree, this will go to the first missing element
|
|
143
|
+
* and copy that node onto the object
|
|
144
|
+
*
|
|
145
|
+
* @param nodePath
|
|
146
|
+
* @param onto
|
|
147
|
+
* @param map
|
|
148
|
+
* @param forIdx
|
|
149
|
+
*/ function applyPerPath(nodePath, // eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
150
|
+
onto, // eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
151
|
+
map, forIdx = 0) {
|
|
152
|
+
if (nodePath[forIdx] === "$") {
|
|
153
|
+
applyPerPath(nodePath, onto, map, forIdx + 1);
|
|
154
|
+
return;
|
|
155
|
+
}
|
|
156
|
+
const selector = nodePath[forIdx];
|
|
157
|
+
if (onto[selector]) {
|
|
158
|
+
applyPerPath(nodePath, onto[selector], map[selector], forIdx + 1);
|
|
159
|
+
return;
|
|
160
|
+
}
|
|
161
|
+
onto[selector] = map[selector];
|
|
162
|
+
}
|
|
163
|
+
|
|
164
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../../src/plugins/json-merge.ts"],"sourcesContent":["import * as commentJSON from \"comment-json\";\nimport type { PathComponent } from \"jsonpath\";\nimport jp from \"jsonpath\";\nimport lodashMerge from \"lodash.merge\";\nimport { inferJSONIndent } from \"../formatting/infer-json-indent\";\nimport type {\n\tJsonFileMergeOptions,\n\tJsonPathOverrides,\n\tMergeContext,\n} from \"../types\";\n\nfunction stringOptionError(value: string) {\n\tif (\n\t\tvalue === \"overwrite\" ||\n\t\tvalue === \"merge-template\" ||\n\t\tvalue === \"merge-current\"\n\t) {\n\t\treturn;\n\t}\n\treturn `${value} must be one of type overwrite, merge-template, or merge-current`;\n}\n\nexport function validate(options: unknown) {\n\tconst errors: string[] = [];\n\n\t// check for flat options\n\tif (typeof options === \"string\") {\n\t\tconst errMsg = stringOptionError(options);\n\t\tif (errMsg) {\n\t\t\terrors.push(errMsg);\n\t\t}\n\t\treturn errors;\n\t} else {\n\t\tif (typeof options !== \"object\") {\n\t\t\terrors.push(`Options must be an object and not ${typeof options}`);\n\t\t\treturn errors;\n\t\t}\n\n\t\tif (Array.isArray(options)) {\n\t\t\terrors.push(`Options must be an object and not Array`);\n\t\t\treturn errors;\n\t\t}\n\n\t\tif (options === null) {\n\t\t\terrors.push(\"Options cannot be null\");\n\t\t\treturn errors;\n\t\t}\n\t}\n\n\tconst optionsCast = options as JsonPathOverrides;\n\tconst optionKeys = Object.keys(\n\t\toptionsCast,\n\t) as unknown as (keyof JsonPathOverrides)[];\n\toptionKeys.forEach((k) => {\n\t\tif (k === \"paths\") {\n\t\t\toptionsCast.paths.forEach((pathObj) => {\n\t\t\t\tconst [jsonPath, opts] = pathObj;\n\t\t\t\tif (jsonPath.startsWith(\"$.\")) {\n\t\t\t\t\ttry {\n\t\t\t\t\t\tjp.parse(jsonPath);\n\t\t\t\t\t} catch (err) {\n\t\t\t\t\t\terrors.push(`Invalid jsonpath key: ${err}`);\n\t\t\t\t\t\treturn;\n\t\t\t\t\t}\n\t\t\t\t\tconst errMsg = stringOptionError(opts);\n\t\t\t\t\tif (errMsg) {\n\t\t\t\t\t\terrors.push(`jsonpath ${jsonPath}: ${errMsg}`);\n\t\t\t\t\t}\n\t\t\t\t} else {\n\t\t\t\t\terrors.push(`Unrecognized jsonpath syntax: ${jsonPath}`);\n\t\t\t\t}\n\t\t\t});\n\t\t} else {\n\t\t\tif (k === \"ignoreNewProperties\" || k === \"missingIsDelete\") {\n\t\t\t\treturn;\n\t\t\t}\n\t\t\terrors.push(`Unrecognized key: ${k}`);\n\t\t}\n\t});\n\treturn errors;\n}\n\nexport async function merge(\n\tcurrent: string,\n\tfromTemplateRepo: string,\n\tcontext: MergeContext<JsonFileMergeOptions>,\n): Promise<string> {\n\tif (context.mergeArguments === \"overwrite\") {\n\t\treturn fromTemplateRepo;\n\t}\n\n\tconst currentJson = commentJSON.parse(current) as commentJSON.CommentObject;\n\tconst fromTemplateJson = commentJSON.parse(\n\t\tfromTemplateRepo,\n\t) as commentJSON.CommentObject;\n\n\tif (context.mergeArguments === \"merge-current\") {\n\t\t// Performs Lodash Merge with current as the override\n\t\treturn commentJSON.stringify(\n\t\t\tlodashMerge(fromTemplateJson, currentJson),\n\t\t\tnull,\n\t\t\tinferJSONIndent(current),\n\t\t);\n\t}\n\n\tif (context.mergeArguments === \"merge-template\") {\n\t\t// Performs Lodash Merge with current as the override\n\t\treturn commentJSON.stringify(\n\t\t\tlodashMerge(currentJson, fromTemplateJson),\n\t\t\tnull,\n\t\t\tinferJSONIndent(current),\n\t\t);\n\t}\n\n\tconst { missingIsDelete, ignoreNewProperties, paths } =\n\t\tcontext.mergeArguments as JsonPathOverrides;\n\n\tconst returnJson = commentJSON.parse(current) as commentJSON.CommentObject;\n\tpaths.forEach((p) => {\n\t\tconst [jPath, overrideType] = p;\n\n\t\tconst fromTemplatePaths: Map<string, PathComponent[]> = new Map();\n\t\tif (overrideType === \"merge-template\") {\n\t\t\t// We want to make sure there aren't extra paths from the template that didn't get added\n\t\t\tjp.nodes(fromTemplateJson, jPath).forEach((n) => {\n\t\t\t\tfromTemplatePaths.set(jp.stringify(n.path), n.path);\n\t\t\t});\n\t\t}\n\t\tjp.nodes(currentJson, jPath).forEach(({ path, value }) => {\n\t\t\t// This solves for wildcard operators\n\t\t\tconst fullPath = jp.stringify(path);\n\t\t\t// track the paths in the template we've walked\n\t\t\tfromTemplatePaths.delete(fullPath);\n\t\t\tjp.apply(returnJson, fullPath, () => {\n\t\t\t\tconst templateValue = jp.value(fromTemplateJson, fullPath);\n\t\t\t\tif (overrideType === \"merge-template\") {\n\t\t\t\t\tif (templateValue === undefined) {\n\t\t\t\t\t\tif (missingIsDelete) {\n\t\t\t\t\t\t\treturn templateValue;\n\t\t\t\t\t\t}\n\t\t\t\t\t} else {\n\t\t\t\t\t\treturn applyValueMerge(value, templateValue);\n\t\t\t\t\t}\n\t\t\t\t} else if (overrideType === \"merge-current\") {\n\t\t\t\t\treturn applyValueMerge(templateValue, value);\n\t\t\t\t} else if (overrideType === \"overwrite\") {\n\t\t\t\t\tif (templateValue !== undefined || missingIsDelete) {\n\t\t\t\t\t\treturn templateValue;\n\t\t\t\t\t}\n\t\t\t\t} else {\n\t\t\t\t\tthrow new Error(`Unexpected JsonPath merge value ${overrideType}`);\n\t\t\t\t}\n\t\t\t\treturn value;\n\t\t\t});\n\t\t});\n\n\t\tif (!ignoreNewProperties) {\n\t\t\tfor (const fromTemplatePath of fromTemplatePaths.values()) {\n\t\t\t\tapplyPerPath(fromTemplatePath, returnJson, fromTemplateJson);\n\t\t\t}\n\t\t}\n\t});\n\n\tif (!ignoreNewProperties) {\n\t\tObject.keys(fromTemplateJson).forEach((key) => {\n\t\t\tif (!returnJson[key]) {\n\t\t\t\treturnJson[key] = fromTemplateJson[key];\n\t\t\t}\n\t\t});\n\t}\n\n\treturn commentJSON.stringify(returnJson, null, inferJSONIndent(current));\n}\n\n/**\n * A merge from a template to template perspective is either melding objects\n * or completely overwriting primitive types\n */\nfunction applyValueMerge(base: unknown, toMerge: unknown) {\n\tif (typeof base === \"object\" && typeof toMerge === \"object\") {\n\t\treturn lodashMerge(base, toMerge);\n\t} else {\n\t\treturn toMerge;\n\t}\n}\n\n/**\n * Given a nodePath on the \"map\" tree, this will go to the first missing element\n * and copy that node onto the object\n *\n * @param nodePath\n * @param onto\n * @param map\n * @param forIdx\n */\nfunction applyPerPath(\n\tnodePath: jp.PathComponent[],\n\t// eslint-disable-next-line @typescript-eslint/no-explicit-any\n\tonto: any,\n\t// eslint-disable-next-line @typescript-eslint/no-explicit-any\n\tmap: any,\n\tforIdx = 0,\n) {\n\tif (nodePath[forIdx] === \"$\") {\n\t\tapplyPerPath(nodePath, onto, map, forIdx + 1);\n\t\treturn;\n\t}\n\n\tconst selector = nodePath[forIdx];\n\tif (onto[selector]) {\n\t\tapplyPerPath(nodePath, onto[selector], map[selector], forIdx + 1);\n\t\treturn;\n\t}\n\n\tonto[selector] = map[selector];\n}\n"],"names":["commentJSON","jp","lodashMerge","inferJSONIndent","stringOptionError","value","validate","options","errors","errMsg","push","Array","isArray","optionsCast","optionKeys","Object","keys","forEach","k","paths","pathObj","jsonPath","opts","startsWith","parse","err","merge","current","fromTemplateRepo","context","mergeArguments","currentJson","fromTemplateJson","stringify","missingIsDelete","ignoreNewProperties","returnJson","p","jPath","overrideType","fromTemplatePaths","Map","nodes","n","set","path","fullPath","delete","apply","templateValue","undefined","applyValueMerge","Error","fromTemplatePath","values","applyPerPath","key","base","toMerge","nodePath","onto","map","forIdx","selector"],"mappings":"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"}
|