@mouryaamit/nx-polystack 1.11.12 → 1.12.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -0
- package/dist/migrations.json +10 -0
- package/dist/src/cli/commands/assets.d.ts +6 -0
- package/dist/src/cli/commands/assets.js +100 -0
- package/dist/src/cli/commands/assets.js.map +1 -0
- package/dist/src/cli/commands/index.js +1 -0
- package/dist/src/cli/commands/index.js.map +1 -1
- package/dist/src/cli/commands/infra.d.ts +1 -0
- package/dist/src/cli/commands/infra.js +1 -0
- package/dist/src/cli/commands/infra.js.map +1 -1
- package/dist/src/cli/commands/migrate.js +2 -0
- package/dist/src/cli/commands/migrate.js.map +1 -1
- package/dist/src/cli/commands/upgrade-standalone.js +2 -2
- package/dist/src/cli/commands/upgrade-standalone.js.map +1 -1
- package/dist/src/cli/help.js +17 -0
- package/dist/src/cli/help.js.map +1 -1
- package/dist/src/cli/launcher.js +3 -1
- package/dist/src/cli/launcher.js.map +1 -1
- package/dist/src/generators/adopt/generator.d.ts +10 -0
- package/dist/src/generators/adopt/generator.js +94 -6
- package/dist/src/generators/adopt/generator.js.map +1 -1
- package/dist/src/generators/adopt/old-script-refs.d.ts +6 -2
- package/dist/src/generators/adopt/old-script-refs.js +42 -19
- package/dist/src/generators/adopt/old-script-refs.js.map +1 -1
- package/dist/src/generators/adopt/old-scripts.js +1 -1
- package/dist/src/generators/adopt/old-scripts.js.map +1 -1
- package/dist/src/generators/app/generator.js +5 -0
- package/dist/src/generators/app/generator.js.map +1 -1
- package/dist/src/generators/infra/generator.d.ts +3 -0
- package/dist/src/generators/infra/generator.js +39 -1
- package/dist/src/generators/infra/generator.js.map +1 -1
- package/dist/src/generators/infra/schema.d.ts +1 -0
- package/dist/src/generators/infra/schema.json +5 -0
- package/dist/src/generators/migrate/generator.js +9 -1
- package/dist/src/generators/migrate/generator.js.map +1 -1
- package/dist/src/generators/migrate/quality.d.ts +16 -0
- package/dist/src/generators/migrate/quality.js +114 -0
- package/dist/src/generators/migrate/quality.js.map +1 -0
- package/dist/src/generators/migrate/schema.d.ts +2 -0
- package/dist/src/generators/migrate/schema.json +5 -0
- package/dist/src/generators/preset/files/root/package.json__template__ +3 -0
- package/dist/src/generators/preset/generator.js +2 -0
- package/dist/src/generators/preset/generator.js.map +1 -1
- package/dist/src/lib/assets/source-images.d.ts +26 -0
- package/dist/src/lib/assets/source-images.js +234 -0
- package/dist/src/lib/assets/source-images.js.map +1 -0
- package/dist/src/lib/helpers/image-metadata.d.ts +29 -0
- package/dist/src/lib/helpers/image-metadata.js +253 -0
- package/dist/src/lib/helpers/image-metadata.js.map +1 -0
- package/dist/src/lib/helpers/strip-exif.d.ts +27 -7
- package/dist/src/lib/helpers/strip-exif.js +64 -26
- package/dist/src/lib/helpers/strip-exif.js.map +1 -1
- package/dist/src/lib/old-scripts/tool-scripts.d.ts +83 -0
- package/dist/src/lib/old-scripts/tool-scripts.js +570 -0
- package/dist/src/lib/old-scripts/tool-scripts.js.map +1 -0
- package/dist/src/lib/utils/angular-project.js +1 -1
- package/dist/src/lib/utils/angular-project.js.map +1 -1
- package/dist/src/lib/utils/exif-checks.d.ts +25 -0
- package/dist/src/lib/utils/exif-checks.js +141 -0
- package/dist/src/lib/utils/exif-checks.js.map +1 -0
- package/dist/src/lib/utils/quality.d.ts +57 -4
- package/dist/src/lib/utils/quality.js +192 -23
- package/dist/src/lib/utils/quality.js.map +1 -1
- package/dist/src/migrations/assets-exif-scripts/assets-exif-scripts.d.ts +7 -0
- package/dist/src/migrations/assets-exif-scripts/assets-exif-scripts.js +18 -0
- package/dist/src/migrations/assets-exif-scripts/assets-exif-scripts.js.map +1 -0
- package/dist/src/migrations/typecheck-everywhere/typecheck-everywhere.d.ts +11 -0
- package/dist/src/migrations/typecheck-everywhere/typecheck-everywhere.js +63 -0
- package/dist/src/migrations/typecheck-everywhere/typecheck-everywhere.js.map +1 -0
- package/package.json +1 -1
|
@@ -0,0 +1,570 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.replaceToolScripts = exports.typecheckCommand = exports.exifCommand = exports.findScriptCalls = exports.classifyToolScript = exports.codeOnly = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const path = tslib_1.__importStar(require("path"));
|
|
6
|
+
const old_scripts_1 = require("../../generators/adopt/old-scripts");
|
|
7
|
+
const source_images_1 = require("../assets/source-images");
|
|
8
|
+
const json_layout_1 = require("../utils/json-layout");
|
|
9
|
+
const project_json_files_1 = require("../utils/project-json-files");
|
|
10
|
+
const quality_1 = require("../utils/quality");
|
|
11
|
+
/**
|
|
12
|
+
* Workspace scripts that do a job pstack now does itself, found by what their text does (not by
|
|
13
|
+
* their name): stripping EXIF from source images (`pstack assets strip-exif`) and type-checking
|
|
14
|
+
* without a build (`nx run-many -t typecheck`). Their callers (npm scripts, run-commands targets,
|
|
15
|
+
* git hooks, lint-staged, CI) are pointed at pstack, so the scripts can go. A script that does
|
|
16
|
+
* more than that one job is left, with what else it does.
|
|
17
|
+
*/
|
|
18
|
+
const posix = path.posix;
|
|
19
|
+
const BUILD_DRIVER = /\b(?:npx\s+)?nx\s+(?:build|run-many\s[^`'"]*\bbuild\b|run\s+[^`'"\s]+:build)|\bng\s+build\b/;
|
|
20
|
+
const IMAGE_LIB = /(?:require\(\s*|from\s+|import\(\s*)['"](sharp|piexifjs|exiftool-vendored|jpeg-autorotate|exifr)['"]/;
|
|
21
|
+
const EXIF_INTENT = /exif|metadata|piexif\.remove/i;
|
|
22
|
+
/** Image extensions the script looks for (also written as a regex: `jpe?g`). */
|
|
23
|
+
const IMAGE_EXT = /jpe\??g|\bpng\b|\bwebp\b/i;
|
|
24
|
+
const WALKS_DIRS = /\breaddir(?:Sync)?\s*\(|\bglob(?:Sync)?\s*\(|\bfast-glob\b|\bwalk\w*\s*\(/;
|
|
25
|
+
const IMAGE_MORE = [
|
|
26
|
+
[/\.resize\s*\(/, 'resizes images'],
|
|
27
|
+
[/\.composite\s*\(/, 'composites images'],
|
|
28
|
+
[/\.(?:avif|toFormat|heif|gif|tiff)\s*\(/, 'converts image formats'],
|
|
29
|
+
[/\bimagemin\b/, 'compresses images (imagemin)'],
|
|
30
|
+
[/\.(?:extend|sharpen|blur|trim|flatten|modulate|tint|grayscale|greyscale)\s*\(/, 'edits images'],
|
|
31
|
+
];
|
|
32
|
+
const TSC = /(?:^|[\s'"`([,])(?:npx\s+)?(?:\.\/)?(?:node_modules\/\.bin\/)?tsc(?:\.cmd)?(?=[\s'"`,)\]]|$)|typescript\/bin\/tsc/m;
|
|
33
|
+
const NGC = /(?:^|[\s'"`([,])(?:npx\s+)?ngc(?=[\s'"`,)\]]|$)|@angular\/compiler-cli\/bundles\/src\/bin\/ngc/m;
|
|
34
|
+
const NO_EMIT = /--noEmit\b|noEmit\s*:\s*true/;
|
|
35
|
+
const TS_API = /\bcreateProgram\s*\(/;
|
|
36
|
+
const TS_DIAG = /getPreEmitDiagnostics\s*\(/;
|
|
37
|
+
const TSCONFIG_LITERAL = /(?:^|[\s'"`=(,[])((?:\.\/)?(?:[\w@.${}-]+\/)*tsconfig(?:\.[\w-]+)?\.json)(?=[\s'"`),\]]|$)/gm;
|
|
38
|
+
/** What else a type-check script does, from its text. */
|
|
39
|
+
function typecheckMore(text) {
|
|
40
|
+
const more = [];
|
|
41
|
+
const readsSources = /\breadFile(?:Sync)?\s*\(/.test(text) && /\.tsx?['"`)]/.test(text);
|
|
42
|
+
const importPattern = /\/[^/\n]*\bimport\b[^/\n]*\/[gimsuy]*|new RegExp\([^)]*\bimport\b|['"`][^'"`\n]*\bfrom\s+['"`]/;
|
|
43
|
+
if (readsSources && importPattern.test(text))
|
|
44
|
+
more.push('checks import statements itself');
|
|
45
|
+
for (const line of text.split('\n')) {
|
|
46
|
+
if (/\bwriteFile(?:Sync)?\s*\(/.test(line) && !/tsconfig/i.test(line)) {
|
|
47
|
+
more.push('writes files');
|
|
48
|
+
break;
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
if (BUILD_DRIVER.test(text))
|
|
52
|
+
more.push('runs a build');
|
|
53
|
+
return more;
|
|
54
|
+
}
|
|
55
|
+
const isDir = (tree, p) => tree.exists(p) && !tree.isFile(p);
|
|
56
|
+
const normalize = (p) => posix.normalize(p.replace(/\\/g, '/')).replace(/^\.\//, '');
|
|
57
|
+
/**
|
|
58
|
+
* The code of a script without its comments, so what a comment mentions (".withMetadata() is not
|
|
59
|
+
* used", "without a build") does not count as what the script does. `//` after a `:` (URLs) stays.
|
|
60
|
+
*/
|
|
61
|
+
function codeOnly(text) {
|
|
62
|
+
return text.replace(/\/\*[\s\S]*?\*\//g, '').replace(/(^|[^:'"`\\])\/\/[^\n]*/g, '$1');
|
|
63
|
+
}
|
|
64
|
+
exports.codeOnly = codeOnly;
|
|
65
|
+
/**
|
|
66
|
+
* Folder literals of a script that exist in the workspace (workspace-relative). A `../` literal is
|
|
67
|
+
* read against the script's folder (`path.join(__dirname, '../../apps/web/src/assets')`).
|
|
68
|
+
*/
|
|
69
|
+
function dirLiterals(tree, script, text, mapPath) {
|
|
70
|
+
const out = new Set();
|
|
71
|
+
for (const m of text.matchAll(/['"`]((?:\.\/)?[\w@.-]+(?:\/[\w@.-]+)+\/?)['"`]/g)) {
|
|
72
|
+
let p = normalize(m[1]).replace(/\/$/, '');
|
|
73
|
+
if (p.startsWith('../'))
|
|
74
|
+
p = normalize(posix.join(posix.dirname(script), p));
|
|
75
|
+
if (p.startsWith('..'))
|
|
76
|
+
continue;
|
|
77
|
+
if (p.startsWith('node_modules') || p.startsWith('dist'))
|
|
78
|
+
continue;
|
|
79
|
+
const at = isDir(tree, p) ? p : mapPath?.(p);
|
|
80
|
+
if (at && isDir(tree, at))
|
|
81
|
+
out.add(at);
|
|
82
|
+
}
|
|
83
|
+
return [...out].sort();
|
|
84
|
+
}
|
|
85
|
+
/**
|
|
86
|
+
* What a script does, when its job is one pstack does: null for anything else. `mapPath` maps a
|
|
87
|
+
* path written for the source repo to the workspace (pstack migrate).
|
|
88
|
+
*/
|
|
89
|
+
function classifyToolScript(tree, script, mapPath) {
|
|
90
|
+
const files = [...(0, old_scripts_1.scriptClosure)(tree, [script])].sort();
|
|
91
|
+
const raw = files.map((f) => tree.read(f, 'utf8') ?? '').join('\n');
|
|
92
|
+
// What the script does is read from its code; why (EXIF) may only be said in a comment.
|
|
93
|
+
const text = codeOnly(raw);
|
|
94
|
+
const flags = [...new Set([...text.matchAll(/['"`](--[a-z][\w-]*)/g)].map((m) => m[1]))].sort();
|
|
95
|
+
const base = { script, files, flags, dirs: [], tsconfigs: [], walks: [], templates: false };
|
|
96
|
+
if (IMAGE_LIB.test(text) &&
|
|
97
|
+
EXIF_INTENT.test(raw) &&
|
|
98
|
+
IMAGE_EXT.test(text) &&
|
|
99
|
+
WALKS_DIRS.test(text)) {
|
|
100
|
+
const more = IMAGE_MORE.filter(([re]) => re.test(text)).map(([, why]) => why);
|
|
101
|
+
if (BUILD_DRIVER.test(text))
|
|
102
|
+
more.push('runs a build');
|
|
103
|
+
if (/withMetadata\s*\(/.test(text))
|
|
104
|
+
more.push('keeps metadata (withMetadata)');
|
|
105
|
+
return { ...base, job: 'strip-exif', more, dirs: dirLiterals(tree, script, text, mapPath) };
|
|
106
|
+
}
|
|
107
|
+
const tsc = TSC.test(text) && NO_EMIT.test(text);
|
|
108
|
+
const api = TS_API.test(text) && TS_DIAG.test(text);
|
|
109
|
+
const ngc = NGC.test(text) && NO_EMIT.test(text);
|
|
110
|
+
if (tsc || api || ngc) {
|
|
111
|
+
const tsconfigs = new Set();
|
|
112
|
+
const walks = new Set();
|
|
113
|
+
for (const m of text.matchAll(TSCONFIG_LITERAL)) {
|
|
114
|
+
const p = normalize(m[1]);
|
|
115
|
+
if (p.includes('$')) {
|
|
116
|
+
// A path built in a template: the script walks folders for that file name.
|
|
117
|
+
if (p.endsWith('tsconfig.app.json'))
|
|
118
|
+
walks.add('app');
|
|
119
|
+
else if (p.endsWith('tsconfig.lib.json'))
|
|
120
|
+
walks.add('lib');
|
|
121
|
+
}
|
|
122
|
+
else if (p.includes('/')) {
|
|
123
|
+
const at = tree.exists(p) ? p : mapPath?.(p);
|
|
124
|
+
if (at && tree.exists(at))
|
|
125
|
+
tsconfigs.add(at);
|
|
126
|
+
}
|
|
127
|
+
else if (p === 'tsconfig.app.json')
|
|
128
|
+
walks.add('app');
|
|
129
|
+
else if (p === 'tsconfig.lib.json')
|
|
130
|
+
walks.add('lib');
|
|
131
|
+
}
|
|
132
|
+
// `${dir}/tsconfig.app.json` built from a folder walk.
|
|
133
|
+
if (/tsconfig\.app\.json/.test(text) && WALKS_DIRS.test(text))
|
|
134
|
+
walks.add('app');
|
|
135
|
+
if (/tsconfig\.lib\.json/.test(text) && WALKS_DIRS.test(text))
|
|
136
|
+
walks.add('lib');
|
|
137
|
+
const more = typecheckMore(text);
|
|
138
|
+
return {
|
|
139
|
+
...base,
|
|
140
|
+
job: 'typecheck',
|
|
141
|
+
more,
|
|
142
|
+
tsconfigs: [...tsconfigs].sort(),
|
|
143
|
+
walks: [...walks].sort(),
|
|
144
|
+
templates: ngc,
|
|
145
|
+
};
|
|
146
|
+
}
|
|
147
|
+
return null;
|
|
148
|
+
}
|
|
149
|
+
exports.classifyToolScript = classifyToolScript;
|
|
150
|
+
/** Text files that run commands: package.json, project.json, hooks, lint-staged, CI. */
|
|
151
|
+
function callerFiles(tree) {
|
|
152
|
+
const out = [];
|
|
153
|
+
const skip = new Set(['node_modules', 'dist', 'tmp', 'coverage', '.git', '.nx', '.angular']);
|
|
154
|
+
const walk = (dir, depth) => {
|
|
155
|
+
if (depth > 8)
|
|
156
|
+
return;
|
|
157
|
+
for (const name of tree.children(dir)) {
|
|
158
|
+
if (skip.has(name))
|
|
159
|
+
continue;
|
|
160
|
+
const rel = dir ? `${dir}/${name}` : name;
|
|
161
|
+
if (!tree.isFile(rel)) {
|
|
162
|
+
walk(rel, depth + 1);
|
|
163
|
+
continue;
|
|
164
|
+
}
|
|
165
|
+
const b = posix.basename(rel);
|
|
166
|
+
if (b === 'package.json' ||
|
|
167
|
+
b === 'project.json' ||
|
|
168
|
+
/^Jenkinsfile/.test(b) ||
|
|
169
|
+
/^(\.gitlab-ci|azure-pipelines|bitbucket-pipelines)\.ya?ml$/.test(b) ||
|
|
170
|
+
/^\.github\/workflows\/[^/]+\.ya?ml$/.test(rel) ||
|
|
171
|
+
/^\.husky\/[^/]+$/.test(rel) ||
|
|
172
|
+
/^\.lintstagedrc(\.json)?$/.test(b)) {
|
|
173
|
+
out.push(rel);
|
|
174
|
+
}
|
|
175
|
+
}
|
|
176
|
+
};
|
|
177
|
+
walk('', 0);
|
|
178
|
+
return out.sort();
|
|
179
|
+
}
|
|
180
|
+
const CALL = /(?:\bnpx\s+)?\bnode\s+(['"]?)((?:\.\/)?[\w@./-]+\.(?:c|m)?js)\1((?:[ \t]+(?!&&|\|\|)[^\s;&|<>]+)*)/g;
|
|
181
|
+
/** `node <file>.js args` calls in a command string, the file resolved against `cwd`. */
|
|
182
|
+
function callsIn(command, cwd) {
|
|
183
|
+
const out = [];
|
|
184
|
+
for (const m of command.matchAll(CALL)) {
|
|
185
|
+
const script = normalize(cwd ? posix.join(cwd, m[2]) : m[2]);
|
|
186
|
+
const args = (m[3] ?? '')
|
|
187
|
+
.trim()
|
|
188
|
+
.split(/[ \t]+/)
|
|
189
|
+
.filter(Boolean)
|
|
190
|
+
.map(unquote);
|
|
191
|
+
out.push({ script, args, text: m[0] });
|
|
192
|
+
}
|
|
193
|
+
return out;
|
|
194
|
+
}
|
|
195
|
+
const unquote = (s) => s.replace(/^(['"])(.*)\1$/, '$2');
|
|
196
|
+
const isObject = (v) => typeof v === 'object' && v !== null && !Array.isArray(v);
|
|
197
|
+
/** Every `node <script>` call of the workspace's command files. */
|
|
198
|
+
function findScriptCalls(tree) {
|
|
199
|
+
const calls = [];
|
|
200
|
+
for (const file of callerFiles(tree)) {
|
|
201
|
+
const text = tree.read(file, 'utf8') ?? '';
|
|
202
|
+
if (!/\bnode\s/.test(text))
|
|
203
|
+
continue;
|
|
204
|
+
const add = (where, command, cwd = '') => {
|
|
205
|
+
for (const c of callsIn(command, cwd))
|
|
206
|
+
calls.push({ file, where, ...c });
|
|
207
|
+
};
|
|
208
|
+
if (file.endsWith('.json')) {
|
|
209
|
+
let json;
|
|
210
|
+
try {
|
|
211
|
+
json = JSON.parse(text);
|
|
212
|
+
}
|
|
213
|
+
catch {
|
|
214
|
+
continue;
|
|
215
|
+
}
|
|
216
|
+
if (posix.basename(file) === 'package.json') {
|
|
217
|
+
for (const [k, v] of Object.entries(isObject(json['scripts']) ? json['scripts'] : {})) {
|
|
218
|
+
if (typeof v === 'string')
|
|
219
|
+
add(`scripts.${k}`, v);
|
|
220
|
+
}
|
|
221
|
+
lintStagedCalls(json['lint-staged'], add);
|
|
222
|
+
}
|
|
223
|
+
else if (posix.basename(file) === 'project.json') {
|
|
224
|
+
for (const [t, target] of Object.entries(isObject(json['targets']) ? json['targets'] : {})) {
|
|
225
|
+
if (!isObject(target) || !isObject(target['options']))
|
|
226
|
+
continue;
|
|
227
|
+
const o = target['options'];
|
|
228
|
+
const cwd = typeof o['cwd'] === 'string' ? normalize(o['cwd']) : '';
|
|
229
|
+
for (const c of runCommands(o))
|
|
230
|
+
add(`targets.${t}`, c, cwd);
|
|
231
|
+
}
|
|
232
|
+
}
|
|
233
|
+
else {
|
|
234
|
+
lintStagedCalls(json, add);
|
|
235
|
+
}
|
|
236
|
+
continue;
|
|
237
|
+
}
|
|
238
|
+
text.split('\n').forEach((line, i) => add(`line ${i + 1}`, line));
|
|
239
|
+
}
|
|
240
|
+
return calls;
|
|
241
|
+
}
|
|
242
|
+
exports.findScriptCalls = findScriptCalls;
|
|
243
|
+
function lintStagedCalls(config, add) {
|
|
244
|
+
if (!isObject(config))
|
|
245
|
+
return;
|
|
246
|
+
for (const [glob, cmds] of Object.entries(config)) {
|
|
247
|
+
for (const c of Array.isArray(cmds) ? cmds : [cmds]) {
|
|
248
|
+
if (typeof c === 'string')
|
|
249
|
+
add(`lint-staged "${glob}"`, c);
|
|
250
|
+
}
|
|
251
|
+
}
|
|
252
|
+
}
|
|
253
|
+
function runCommands(o) {
|
|
254
|
+
const out = [];
|
|
255
|
+
if (typeof o['command'] === 'string')
|
|
256
|
+
out.push(o['command']);
|
|
257
|
+
if (Array.isArray(o['commands'])) {
|
|
258
|
+
for (const c of o['commands']) {
|
|
259
|
+
if (typeof c === 'string')
|
|
260
|
+
out.push(c);
|
|
261
|
+
else if (isObject(c) && typeof c['command'] === 'string')
|
|
262
|
+
out.push(c['command']);
|
|
263
|
+
}
|
|
264
|
+
}
|
|
265
|
+
return out;
|
|
266
|
+
}
|
|
267
|
+
const sameSet = (a, b) => a.length === b.length && [...a].sort().every((x, i) => x === [...b].sort()[i]);
|
|
268
|
+
/** `pstack assets strip-exif …` for an EXIF script call. */
|
|
269
|
+
function exifCommand(tree, job, call, mapPath) {
|
|
270
|
+
const lintStaged = call.where.startsWith('lint-staged');
|
|
271
|
+
const dirs = [];
|
|
272
|
+
const extra = [];
|
|
273
|
+
for (const a of call.args) {
|
|
274
|
+
const flag = /^--(dir|path|src|folder|input)=(.+)$/.exec(a);
|
|
275
|
+
const value = flag ? flag[2] : a.startsWith('-') ? undefined : a;
|
|
276
|
+
if (value !== undefined) {
|
|
277
|
+
if (lintStaged)
|
|
278
|
+
return { leave: `takes arguments in lint-staged (${call.args.join(' ')})` };
|
|
279
|
+
for (const v of value.split(',')) {
|
|
280
|
+
const p = normalize(v).replace(/\/$/, '');
|
|
281
|
+
const at = isDir(tree, p) ? p : mapPath?.(p);
|
|
282
|
+
if (!at || !isDir(tree, at))
|
|
283
|
+
return { leave: `argument ${a} is not a folder pstack knows` };
|
|
284
|
+
dirs.push(at);
|
|
285
|
+
}
|
|
286
|
+
}
|
|
287
|
+
else if (a === '--check' || a === '--dry-run') {
|
|
288
|
+
if (!job.flags.includes(a))
|
|
289
|
+
return { leave: `passes ${a}, which the script does not read` };
|
|
290
|
+
extra.push(a);
|
|
291
|
+
}
|
|
292
|
+
else {
|
|
293
|
+
return { leave: `passes ${a}, which pstack cannot map` };
|
|
294
|
+
}
|
|
295
|
+
}
|
|
296
|
+
if (lintStaged)
|
|
297
|
+
return { command: 'pstack assets strip-exif' };
|
|
298
|
+
const folders = dirs.length > 0 ? dirs : job.dirs;
|
|
299
|
+
if (folders.length === 0)
|
|
300
|
+
return { leave: 'could not tell which folders it cleans' };
|
|
301
|
+
if (folders.every((d) => d === 'dist' || d.startsWith('dist/'))) {
|
|
302
|
+
return { leave: 'cleans dist/ (the release build already strips image metadata)' };
|
|
303
|
+
}
|
|
304
|
+
const tail = extra.length ? ` ${extra.join(' ')}` : '';
|
|
305
|
+
// The same images as --all, or as some apps, else exactly these folders.
|
|
306
|
+
const want = (0, source_images_1.imageFiles)(tree, folders.map((p) => ({ owner: '', path: p })));
|
|
307
|
+
const allFiles = (0, source_images_1.imageFiles)(tree, (0, source_images_1.selectImageSources)(tree, { all: true }));
|
|
308
|
+
if (want.length > 0 && sameSet(want, allFiles) && sameSet(folders, folderSet(tree, true))) {
|
|
309
|
+
return { command: `pstack assets strip-exif --all${tail}` };
|
|
310
|
+
}
|
|
311
|
+
const apps = appsOwning(tree, folders);
|
|
312
|
+
if (apps)
|
|
313
|
+
return { command: `pstack assets strip-exif --app=${apps.join(',')}${tail}` };
|
|
314
|
+
return { command: `pstack assets strip-exif --dir=${folders.join(',')}${tail}` };
|
|
315
|
+
}
|
|
316
|
+
exports.exifCommand = exifCommand;
|
|
317
|
+
/** The existing source folders of --all. */
|
|
318
|
+
function folderSet(tree, all) {
|
|
319
|
+
return [
|
|
320
|
+
...new Set((0, source_images_1.selectImageSources)(tree, { all })
|
|
321
|
+
.map((s) => s.path)
|
|
322
|
+
.filter((p) => isDir(tree, p))),
|
|
323
|
+
];
|
|
324
|
+
}
|
|
325
|
+
/** Apps whose existing source folders are exactly these folders, if any. */
|
|
326
|
+
function appsOwning(tree, folders) {
|
|
327
|
+
const projects = (0, project_json_files_1.scanProjects)(tree).filter((p) => p.json['projectType'] === 'application');
|
|
328
|
+
const owners = [];
|
|
329
|
+
const covered = new Set();
|
|
330
|
+
for (const p of projects) {
|
|
331
|
+
const own = [...new Set((0, source_images_1.projectImageSources)(tree, p).map((s) => s.path))].filter((d) => isDir(tree, d));
|
|
332
|
+
if (own.length > 0 && own.every((d) => folders.includes(d))) {
|
|
333
|
+
owners.push(p.name);
|
|
334
|
+
own.forEach((d) => covered.add(d));
|
|
335
|
+
}
|
|
336
|
+
}
|
|
337
|
+
return owners.length > 0 && sameSet([...covered], folders) ? owners.sort() : null;
|
|
338
|
+
}
|
|
339
|
+
/** Projects with a typecheck (or a tsconfig it would check). */
|
|
340
|
+
function typedProjects(tree) {
|
|
341
|
+
return (0, project_json_files_1.scanProjects)(tree).filter((p) => {
|
|
342
|
+
const t = isObject(p.json['targets']) ? p.json['targets'] : {};
|
|
343
|
+
return t['typecheck'] !== undefined || (0, quality_1.typecheckTsconfig)(tree, p.root) !== undefined;
|
|
344
|
+
});
|
|
345
|
+
}
|
|
346
|
+
const KINDS = {
|
|
347
|
+
angular: (tree, p) => (0, quality_1.isAngularProject)(tree, p.root, p.json),
|
|
348
|
+
ionic: (tree, p) => tree.exists(`${p.root}/capacitor.config.ts`) || tree.exists(`${p.root}/ionic.config.json`),
|
|
349
|
+
web: (tree, p) => !KINDS['ionic'](tree, p),
|
|
350
|
+
app: (_tree, p) => p.json['projectType'] === 'application',
|
|
351
|
+
apps: (_tree, p) => p.json['projectType'] === 'application',
|
|
352
|
+
lib: (_tree, p) => p.json['projectType'] === 'library',
|
|
353
|
+
libs: (_tree, p) => p.json['projectType'] === 'library',
|
|
354
|
+
};
|
|
355
|
+
/** `nx run-many -t typecheck …` for a type-check script call. */
|
|
356
|
+
function typecheckCommand(tree, job, call) {
|
|
357
|
+
if (call.where.startsWith('lint-staged'))
|
|
358
|
+
return { leave: 'runs from lint-staged (gets file names)' };
|
|
359
|
+
const typed = typedProjects(tree);
|
|
360
|
+
// The projects the script checks.
|
|
361
|
+
let chosen = typed.filter((p) => {
|
|
362
|
+
const tsconfig = (0, quality_1.typecheckTsconfig)(tree, p.root);
|
|
363
|
+
if (job.tsconfigs.some((t) => posix.dirname(t) === (p.root === '.' ? '.' : p.root)))
|
|
364
|
+
return true;
|
|
365
|
+
if (!tsconfig)
|
|
366
|
+
return false;
|
|
367
|
+
return ((job.walks.includes('app') && tsconfig.endsWith('tsconfig.app.json')) ||
|
|
368
|
+
(job.walks.includes('lib') && tsconfig.endsWith('tsconfig.lib.json')));
|
|
369
|
+
});
|
|
370
|
+
let byName = false;
|
|
371
|
+
for (const a of call.args) {
|
|
372
|
+
const named = /^--(?:app|apps|project|projects)=(.+)$/.exec(a);
|
|
373
|
+
const kind = /^--([a-z]+)$/.exec(a);
|
|
374
|
+
if (named || !a.startsWith('-')) {
|
|
375
|
+
const names = (named ? named[1] : a).split(',');
|
|
376
|
+
const unknown = names.filter((n) => !chosen.some((p) => p.name === n));
|
|
377
|
+
if (unknown.length)
|
|
378
|
+
return { leave: `names ${unknown.join(', ')}, which it does not check` };
|
|
379
|
+
chosen = chosen.filter((p) => names.includes(p.name));
|
|
380
|
+
byName = true;
|
|
381
|
+
}
|
|
382
|
+
else if (kind && KINDS[kind[1]] && job.flags.includes(a)) {
|
|
383
|
+
chosen = chosen.filter((p) => KINDS[kind[1]](tree, p));
|
|
384
|
+
}
|
|
385
|
+
else {
|
|
386
|
+
return { leave: `passes ${a}, which pstack cannot map` };
|
|
387
|
+
}
|
|
388
|
+
}
|
|
389
|
+
if (chosen.length === 0)
|
|
390
|
+
return { leave: 'could not tell which projects it checks' };
|
|
391
|
+
const missing = chosen.filter((p) => {
|
|
392
|
+
const t = isObject(p.json['targets']) ? p.json['targets'] : {};
|
|
393
|
+
return t['typecheck'] === undefined && !(0, quality_1.typecheckTsconfig)(tree, p.root);
|
|
394
|
+
});
|
|
395
|
+
if (missing.length)
|
|
396
|
+
return { leave: `${missing.map((p) => p.name).join(', ')} have no tsconfig` };
|
|
397
|
+
const templates = job.templates ? ' -c templates' : '';
|
|
398
|
+
const names = chosen.map((p) => p.name).sort();
|
|
399
|
+
// Projects named on the command line stay named, even when they are all there is today.
|
|
400
|
+
if (!byName &&
|
|
401
|
+
sameSet(names, typed.map((p) => p.name)))
|
|
402
|
+
return { command: `nx run-many -t typecheck${templates}`, projects: chosen };
|
|
403
|
+
if (names.length === 1)
|
|
404
|
+
return {
|
|
405
|
+
command: `nx run ${names[0]}:typecheck${templates ? ':templates' : ''}`,
|
|
406
|
+
projects: chosen,
|
|
407
|
+
};
|
|
408
|
+
// A tag that selects exactly these projects, so new ones join.
|
|
409
|
+
const tags = new Set(chosen.flatMap((p) => (Array.isArray(p.json['tags']) ? p.json['tags'] : [])));
|
|
410
|
+
for (const tag of [...tags].sort()) {
|
|
411
|
+
const tagged = typed.filter((p) => Array.isArray(p.json['tags']) && p.json['tags'].includes(tag));
|
|
412
|
+
if (sameSet(tagged.map((p) => p.name), names)) {
|
|
413
|
+
return {
|
|
414
|
+
command: `nx run-many -t typecheck --projects=tag:${tag}${templates}`,
|
|
415
|
+
projects: chosen,
|
|
416
|
+
};
|
|
417
|
+
}
|
|
418
|
+
}
|
|
419
|
+
return {
|
|
420
|
+
command: `nx run-many -t typecheck -p ${names.join(',')}${templates}`,
|
|
421
|
+
projects: chosen,
|
|
422
|
+
};
|
|
423
|
+
}
|
|
424
|
+
exports.typecheckCommand = typecheckCommand;
|
|
425
|
+
/** Rewrites one call in a command file. */
|
|
426
|
+
function rewriteCall(tree, call, command) {
|
|
427
|
+
const before = tree.read(call.file, 'utf8');
|
|
428
|
+
if (before === null)
|
|
429
|
+
return false;
|
|
430
|
+
const replace = (s) => s.split(call.text).join(command);
|
|
431
|
+
if (!call.file.endsWith('.json')) {
|
|
432
|
+
const lines = before.split('\n');
|
|
433
|
+
const n = Number(/^line (\d+)$/.exec(call.where)?.[1]) - 1;
|
|
434
|
+
if (!(n >= 0) || !lines[n]?.includes(call.text))
|
|
435
|
+
return false;
|
|
436
|
+
lines[n] = replace(lines[n]);
|
|
437
|
+
tree.write(call.file, lines.join('\n'));
|
|
438
|
+
return true;
|
|
439
|
+
}
|
|
440
|
+
let json;
|
|
441
|
+
try {
|
|
442
|
+
json = JSON.parse(before);
|
|
443
|
+
}
|
|
444
|
+
catch {
|
|
445
|
+
return false;
|
|
446
|
+
}
|
|
447
|
+
let done = false;
|
|
448
|
+
const visit = (v) => {
|
|
449
|
+
if (typeof v === 'string' && v.includes(call.text)) {
|
|
450
|
+
done = true;
|
|
451
|
+
return replace(v);
|
|
452
|
+
}
|
|
453
|
+
if (Array.isArray(v))
|
|
454
|
+
return v.map(visit);
|
|
455
|
+
if (isObject(v)) {
|
|
456
|
+
for (const k of Object.keys(v))
|
|
457
|
+
v[k] = visit(v[k]);
|
|
458
|
+
}
|
|
459
|
+
return v;
|
|
460
|
+
};
|
|
461
|
+
const [head, ...rest] = call.where.split('.');
|
|
462
|
+
if (head === 'scripts' && isObject(json['scripts'])) {
|
|
463
|
+
const k = rest.join('.');
|
|
464
|
+
json['scripts'][k] = visit(json['scripts'][k]);
|
|
465
|
+
}
|
|
466
|
+
else if (head === 'targets' && isObject(json['targets'])) {
|
|
467
|
+
const k = rest.join('.');
|
|
468
|
+
json['targets'][k] = visit(json['targets'][k]);
|
|
469
|
+
}
|
|
470
|
+
else if (call.where.startsWith('lint-staged')) {
|
|
471
|
+
const glob = /^lint-staged "(.*)"$/.exec(call.where)?.[1] ?? '';
|
|
472
|
+
const cfg = posix.basename(call.file) === 'package.json' ? json['lint-staged'] : json;
|
|
473
|
+
if (isObject(cfg))
|
|
474
|
+
cfg[glob] = visit(cfg[glob]);
|
|
475
|
+
}
|
|
476
|
+
if (!done)
|
|
477
|
+
return false;
|
|
478
|
+
const after = JSON.stringify(json, null, 2) + '\n';
|
|
479
|
+
const jsonc = (0, json_layout_1.loadJsonc)(tree.root);
|
|
480
|
+
tree.write(call.file, (jsonc && (0, json_layout_1.keepJsonLayout)(jsonc, before, after)) || after);
|
|
481
|
+
return true;
|
|
482
|
+
}
|
|
483
|
+
/**
|
|
484
|
+
* Adds the typecheck target (and its templates configuration) where pstack can; returns the
|
|
485
|
+
* projects that still lack what the command runs.
|
|
486
|
+
*/
|
|
487
|
+
function typecheckTargetsFor(tree, projects, templates) {
|
|
488
|
+
const missing = [];
|
|
489
|
+
for (const p of [...new Map(projects.map((x) => [x.root, x])).values()]) {
|
|
490
|
+
(0, quality_1.typecheckTargetChange)(tree, p.root);
|
|
491
|
+
if (templates)
|
|
492
|
+
(0, quality_1.templatesConfigChange)(tree, p.root);
|
|
493
|
+
const file = p.root === '.' ? 'project.json' : `${p.root}/project.json`;
|
|
494
|
+
let json = {};
|
|
495
|
+
try {
|
|
496
|
+
json = JSON.parse(tree.read(file, 'utf8') ?? '{}');
|
|
497
|
+
}
|
|
498
|
+
catch {
|
|
499
|
+
missing.push(p.name);
|
|
500
|
+
continue;
|
|
501
|
+
}
|
|
502
|
+
const tc = isObject(json['targets']) ? json['targets']['typecheck'] : undefined;
|
|
503
|
+
const ok = isObject(tc) &&
|
|
504
|
+
(!templates ||
|
|
505
|
+
(isObject(tc['configurations']) && tc['configurations']['templates'] !== undefined));
|
|
506
|
+
if (!ok)
|
|
507
|
+
missing.push(p.name);
|
|
508
|
+
}
|
|
509
|
+
return missing;
|
|
510
|
+
}
|
|
511
|
+
/**
|
|
512
|
+
* Finds the scripts that strip EXIF from source images or type-check without a build, and points
|
|
513
|
+
* every call of them at pstack. A script whose calls cannot all be mapped, or that does more, is
|
|
514
|
+
* left (its calls too) and reported.
|
|
515
|
+
*/
|
|
516
|
+
function replaceToolScripts(tree, opts = {}) {
|
|
517
|
+
const calls = findScriptCalls(tree).filter((c) => tree.exists(c.script));
|
|
518
|
+
const scripts = [...new Set(calls.map((c) => c.script))].filter((s) => !opts.only || opts.only(s));
|
|
519
|
+
const outcomes = [];
|
|
520
|
+
for (const script of scripts.sort()) {
|
|
521
|
+
const job = classifyToolScript(tree, script, opts.mapPath);
|
|
522
|
+
if (!job)
|
|
523
|
+
continue;
|
|
524
|
+
const mine = calls.filter((c) => c.script === script);
|
|
525
|
+
const out = {
|
|
526
|
+
script,
|
|
527
|
+
job: job.job,
|
|
528
|
+
rewritten: [],
|
|
529
|
+
left: [],
|
|
530
|
+
replaced: false,
|
|
531
|
+
};
|
|
532
|
+
outcomes.push(out);
|
|
533
|
+
if (job.more.length > 0) {
|
|
534
|
+
out.left.push(`does more than ${job.job === 'typecheck' ? 'type-check' : 'strip EXIF'}: ${job.more.join(', ')}`);
|
|
535
|
+
continue;
|
|
536
|
+
}
|
|
537
|
+
const mapped = mine.map((c) => ({
|
|
538
|
+
call: c,
|
|
539
|
+
m: job.job === 'strip-exif'
|
|
540
|
+
? exifCommand(tree, job, c, opts.mapPath)
|
|
541
|
+
: typecheckCommand(tree, job, c),
|
|
542
|
+
}));
|
|
543
|
+
const leave = mapped.filter((x) => 'leave' in x.m);
|
|
544
|
+
if (leave.length > 0) {
|
|
545
|
+
// All or nothing: the script stays while anything still runs it.
|
|
546
|
+
for (const x of leave)
|
|
547
|
+
out.left.push(`${x.call.file} ${x.call.where}: ${x.m.leave}`);
|
|
548
|
+
continue;
|
|
549
|
+
}
|
|
550
|
+
// The typecheck targets (and templates configurations) the new commands run.
|
|
551
|
+
const missing = typecheckTargetsFor(tree, mapped.flatMap((x) => ('projects' in x.m ? x.m.projects ?? [] : [])), job.templates);
|
|
552
|
+
if (missing.length > 0) {
|
|
553
|
+
out.left.push(`no typecheck${job.templates ? ' templates configuration' : ''} target in ${missing.join(', ')}`);
|
|
554
|
+
continue;
|
|
555
|
+
}
|
|
556
|
+
for (const { call, m } of mapped) {
|
|
557
|
+
const command = m.command;
|
|
558
|
+
if (rewriteCall(tree, call, command)) {
|
|
559
|
+
out.rewritten.push(`${call.file} ${call.where}: ${call.text.trim()} → ${command}`);
|
|
560
|
+
}
|
|
561
|
+
else {
|
|
562
|
+
out.left.push(`${call.file} ${call.where}: could not be rewritten`);
|
|
563
|
+
}
|
|
564
|
+
}
|
|
565
|
+
out.replaced = out.left.length === 0;
|
|
566
|
+
}
|
|
567
|
+
return outcomes;
|
|
568
|
+
}
|
|
569
|
+
exports.replaceToolScripts = replaceToolScripts;
|
|
570
|
+
//# sourceMappingURL=tool-scripts.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tool-scripts.js","sourceRoot":"","sources":["../../../../src/lib/old-scripts/tool-scripts.ts"],"names":[],"mappings":"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"}
|
|
@@ -141,7 +141,7 @@ function angularProjectTargets(name, root = `apps/${name}`, opts = {}) {
|
|
|
141
141
|
serve: angularServeTarget(name, opts.port, opts.angularMajor),
|
|
142
142
|
release: angularReleaseTarget(name, root),
|
|
143
143
|
clean: cleanTarget(root),
|
|
144
|
-
typecheck: (0, quality_1.typecheckTarget)(`${root}/tsconfig.app.json
|
|
144
|
+
typecheck: (0, quality_1.typecheckTarget)(`${root}/tsconfig.app.json`, { templates: true }),
|
|
145
145
|
lint: {
|
|
146
146
|
executor: '@nx/eslint:lint',
|
|
147
147
|
outputs: ['{options.outputFile}'],
|