pob 40.2.0 → 40.3.0

package/lib/generators/monorepo/typescript/MonorepoTypescriptGenerator.js

@@ -1,4 +1,4 @@
-import { existsSync, readdirSync } from "node:fs";
+import { readdirSync } from "node:fs";
 import Generator from "yeoman-generator";
 import { latestLTS } from "../../../utils/nodeVersions.js";
 import * as packageUtils from "../../../utils/package.js";
@@ -6,6 +6,9 @@ import { packageManagerRun } from "../../../utils/packageManagerUtils.js";
 import { copyAndFormatTpl } from "../../../utils/writeAndFormat.js";
 
 const rootConfigExtensionsRegex = /\.config\.(?:ts|mts|cts)$/;
+// .js scripts count too: tsc then fails on them, which flags their migration
+// to typescript
+const scriptExtensionsRegex = /\.[cm]?[jt]s$/;
 
 const hasRootConfigFiles = (rootPath) => {
   try {
@@ -17,6 +20,17 @@ const hasRootConfigFiles = (rootPath) => {
   }
 };
 
+// a scripts/ dir with only shell scripts gives tsc no input (TS18003)
+const hasScriptFiles = (scriptsPath) => {
+  try {
+    return readdirSync(scriptsPath, { recursive: true }).some((name) =>
+      scriptExtensionsRegex.test(name),
+    );
+  } catch {
+    return false;
+  }
+};
+
 export default class MonorepoTypescriptGenerator extends Generator {
   constructor(args, opts) {
     super(args, opts);
@@ -75,7 +89,7 @@ export default class MonorepoTypescriptGenerator extends Generator {
   #hasTools() {
     return (
       hasRootConfigFiles(this.destinationPath()) ||
-      existsSync(this.destinationPath("scripts"))
+      hasScriptFiles(this.destinationPath("scripts"))
     );
   }
 

package/lib/utils/nodeEngines.js

@@ -1,3 +1,4 @@
+import pobDependencies from "pob-dependencies";
 import semver from "semver";
 import { latestLTS, maintenanceLTS } from "./nodeVersions.js";
 import * as packageUtils from "./package.js";
@@ -26,22 +27,31 @@ export const getEnvsMinNodeMajor = (envs, onlyLatestLTS) => {
 };
 
 /**
- * Min node major of a range, undefined when missing or not parseable
+ * Min version of a range, undefined when missing or not parseable
  * (workspace:*, catalog:, npm: alias...).
  */
-export const getMinMajor = (range) => {
+const getMinVersion = (range) => {
   if (!range) return undefined;
   try {
-    const minVersion = semver.minVersion(range);
-    return minVersion ? semver.major(minVersion) : undefined;
+    return semver.minVersion(range) ?? undefined;
   } catch {
     return undefined;
   }
 };
 
 /**
- * engines.node value for a min node major. When envs are not defined, an
- * already higher engines.node is kept.
+ * Min node major of a range, undefined when missing or not parseable
+ * (workspace:*, catalog:, npm: alias...).
+ */
+export const getMinMajor = (range) => {
+  const minVersion = getMinVersion(range);
+  return minVersion ? semver.major(minVersion) : undefined;
+};
+
+/**
+ * engines.node value for a min node major. An engines.node with a higher min
+ * version is kept, to guarantee a node version with a security fix: within
+ * the min major when envs are defined, any higher version otherwise.
  */
 export const resolveEnginesNode = (
   currentEnginesNode,
@@ -56,11 +66,13 @@ export const resolveEnginesNode = (
     throw new Error(`Invalid min node version: ${minNodeMajor}`);
   }
 
-  if (!hasEnvs) {
-    const currentMinMajor = getMinMajor(currentEnginesNode);
-    if (currentMinMajor !== undefined && currentMinMajor > Number(major)) {
-      return currentEnginesNode;
-    }
+  const currentMinVersion = getMinVersion(currentEnginesNode);
+  if (
+    currentMinVersion &&
+    semver.gt(currentMinVersion, minVersion) &&
+    (!hasEnvs || semver.major(currentMinVersion) === Number(major))
+  ) {
+    return currentEnginesNode;
   }
 
   return `>=${minVersion}`;
@@ -68,7 +80,9 @@ export const resolveEnginesNode = (
 
 /**
  * Updates "@types/node" when it is lower than engines.node min major.
- * Never adds it, never lowers devDependencies.
+ * Never adds it, never lowers devDependencies. A pinned devDependency stays
+ * pinned (check-package-dependencies/require-pinned-versions), with the
+ * pob-dependencies version when it satisfies the min major.
  */
 export const updateTypesNodeFromEngines = (pkg) => {
   const minMajor = getMinMajor(pkg.engines?.node);
@@ -83,7 +97,12 @@ export const updateTypesNodeFromEngines = (pkg) => {
   if (currentDevVersion) {
     const currentMinMajor = getMinMajor(currentDevVersion);
     if (currentMinMajor !== undefined && currentMinMajor < minMajor) {
-      pkg.devDependencies["@types/node"] = range;
+      const pinnedVersion = pobDependencies["@types/node"];
+      pkg.devDependencies["@types/node"] =
+        semver.valid(currentDevVersion) &&
+        semver.major(pinnedVersion) >= minMajor
+          ? pinnedVersion
+          : range;
     }
   }
 };

package/lib/utils/nodeEngines.test.js

@@ -1,4 +1,5 @@
 import { describe, expect, it } from "vitest";
+import pobDependencies from "pob-dependencies";
 import {
   resolveEnginesNode,
   updateNodeEngines,
@@ -6,13 +7,24 @@ import {
 } from "./nodeEngines.js";
 
 describe("updateTypesNodeFromEngines", () => {
-  it("updates devDependencies when lower than engines min major", () => {
+  it("keeps pinned devDependencies pinned when lower than engines min major", () => {
     const pkg = {
       engines: { node: ">=24.14.1" },
       devDependencies: { "@types/node": "22.5.0" },
     };
     updateTypesNodeFromEngines(pkg);
-    expect(pkg.devDependencies["@types/node"]).toBe(">=24.0.0");
+    expect(pkg.devDependencies["@types/node"]).toBe(
+      pobDependencies["@types/node"],
+    );
+  });
+
+  it("uses a range when the pinned version is lower than engines min major", () => {
+    const pkg = {
+      engines: { node: ">=99.0.0" },
+      devDependencies: { "@types/node": "22.5.0" },
+    };
+    updateTypesNodeFromEngines(pkg);
+    expect(pkg.devDependencies["@types/node"]).toBe(">=99.0.0");
   });
 
   it("keeps devDependencies with the same major", () => {
@@ -114,6 +126,17 @@ describe("resolveEnginesNode", () => {
   it("lets envs lower engines.node", () => {
     expect(resolveEnginesNode(">=24.14.1", "22", true)).toBe(">=22.18.0");
   });
+
+  it.each([true, false])(
+    "keeps a higher min version of the same major (hasEnvs: %s)",
+    (hasEnvs) => {
+      expect(resolveEnginesNode(">=24.15.3", "24", hasEnvs)).toBe(">=24.15.3");
+    },
+  );
+
+  it("raises a lower min version of the same major", () => {
+    expect(resolveEnginesNode(">=24.0.0", "24", true)).toBe(">=24.14.1");
+  });
 });
 
 describe("updateNodeEngines", () => {
@@ -124,7 +147,9 @@ describe("updateNodeEngines", () => {
     };
     updateNodeEngines(pkg, {});
     expect(pkg.engines.node).toBe(">=24.14.1");
-    expect(pkg.devDependencies["@types/node"]).toBe(">=24.0.0");
+    expect(pkg.devDependencies["@types/node"]).toBe(
+      pobDependencies["@types/node"],
+    );
   });
 
   it("supports babelEnvs", () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pob",
-  "version": "40.2.0",
+  "version": "40.3.0",
   "description": "Pile of bones, library generator with git/babel/typescript/typedoc/readme/vitest",
   "keywords": [
     "skeleton"
@@ -37,7 +37,7 @@
     "@pob/sort-object": "11.2.0",
     "@pob/sort-pkg": "13.2.0",
     "@types/inquirer": "9.0.10",
-    "@yeoman/adapter": "4.0.2",
+    "@yeoman/adapter": "4.0.3",
     "eslint": "10.12.0",
     "findup-sync": "^5.0.0",
     "git-remote-url": "^1.0.1",
@@ -56,10 +56,10 @@
     "typescript": "npm:@typescript/typescript6@6.0.2",
     "validate-npm-package-name": "^8.0.0",
     "yeoman-environment": "6.3.0",
-    "yeoman-generator": "10.0.1"
+    "yeoman-generator": "10.3.0"
   },
   "devDependencies": {
-    "@pob/root": "28.2.0",
+    "@pob/root": "28.2.1",
     "@types/node": "24.19.1",
     "@typescript/native": "npm:typescript@7.0.2",
     "@yeoman/types": "1.13.1",