rman 2.24.0 → 2.24.1

package/builtins/platforms/node/services/clean.service.js

@@ -226,12 +226,14 @@ async function cleanGlobs(dirname, include, exclude, dryRun) {
  * **The build directory is excluded by name from the config, never as the literal `build`** - see
  * `buildDirOf`. Its contents are the *point* of a build and are removed by `clean.include` when the
  * repository asks, not by a rule about stray files. */
-async function cleanTsArtifacts(pkg, dryRun) {
+async function cleanTsArtifacts(pkg, exclude, dryRun) {
     const dirname = pkg.dirname;
     const buildDir = buildDirOf(pkg);
     const files = await fg('**/*.{js,js.map,d.ts}', {
         cwd: dirname,
-        ignore: ['**/node_modules/**', `${buildDir}/**`, `**/${buildDir}/**`],
+        /** `clean.exclude` protects a file from this sweep too - the one way to keep a file the rules
+         *  below would read as output. */
+        ignore: ['**/node_modules/**', `${buildDir}/**`, `**/${buildDir}/**`, ...exclude],
         onlyFiles: true,
         dot: true,
         absolute: true,
@@ -264,17 +266,24 @@ async function cleanTsArtifacts(pkg, dryRun) {
  * - **A `.d.ts` always needs its `.ts`/`.tsx` beside it**, everywhere including `src` - a
  *   hand-written declaration is an ordinary thing to keep in a source tree, and this is the rule
  *   that has always been here.
- * - **A `.js`/`.js.map` under `src`/`test` goes regardless.** Everything there is TypeScript, so an
- *   orphan - output whose source was renamed or deleted - is still output, and sweeping it is the
- *   `ts-cleanup --all` behaviour this replaced.
+ * - **A `.js`/`.js.map` under `src`/`test` goes**, unless a `.d.ts` with no `.ts` sits beside the
+ *   `.js`. Everything else there is TypeScript, so an orphan - output whose source was renamed or
+ *   deleted - is still output, and sweeping it is the `ts-cleanup --all` behaviour this replaced.
  * - **A `.js`/`.js.map` anywhere else needs its source beside it**, because out there it could just
  *   as easily be `index.js`, `*.config.js` or `scripts/*.js`, which nobody generated.
  */
+/* **A `.js` declared by a hand-written `.d.ts` is kept**, because the first rule already reads that
+ * `.d.ts` as hand-written - and a declaration nobody generated describes a module nobody compiled.
+ * Measured on `panates/hl7v2`: `src/data/hl7-data.js`, a generated plain-JS data module with its
+ * `.d.ts` beside it, was deleted by the preset's `rman clean` before every build, and the next step
+ * failed with esbuild's `Could not resolve "./data/hl7-data.js"` - an error about the import, far
+ * from the cause. The cost, stated: a tsc orphan *pair* (`.js` and `.d.ts` whose `.ts` was renamed)
+ * now stays, where before only its `.d.ts` did. */
 function isBuildOutput(dirname, file) {
     if (file.endsWith('.d.ts'))
         return hasTsSource(file, '.d.ts');
     if (insideTsSourceDir(dirname, file))
-        return true;
+        return !(file.endsWith('.js') && isDeclaredByHand(file));
     return hasTsSource(file, file.endsWith('.js.map') ? '.js.map' : '.js');
 }
 /** Directories where everything is TypeScript, so a compiled file needs no source beside it to be
@@ -293,6 +302,11 @@ function hasTsSource(file, suffix) {
     const base = file.slice(0, -suffix.length);
     return fs.existsSync(base + '.ts') || fs.existsSync(base + '.tsx');
 }
+/** Whether a `.js` has a `.d.ts` beside it and no `.ts`/`.tsx` - a module with a hand-written
+ *  declaration, not compiled output. */
+function isDeclaredByHand(file) {
+    return fs.existsSync(file.slice(0, -'.js'.length) + '.d.ts') && !hasTsSource(file, '.js');
+}
 /**
  * Removes TypeScript's incremental-build cache files (`*.tsbuildinfo`) anywhere under `dirname` -
  * `tsc --build`/`composite`/`incremental` output that `ts-cleanup` never touched, but which can
@@ -316,11 +330,11 @@ async function cleanPackage(pkg, item, panelEnabled, dryRun, logger) {
     item.status = 'running';
     item.startedAt = Date.now();
     try {
+        const { include, exclude } = cleanConfig(pkg);
         item.currentStep = 'ts';
-        const tsRemoved = await cleanTsArtifacts(pkg, dryRun);
+        const tsRemoved = await cleanTsArtifacts(pkg, exclude, dryRun);
         const buildInfoRemoved = await cleanTsBuildInfo(pkg.dirname, dryRun);
         item.currentStep = 'glob';
-        const { include, exclude } = cleanConfig(pkg);
         const globRemoved = await cleanGlobs(pkg.dirname, include, exclude, dryRun);
         const removed = [...tsRemoved, ...buildInfoRemoved, ...globRemoved];
         const verb = dryRun ? 'would rm' : 'rm';

package/constants.js

@@ -1 +1 @@
-export const version = '2.24.0';
+export const version = '2.24.1';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rman",
   "description": "Repository manager",
-  "version": "2.24.0",
+  "version": "2.24.1",
   "author": "Panates",
   "license": "MIT",
   "dependencies": {