@mouryaamit/nx-polystack 1.7.0 → 1.8.4

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.
Files changed (50) hide show
  1. package/README.md +17 -14
  2. package/dist/bin/cli.js +11 -1
  3. package/dist/bin/cli.js.map +1 -1
  4. package/dist/generators.json +5 -0
  5. package/dist/src/cli/commands/adopt-compare.d.ts +14 -0
  6. package/dist/src/cli/commands/adopt-compare.js +165 -0
  7. package/dist/src/cli/commands/adopt-compare.js.map +1 -0
  8. package/dist/src/cli/commands/adopt.d.ts +6 -0
  9. package/dist/src/cli/commands/adopt.js +63 -0
  10. package/dist/src/cli/commands/adopt.js.map +1 -0
  11. package/dist/src/cli/commands/index.js +1 -0
  12. package/dist/src/cli/commands/index.js.map +1 -1
  13. package/dist/src/cli/commands/update.js +19 -0
  14. package/dist/src/cli/commands/update.js.map +1 -1
  15. package/dist/src/cli/commands/upgrade.d.ts +11 -0
  16. package/dist/src/cli/commands/upgrade.js +257 -4
  17. package/dist/src/cli/commands/upgrade.js.map +1 -1
  18. package/dist/src/cli/help.js +30 -0
  19. package/dist/src/cli/help.js.map +1 -1
  20. package/dist/src/cli/launcher.d.ts +12 -0
  21. package/dist/src/cli/launcher.js +41 -1
  22. package/dist/src/cli/launcher.js.map +1 -1
  23. package/dist/src/generators/adopt/generator.d.ts +42 -0
  24. package/dist/src/generators/adopt/generator.js +476 -0
  25. package/dist/src/generators/adopt/generator.js.map +1 -0
  26. package/dist/src/generators/adopt/old-scripts.d.ts +24 -0
  27. package/dist/src/generators/adopt/old-scripts.js +155 -0
  28. package/dist/src/generators/adopt/old-scripts.js.map +1 -0
  29. package/dist/src/generators/adopt/pipeline.d.ts +31 -0
  30. package/dist/src/generators/adopt/pipeline.js +133 -0
  31. package/dist/src/generators/adopt/pipeline.js.map +1 -0
  32. package/dist/src/generators/adopt/schema.json +26 -0
  33. package/dist/src/generators/migrate/adapters/nx-workspace.js +1 -47
  34. package/dist/src/generators/migrate/adapters/nx-workspace.js.map +1 -1
  35. package/dist/src/generators/migrate/nx/build-scripts.d.ts +8 -0
  36. package/dist/src/generators/migrate/nx/build-scripts.js +50 -1
  37. package/dist/src/generators/migrate/nx/build-scripts.js.map +1 -1
  38. package/dist/src/lib/adopt/compare.d.ts +14 -0
  39. package/dist/src/lib/adopt/compare.js +179 -0
  40. package/dist/src/lib/adopt/compare.js.map +1 -0
  41. package/dist/src/lib/upgrade/nx-migrate.d.ts +46 -0
  42. package/dist/src/lib/upgrade/nx-migrate.js +166 -0
  43. package/dist/src/lib/upgrade/nx-migrate.js.map +1 -0
  44. package/dist/src/lib/utils/devkit-pin.d.ts +15 -0
  45. package/dist/src/lib/utils/devkit-pin.js +61 -0
  46. package/dist/src/lib/utils/devkit-pin.js.map +1 -0
  47. package/dist/src/lib/utils/json-layout.d.ts +37 -0
  48. package/dist/src/lib/utils/json-layout.js +260 -0
  49. package/dist/src/lib/utils/json-layout.js.map +1 -0
  50. package/package.json +1 -1
