@ykdz/template 0.0.23 → 0.0.24

package/node_modules/@ykdz/template-core/dist/toolchain-resolution.js

@@ -2,7 +2,7 @@ export const nodeReleaseIndexUrl = "https://nodejs.org/dist/index.json";
 export const pnpmRegistryUrl = "https://registry.npmjs.org/pnpm";
 const bundledFallbackToolchain = {
     nodeLtsMajor: nodeLtsMajor("24"),
-    packageManagerPin: packageManagerPin("10.34.4"),
+    packageManagerPin: packageManagerPin("11.11.0"),
 };
 export async function resolveToolchainVersions(options = {}) {
     const source = options.source ?? "online";
@@ -14,7 +14,8 @@ export async function resolveToolchainVersions(options = {}) {
         const nodeReleases = parseNodeReleaseIndex(await fetchJson(options.nodeReleaseIndexUrl ?? nodeReleaseIndexUrl));
         const nodeMajor = latestLtsMajor(nodeReleases);
         const pnpmMetadata = parsePnpmRegistryMetadata(await fetchJson(options.pnpmRegistryUrl ?? pnpmRegistryUrl));
-        const pnpmVersion = latestCompatiblePnpmVersion(pnpmMetadata, Number(nodeMajor.value));
+        const nodeVersion = latestLtsVersion(nodeReleases, nodeMajor);
+        const pnpmVersion = latestCompatiblePnpmVersion(pnpmMetadata, nodeVersion, instant(options.now ?? new Date()));
         return {
             nodeLtsMajor: nodeMajor,
             packageManagerPin: packageManagerPin(pnpmVersion),
@@ -31,19 +32,20 @@ export async function resolveToolchainVersions(options = {}) {
 }
 export async function checkOnlineToolchainResolutionContract(options = {}) {
     const fetchJson = options.fetchJson ?? fetchOfficialJson;
-    const nodeMajor = await contractPhase("Node source parsing", async () => {
-        const nodeReleases = parseNodeReleaseIndex(await fetchJson(nodeReleaseIndexUrl));
-        return latestLtsMajor(nodeReleases);
+    const nodeSource = await contractPhase("Node source parsing", async () => {
+        const releases = parseNodeReleaseIndex(await fetchJson(nodeReleaseIndexUrl));
+        const major = latestLtsMajor(releases);
+        return { major, version: latestLtsVersion(releases, major) };
     });
     const pnpmMetadata = await contractPhase("pnpm source parsing", async () => parsePnpmRegistryMetadata(await fetchJson(pnpmRegistryUrl)));
-    const pnpmVersion = await contractPhase("compatibility selection", async () => latestCompatiblePnpmVersion(pnpmMetadata, Number(nodeMajor.value)));
+    const pnpmVersion = await contractPhase("compatibility selection", async () => latestCompatiblePnpmVersion(pnpmMetadata, nodeSource.version));
     return {
-        nodeLtsMajor: nodeMajor,
+        nodeLtsMajor: nodeSource.major,
         packageManagerPin: packageManagerPin(pnpmVersion),
         diagnostics: [
-            `Node source parsing succeeded; latest LTS major is ${nodeMajor.value}.`,
+            `Node source parsing succeeded; latest LTS major is ${nodeSource.major.value}.`,
             `pnpm source parsing succeeded; latest compatible pnpm release is ${pnpmVersion}.`,
-            `Compatibility selection succeeded for pnpm@${pnpmVersion} on Node ${nodeMajor.value}.`,
+            `Compatibility selection succeeded for pnpm@${pnpmVersion} on Node ${nodeSource.major.value}.`,
         ],
     };
 }
@@ -113,9 +115,21 @@ function latestLtsMajor(releases) {
     }
     return nodeLtsMajor(String(Math.max(...majors)));
 }
+function latestLtsVersion(releases, major) {
+    const versions = releases
+        .filter((release) => release.lts !== false)
+        .map((release) => release.version.replace(/^v/, ""))
+        .filter((version) => valid(version) !== null && version.startsWith(`${major.value}.`))
+        .toSorted(compare);
+    const latest = versions.at(-1);
+    if (!latest) {
+        throw new Error(`Node release index did not contain Node ${major.value}`);
+    }
+    return latest;
+}
 function parsePnpmRegistryMetadata(value) {
-    if (!isRecord(value) || !isRecord(value.versions)) {
-        throw new Error("pnpm registry metadata is missing versions");
+    if (!isRecord(value) || !isRecord(value.versions) || !isRecord(value.time)) {
+        throw new Error("pnpm registry metadata is missing versions or time");
     }
     const versions = {};
     for (const [version, metadata] of Object.entries(value.versions)) {
@@ -131,61 +145,45 @@ function parsePnpmRegistryMetadata(value) {
             }
             : {};
     }
-    return { versions };
+    const time = Object.fromEntries(Object.entries(value.time).filter((entry) => typeof entry[1] === "string"));
+    return { time, versions };
 }
-function latestCompatiblePnpmVersion(metadata, nodeMajor) {
+function latestCompatiblePnpmVersion(metadata, nodeVersion, now = Date.now()) {
     const candidates = Object.entries(metadata.versions)
-        .filter(([version]) => /^\d+\.\d+\.\d+(?:[-+][0-9A-Za-z.-]+)?$/.test(version))
-        .filter(([, packageMetadata]) => nodeSatisfiesRange(nodeMajor, packageMetadata.engines?.node))
+        .filter(([version]) => /^\d+\.\d+\.\d+$/.test(version))
+        .filter(([, packageMetadata]) => nodeSatisfiesRange(nodeVersion, packageMetadata.engines?.node))
+        .filter(([version]) => isMatureRelease(metadata.time[version], now))
         .map(([version]) => version)
-        .toSorted(compareSemver);
+        .toSorted(compare);
     const latest = candidates.at(-1);
     if (!latest) {
-        throw new Error(`pnpm registry metadata did not contain a release compatible with Node ${nodeMajor}`);
+        throw new Error(`pnpm registry metadata did not contain a release compatible with Node ${nodeVersion}`);
     }
     return latest;
 }
-function nodeSatisfiesRange(nodeMajor, range) {
-    if (!range) {
-        return true;
-    }
-    return range
-        .split(/\s+/)
-        .filter(Boolean)
-        .every((comparator) => nodeSatisfiesComparator(nodeMajor, comparator));
-}
-function nodeSatisfiesComparator(nodeMajor, comparator) {
-    const match = comparator.match(/^(>=|>|<=|<|=)?(\d+)(?:\.\d+){0,2}$/);
-    if (!match) {
+const pnpmMaturityWindowMilliseconds = 24 * 60 * 60 * 1_000;
+function isMatureRelease(publishedAt, now) {
+    if (publishedAt === undefined) {
         return false;
     }
-    const operator = match[1] ?? "=";
-    const major = Number(match[2]);
-    if (operator === ">=") {
-        return nodeMajor >= major;
-    }
-    if (operator === ">") {
-        return nodeMajor > major;
-    }
-    if (operator === "<=") {
-        return nodeMajor <= major;
-    }
-    if (operator === "<") {
-        return nodeMajor < major;
+    const publishedAtMilliseconds = Date.parse(publishedAt);
+    return (Number.isFinite(publishedAtMilliseconds) &&
+        now - publishedAtMilliseconds >= pnpmMaturityWindowMilliseconds);
+}
+function instant(value) {
+    const milliseconds = value instanceof Date ? value.getTime() : Date.parse(value);
+    if (!Number.isFinite(milliseconds)) {
+        throw new Error(`Invalid resolution time: ${String(value)}`);
     }
-    return nodeMajor === major;
+    return milliseconds;
 }
-function compareSemver(left, right) {
-    const leftParts = left.split(/[.-]/).slice(0, 3).map(Number);
-    const rightParts = right.split(/[.-]/).slice(0, 3).map(Number);
-    for (let index = 0; index < 3; index += 1) {
-        const difference = (leftParts[index] ?? 0) - (rightParts[index] ?? 0);
-        if (difference !== 0) {
-            return difference;
-        }
+function nodeSatisfiesRange(nodeVersion, range) {
+    if (!range) {
+        return true;
     }
-    return left.localeCompare(right);
+    return satisfies(nodeVersion, range, { includePrerelease: false });
 }
 function isRecord(value) {
     return typeof value === "object" && value !== null && !Array.isArray(value);
 }
+import { compare, satisfies, valid } from "semver";

package/node_modules/@ykdz/template-core/package.json

@@ -8,10 +8,6 @@
   "type": "module",
   "exports": {
     "./*": {
-      "source": {
-        "types": "./src/*.ts",
-        "default": "./src/*.ts"
-      },
       "types": "./dist/*.d.ts",
       "default": "./dist/*.js"
     }
@@ -25,16 +21,22 @@
     "typecheck": "tsc -p tsconfig.json --noEmit --pretty false"
   },
   "dependencies": {
-    "@typescript/typescript6": "catalog:",
-    "@ykdz/template-shared": "workspace:*",
+    "semver": "catalog:",
+    "typescript": "catalog:",
     "valibot": "catalog:"
   },
   "devDependencies": {
     "@types/node": "catalog:",
-    "@typescript/native": "catalog:",
+    "@types/semver": "catalog:",
     "execa": "catalog:",
     "oxfmt": "catalog:",
     "oxlint": "catalog:",
-    "oxlint-tsgolint": "catalog:"
+    "oxlint-tsgolint": "catalog:",
+    "typescript-7": "catalog:"
+  },
+  "turbo": {
+    "tags": [
+      "template-core"
+    ]
   }
 }

package/node_modules/semver/LICENSE

@@ -0,0 +1,15 @@
+The ISC License
+
+Copyright (c) Isaac Z. Schlueter and Contributors
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.