@@ -0,0 +1,166 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.versionOf = exports.isRevertable = exports.filterMigrations = exports.loadSemver = exports.keepAngularPackages = exports.fixVersionPrefixes = exports.isAngularFamily = exports.NX_HOP_MAX = exports.NX_HOP_MIN = exports.NX_HOPS = void 0;
4
+ const tslib_1 = require("tslib");
5
+ const fs = tslib_1.__importStar(require("fs"));
6
+ const path = tslib_1.__importStar(require("path"));
7
+ /**
8
+ * What `nx migrate` gets wrong on a real workspace, and how pstack puts it right (seen moving a
9
+ * 18-app Angular 15 workspace from Nx 15.9.7 to 17.0.6):
10
+ * - non-interactive, it takes every optional package update, Angular's included; pstack keeps the
11
+ * Angular packages (and their migrations) where they were, as answering "No" would;
12
+ * - it can write a version with a "v" prefix ("v17.0.6");
13
+ * - it re-lays-out the JSON it touches and text-replaces package names in Markdown and even in
14
+ * binary files; pstack keeps only the value changes in JSON and puts the rest back;
15
+ * - the newest Nx CLI it downloads refuses older releases (provenance check, version lookup), so
16
+ * the workspace's own Nx runs the migration first.
17
+ */
18
+ /** Nx version of each major `pstack upgrade nx` moves to (one major per step). */
19
+ exports.NX_HOPS = { 16: '16.9.1', 17: '17.0.6' };
20
+ exports.NX_HOP_MIN = 15;
21
+ exports.NX_HOP_MAX = 17;
22
+ /** Packages that move with the Angular major: `pstack upgrade nx` leaves them alone. */
23
+ function isAngularFamily(name) {
24
+ return (/^@angular(-devkit|-eslint)?\//.test(name) ||
25
+ /^@(nguniversal|ngrx)\//.test(name) ||
26
+ [
27
+ 'angular-eslint',
28
+ '@schematics/angular',
29
+ 'ng-packagr',
30
+ 'zone.js',
31
+ 'typescript',
32
+ 'jest-preset-angular',
33
+ ].includes(name));
34
+ }
35
+ exports.isAngularFamily = isAngularFamily;
36
+ const DEP_FIELDS = ['dependencies', 'devDependencies', 'optionalDependencies', 'peerDependencies'];
37
+ const isObject = (v) => typeof v === 'object' && v !== null && !Array.isArray(v);
38
+ /** "v1.2.3" dependency specs written as "1.2.3" (nx migrate writes some); returns the names. */
39
+ function fixVersionPrefixes(pkg) {
40
+ const fixed = [];
41
+ for (const field of DEP_FIELDS) {
42
+ const deps = pkg[field];
43
+ if (!isObject(deps))
44
+ continue;
45
+ for (const [name, spec] of Object.entries(deps)) {
46
+ if (typeof spec === 'string' && /^v\d+\.\d+\.\d+/.test(spec)) {
47
+ deps[name] = spec.slice(1);
48
+ fixed.push(name);
49
+ }
50
+ }
51
+ }
52
+ return fixed;
53
+ }
54
+ exports.fixVersionPrefixes = fixVersionPrefixes;
55
+ /**
56
+ * `after` with every Angular-family dependency as it was in `before` (changed specs back, added
57
+ * ones removed). Returns the names put back.
58
+ */
59
+ function keepAngularPackages(before, after) {
60
+ const restored = [];
61
+ fixVersionPrefixes(after);
62
+ for (const field of DEP_FIELDS) {
63
+ const was = isObject(before[field]) ? before[field] : {};
64
+ const now = after[field];
65
+ if (!isObject(now))
66
+ continue;
67
+ for (const name of Object.keys(now)) {
68
+ if (!isAngularFamily(name))
69
+ continue;
70
+ if (!(name in was)) {
71
+ delete now[name];
72
+ restored.push(name);
73
+ }
74
+ else if (now[name] !== was[name]) {
75
+ now[name] = was[name];
76
+ restored.push(name);
77
+ }
78
+ }
79
+ }
80
+ return [...new Set(restored)].sort();
81
+ }
82
+ exports.keepAngularPackages = keepAngularPackages;
83
+ /** semver from the workspace's nx install (it ships with every nx). */
84
+ function loadSemver(root) {
85
+ for (const from of [root, __dirname]) {
86
+ try {
87
+ const nxPkg = require.resolve('nx/package.json', { paths: [from] });
88
+ // eslint-disable-next-line @typescript-eslint/no-var-requires
89
+ return require(require.resolve('semver', { paths: [path.dirname(nxPkg)] }));
90
+ }
91
+ catch {
92
+ // next
93
+ }
94
+ }
95
+ return null;
96
+ }
97
+ exports.loadSemver = loadSemver;
98
+ /**
99
+ * Drops from migrations.json the Angular-family packages' migrations and those that require an
100
+ * Angular-family version the workspace keeps (e.g. @nx/angular migrations for Angular 16).
101
+ * Returns the names dropped.
102
+ */
103
+ function filterMigrations(file, kept, semver) {
104
+ if (!fs.existsSync(file))
105
+ return [];
106
+ const json = JSON.parse(fs.readFileSync(file, 'utf8'));
107
+ const dropped = [];
108
+ const keep = (m) => {
109
+ const pkg = String(m['package'] ?? '');
110
+ if (isAngularFamily(pkg))
111
+ return false;
112
+ const requires = isObject(m['requires']) ? m['requires'] : {};
113
+ return Object.entries(requires).every(([name, range]) => {
114
+ if (!isAngularFamily(name))
115
+ return true;
116
+ const version = kept(name);
117
+ if (!version)
118
+ return false;
119
+ const v = semver?.coerce(version)?.version;
120
+ return v && semver ? semver.satisfies(v, range, { includePrerelease: true }) : false;
121
+ });
122
+ };
123
+ const migrations = (json.migrations ?? []).filter((m) => {
124
+ if (keep(m))
125
+ return true;
126
+ dropped.push(`${m['package']}:${m['name']}`);
127
+ return false;
128
+ });
129
+ fs.writeFileSync(file, JSON.stringify({ ...json, migrations }, null, 2) + '\n');
130
+ return dropped;
131
+ }
132
+ exports.filterMigrations = filterMigrations;
133
+ /** True when the file is not text a migration should edit: Markdown, or bytes that are binary. */
134
+ function isRevertable(root, rel) {
135
+ if (/\.(md|mdx|markdown)$/i.test(rel))
136
+ return true;
137
+ try {
138
+ const buf = fs.readFileSync(path.join(root, rel));
139
+ return buf.subarray(0, 8000).includes(0);
140
+ }
141
+ catch {
142
+ return false;
143
+ }
144
+ }
145
+ exports.isRevertable = isRevertable;
146
+ /** The installed version of a package, else the declared spec (without range characters). */
147
+ function versionOf(root, pkg, name) {
148
+ try {
149
+ const file = path.join(root, 'node_modules', ...name.split('/'), 'package.json');
150
+ const v = JSON.parse(fs.readFileSync(file, 'utf8')).version;
151
+ if (typeof v === 'string')
152
+ return v.replace(/^v/, '');
153
+ }
154
+ catch {
155
+ // not installed
156
+ }
157
+ for (const field of DEP_FIELDS) {
158
+ const deps = pkg[field];
159
+ if (isObject(deps) && typeof deps[name] === 'string') {
160
+ return deps[name].replace(/^[\^~=v]+/, '');
161
+ }
162
+ }
163
+ return undefined;
164
+ }
165
+ exports.versionOf = versionOf;
166
+ //# sourceMappingURL=nx-migrate.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"nx-migrate.js","sourceRoot":"","sources":["../../../../src/lib/upgrade/nx-migrate.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,15 @@
1
+ /** Version of a package installed in the workspace's node_modules ("v" prefix dropped). */
2
+ export declare function installedVersion(root: string, name: string): string | undefined;
3
+ /** The spec a package.json declares for `name` (dependencies, devDependencies, optional). */
4
+ export declare function declaredSpec(pkg: Record<string, unknown>, name: string): string | undefined;
5
+ /**
6
+ * The @nx/devkit version to pin, or null: the plugin needs @nx/devkit of the workspace's Nx, and
7
+ * npm resolves the plugin's devkit peer to the newest one when the workspace does not declare it
8
+ * (or declares a range). `nxVersion` is the installed nx (or the one about to be).
9
+ */
10
+ export declare function devkitPinFor(pkg: Record<string, unknown>, nxVersion: string | undefined): string | null;
11
+ /**
12
+ * package.json with @nx/devkit set to `version` in the field that has it (else next to nx, else
13
+ * devDependencies), new keys in alphabetical place when that field is sorted.
14
+ */
15
+ export declare function withDevkitPin(pkg: Record<string, unknown>, version: string): Record<string, unknown>;
@@ -0,0 +1,61 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.withDevkitPin = exports.devkitPinFor = exports.declaredSpec = exports.installedVersion = void 0;
4
+ const tslib_1 = require("tslib");
5
+ const fs = tslib_1.__importStar(require("fs"));
6
+ const path = tslib_1.__importStar(require("path"));
7
+ /** Version of a package installed in the workspace's node_modules ("v" prefix dropped). */
8
+ function installedVersion(root, name) {
9
+ try {
10
+ const file = path.join(root, 'node_modules', ...name.split('/'), 'package.json');
11
+ const version = JSON.parse(fs.readFileSync(file, 'utf8')).version;
12
+ return typeof version === 'string' ? version.replace(/^v/, '') : undefined;
13
+ }
14
+ catch {
15
+ return undefined;
16
+ }
17
+ }
18
+ exports.installedVersion = installedVersion;
19
+ /** The spec a package.json declares for `name` (dependencies, devDependencies, optional). */
20
+ function declaredSpec(pkg, name) {
21
+ for (const field of ['dependencies', 'devDependencies', 'optionalDependencies']) {
22
+ const deps = pkg[field];
23
+ if (deps && typeof deps === 'object' && typeof deps[name] === 'string') {
24
+ return deps[name];
25
+ }
26
+ }
27
+ return undefined;
28
+ }
29
+ exports.declaredSpec = declaredSpec;
30
+ /**
31
+ * The @nx/devkit version to pin, or null: the plugin needs @nx/devkit of the workspace's Nx, and
32
+ * npm resolves the plugin's devkit peer to the newest one when the workspace does not declare it
33
+ * (or declares a range). `nxVersion` is the installed nx (or the one about to be).
34
+ */
35
+ function devkitPinFor(pkg, nxVersion) {
36
+ if (!nxVersion || !/^\d+\.\d+\.\d+/.test(nxVersion))
37
+ return null;
38
+ return declaredSpec(pkg, '@nx/devkit') === nxVersion ? null : nxVersion;
39
+ }
40
+ exports.devkitPinFor = devkitPinFor;
41
+ /**
42
+ * package.json with @nx/devkit set to `version` in the field that has it (else next to nx, else
43
+ * devDependencies), new keys in alphabetical place when that field is sorted.
44
+ */
45
+ function withDevkitPin(pkg, version) {
46
+ const fields = ['dependencies', 'devDependencies', 'optionalDependencies'];
47
+ const has = (f, name) => typeof pkg[f] === 'object' && pkg[f] !== null && name in pkg[f];
48
+ const field = fields.find((f) => has(f, '@nx/devkit')) ??
49
+ fields.find((f) => has(f, 'nx')) ??
50
+ 'devDependencies';
51
+ const deps = { ...(pkg[field] ?? {}) };
52
+ const keys = Object.keys(deps);
53
+ const sorted = keys.every((k, i) => i === 0 || keys[i - 1].localeCompare(k) <= 0);
54
+ deps['@nx/devkit'] = version;
55
+ const next = sorted
56
+ ? Object.fromEntries(Object.entries(deps).sort(([a], [b]) => a.localeCompare(b)))
57
+ : deps;
58
+ return { ...pkg, [field]: next };
59
+ }
60
+ exports.withDevkitPin = withDevkitPin;
61
+ //# sourceMappingURL=devkit-pin.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"devkit-pin.js","sourceRoot":"","sources":["../../../../src/lib/utils/devkit-pin.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,37 @@
1
+ /** A jsonc-parser syntax tree node. */
2
+ export interface JsonNode {
3
+ type: 'object' | 'array' | 'property' | 'string' | 'number' | 'boolean' | 'null';
4
+ offset: number;
5
+ length: number;
6
+ parent?: JsonNode;
7
+ children?: JsonNode[];
8
+ value?: unknown;
9
+ }
10
+ /** The part of jsonc-parser used here (it ships with every nx 17-22). */
11
+ export interface JsoncParser {
12
+ parse(text: string, errors?: unknown[], options?: {
13
+ allowTrailingComma?: boolean;
14
+ }): unknown;
15
+ parseTree(text: string): JsonNode | undefined;
16
+ findNodeAtLocation(root: JsonNode, path: (string | number)[]): JsonNode | undefined;
17
+ }
18
+ /** jsonc-parser from the workspace's (or else the plugin's) nx install, or null. */
19
+ export declare function loadJsonc(workspaceRoot: string): JsoncParser | null;
20
+ /**
21
+ * `before` changed into the value of `after`, as the smallest text edits on `before`: unchanged
22
+ * entries keep their lines (one-line objects stay one line), removed keys go with their line,
23
+ * added keys go after the key they follow in `after`, written in the style of their neighbours.
24
+ * Null when either side does not parse or the result does not equal `after` (the caller then
25
+ * keeps `after` as written).
26
+ */
27
+ export declare function keepJsonLayout(jsonc: JsoncParser, before: string, after: string): string | null;
28
+ /**
29
+ * Snapshot of JSON config files (package.json, nx.json, project.json, tsconfig*.json,
30
+ * .eslintrc.json) under `root`, outside node_modules, dist and dot folders.
31
+ */
32
+ export declare function snapshotJsonConfigs(root: string): Map<string, string>;
33
+ /**
34
+ * Puts the layout of every snapshotted file that changed back, keeping only the value changes.
35
+ * Returns the workspace-relative files restored.
36
+ */
37
+ export declare function restoreJsonLayouts(root: string, snapshot: Map<string, string>, jsonc: JsoncParser): string[];
@@ -0,0 +1,260 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.restoreJsonLayouts = exports.snapshotJsonConfigs = exports.keepJsonLayout = exports.loadJsonc = void 0;
4
+ const tslib_1 = require("tslib");
5
+ const fs = tslib_1.__importStar(require("fs"));
6
+ const path = tslib_1.__importStar(require("path"));
7
+ /** jsonc-parser from the workspace's (or else the plugin's) nx install, or null. */
8
+ function loadJsonc(workspaceRoot) {
9
+ for (const from of [workspaceRoot, __dirname]) {
10
+ try {
11
+ const nxPkg = require.resolve('nx/package.json', { paths: [from] });
12
+ const resolved = require.resolve('jsonc-parser', { paths: [path.dirname(nxPkg)] });
13
+ // eslint-disable-next-line @typescript-eslint/no-var-requires
14
+ return require(resolved);
15
+ }
16
+ catch {
17
+ // try the next install
18
+ }
19
+ }
20
+ return null;
21
+ }
22
+ exports.loadJsonc = loadJsonc;
23
+ const isObject = (v) => typeof v === 'object' && v !== null && !Array.isArray(v);
24
+ function sameJson(a, b) {
25
+ if (Array.isArray(a) && Array.isArray(b)) {
26
+ return a.length === b.length && a.every((v, i) => sameJson(v, b[i]));
27
+ }
28
+ if (isObject(a) && isObject(b)) {
29
+ const ka = Object.keys(a);
30
+ return ka.length === Object.keys(b).length && ka.every((k) => k in b && sameJson(a[k], b[k]));
31
+ }
32
+ return a === b;
33
+ }
34
+ /** One-line JSON with a space after `:` and `,` (`{ "a": [1, 2] }`). */
35
+ function inline(value) {
36
+ if (Array.isArray(value))
37
+ return value.length ? `[${value.map(inline).join(', ')}]` : '[]';
38
+ if (isObject(value)) {
39
+ const entries = Object.entries(value).map(([k, v]) => `${JSON.stringify(k)}: ${inline(v)}`);
40
+ return entries.length ? `{ ${entries.join(', ')} }` : '{}';
41
+ }
42
+ return JSON.stringify(value);
43
+ }
44
+ /** The indentation of the line `offset` is on. */
45
+ function lineIndent(text, offset) {
46
+ const start = text.lastIndexOf('\n', offset - 1) + 1;
47
+ return /^[ \t]*/.exec(text.slice(start))?.[0] ?? '';
48
+ }
49
+ function tabOf(text) {
50
+ const m = /\n([ \t]+)["}\]]/.exec(text);
51
+ return m ? m[1] : ' ';
52
+ }
53
+ /**
54
+ * `before` changed into the value of `after`, as the smallest text edits on `before`: unchanged
55
+ * entries keep their lines (one-line objects stay one line), removed keys go with their line,
56
+ * added keys go after the key they follow in `after`, written in the style of their neighbours.
57
+ * Null when either side does not parse or the result does not equal `after` (the caller then
58
+ * keeps `after` as written).
59
+ */
60
+ function keepJsonLayout(jsonc, before, after) {
61
+ const errors = [];
62
+ const oldValue = jsonc.parse(before, errors, { allowTrailingComma: true });
63
+ const newValue = jsonc.parse(after, errors, { allowTrailingComma: true });
64
+ if (errors.length > 0 || !isObject(oldValue) || !isObject(newValue))
65
+ return null;
66
+ if (sameJson(oldValue, newValue))
67
+ return before;
68
+ const eol = before.includes('\r\n') ? '\r\n' : '\n';
69
+ const tab = tabOf(before);
70
+ let text = before;
71
+ const splice = (offset, length, content) => {
72
+ text = text.slice(0, offset) + content + text.slice(offset + length);
73
+ };
74
+ const block = (value, indent) => JSON.stringify(value, null, tab)
75
+ .split('\n')
76
+ .join(eol + indent);
77
+ const node = (at) => {
78
+ const root = jsonc.parseTree(text);
79
+ return root ? (at.length ? jsonc.findNodeAtLocation(root, at) : root) : undefined;
80
+ };
81
+ const replace = (at, value) => {
82
+ const n = node(at);
83
+ if (!n)
84
+ return false;
85
+ const old = text.slice(n.offset, n.offset + n.length);
86
+ const content = old.includes('\n') ? block(value, lineIndent(text, n.offset)) : inline(value);
87
+ splice(n.offset, n.length, content);
88
+ return true;
89
+ };
90
+ // A property or element goes with the comma before it (or after it, when it is the first).
91
+ const remove = (at) => {
92
+ const value = node(at);
93
+ const item = value?.parent?.type === 'property' ? value.parent : value;
94
+ const siblings = item?.parent?.children;
95
+ if (!item || !siblings)
96
+ return false;
97
+ const i = siblings.indexOf(item);
98
+ if (siblings.length === 1) {
99
+ const p = item.parent;
100
+ splice(p.offset, p.length, p.type === 'array' ? '[]' : '{}');
101
+ }
102
+ else if (i > 0) {
103
+ const prev = siblings[i - 1];
104
+ splice(prev.offset + prev.length, item.offset + item.length - (prev.offset + prev.length), '');
105
+ }
106
+ else {
107
+ splice(item.offset, siblings[1].offset - item.offset, '');
108
+ }
109
+ return true;
110
+ };
111
+ const insert = (parentAt, key, value, order) => {
112
+ const parent = node(parentAt);
113
+ if (!parent || parent.type !== 'object')
114
+ return false;
115
+ const props = parent.children ?? [];
116
+ const one = !text.slice(parent.offset, parent.offset + parent.length).includes('\n');
117
+ const keyOf = (p) => p.children?.[0]?.value;
118
+ let anchor;
119
+ const names = props.map((p) => String(keyOf(p)));
120
+ const sorted = names.length > 1 && names.every((n, i) => i === 0 || names[i - 1].localeCompare(n) <= 0);
121
+ if (sorted) {
122
+ // A sorted object (dependencies) stays sorted: after the last key that sorts before it.
123
+ for (const p of props)
124
+ if (String(keyOf(p)).localeCompare(key) < 0)
125
+ anchor = p;
126
+ }
127
+ else {
128
+ for (let i = order.indexOf(key) - 1; i >= 0 && !anchor; i--) {
129
+ anchor = props.find((p) => keyOf(p) === order[i]);
130
+ }
131
+ }
132
+ const name = JSON.stringify(key);
133
+ if (props.length === 0) {
134
+ splice(parent.offset, parent.length, inline({ [key]: value }));
135
+ }
136
+ else if (anchor) {
137
+ const end = anchor.offset + anchor.length;
138
+ const indent = lineIndent(text, anchor.offset);
139
+ splice(end, 0, one ? `, ${name}: ${inline(value)}` : `,${eol}${indent}${name}: ${block(value, indent)}`);
140
+ }
141
+ else {
142
+ const first = props[0];
143
+ const indent = lineIndent(text, first.offset);
144
+ splice(first.offset, 0, one ? `${name}: ${inline(value)}, ` : `${name}: ${block(value, indent)},${eol}${indent}`);
145
+ }
146
+ return true;
147
+ };
148
+ // Same length: element by element. Entries only taken out: remove them. Else the whole array.
149
+ const walkArray = (at, o, n) => {
150
+ if (o.length === n.length) {
151
+ return o.every((ov, i) => {
152
+ const nv = n[i];
153
+ if (sameJson(ov, nv))
154
+ return true;
155
+ if (isObject(ov) && isObject(nv))
156
+ return walk([...at, i], ov, nv);
157
+ return replace([...at, i], nv);
158
+ });
159
+ }
160
+ const kept = [];
161
+ let j = 0;
162
+ for (let i = 0; i < o.length && j < n.length; i++)
163
+ if (sameJson(o[i], n[j]))
164
+ kept.push(i), j++;
165
+ if (j === n.length && n.length < o.length) {
166
+ for (let i = o.length - 1; i >= 0; i--)
167
+ if (!kept.includes(i) && !remove([...at, i]))
168
+ return false;
169
+ return true;
170
+ }
171
+ return replace(at, n);
172
+ };
173
+ const walk = (at, o, n) => {
174
+ for (const key of Object.keys(o))
175
+ if (!(key in n) && !remove([...at, key]))
176
+ return false;
177
+ const order = Object.keys(n);
178
+ for (const key of order) {
179
+ const ov = o[key];
180
+ const nv = n[key];
181
+ if (!(key in o)) {
182
+ if (!insert(at, key, nv, order))
183
+ return false;
184
+ }
185
+ else if (isObject(ov) && isObject(nv)) {
186
+ if (!walk([...at, key], ov, nv))
187
+ return false;
188
+ }
189
+ else if (Array.isArray(ov) && Array.isArray(nv)) {
190
+ if (!sameJson(ov, nv) && !walkArray([...at, key], ov, nv))
191
+ return false;
192
+ }
193
+ else if (!sameJson(ov, nv) && !replace([...at, key], nv))
194
+ return false;
195
+ }
196
+ return true;
197
+ };
198
+ if (!walk([], oldValue, newValue))
199
+ return null;
200
+ const check = jsonc.parse(text, [], { allowTrailingComma: true });
201
+ return sameJson(check, newValue) ? text : null;
202
+ }
203
+ exports.keepJsonLayout = keepJsonLayout;
204
+ /**
205
+ * Snapshot of JSON config files (package.json, nx.json, project.json, tsconfig*.json,
206
+ * .eslintrc.json) under `root`, outside node_modules, dist and dot folders.
207
+ */
208
+ function snapshotJsonConfigs(root) {
209
+ const files = new Map();
210
+ const wanted = /^(package|nx|project)\.json$|^tsconfig.*\.json$|^\.eslintrc\.json$/;
211
+ const skip = new Set(['node_modules', 'dist', 'tmp', 'coverage']);
212
+ const visit = (dir, depth) => {
213
+ let entries;
214
+ try {
215
+ entries = fs.readdirSync(dir, { withFileTypes: true });
216
+ }
217
+ catch {
218
+ return;
219
+ }
220
+ for (const e of entries) {
221
+ const p = path.join(dir, e.name);
222
+ if (e.isDirectory()) {
223
+ if (depth < 6 && !skip.has(e.name) && !e.name.startsWith('.'))
224
+ visit(p, depth + 1);
225
+ }
226
+ else if (e.isFile() && wanted.test(e.name)) {
227
+ files.set(p, fs.readFileSync(p, 'utf8'));
228
+ }
229
+ }
230
+ };
231
+ visit(root, 0);
232
+ return files;
233
+ }
234
+ exports.snapshotJsonConfigs = snapshotJsonConfigs;
235
+ /**
236
+ * Puts the layout of every snapshotted file that changed back, keeping only the value changes.
237
+ * Returns the workspace-relative files restored.
238
+ */
239
+ function restoreJsonLayouts(root, snapshot, jsonc) {
240
+ const restored = [];
241
+ for (const [file, before] of snapshot) {
242
+ let after;
243
+ try {
244
+ after = fs.readFileSync(file, 'utf8');
245
+ }
246
+ catch {
247
+ continue;
248
+ }
249
+ if (after === before)
250
+ continue;
251
+ const kept = keepJsonLayout(jsonc, before, after);
252
+ if (kept !== null && kept !== after) {
253
+ fs.writeFileSync(file, kept);
254
+ restored.push(path.relative(root, file).split(path.sep).join('/'));
255
+ }
256
+ }
257
+ return restored.sort();
258
+ }
259
+ exports.restoreJsonLayouts = restoreJsonLayouts;
260
+ //# sourceMappingURL=json-layout.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"json-layout.js","sourceRoot":"","sources":["../../../../src/lib/utils/json-layout.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mouryaamit/nx-polystack",
3
- "version": "1.7.0",
3
+ "version": "1.8.4",
4
4
  "description": "Nx plugin and pstack CLI that scaffold and build multi-tech monorepos (Angular, Ionic, Flutter) with a hardened release pipeline.",
5
5
  "license": "MIT",
6
6
  "type": "commonjs",