@stacksjs/actions 0.72.5 → 0.72.6

package/dist/upgrade/packages.d.ts

@@ -23,13 +23,15 @@ export declare function applyBumps(pkg: PkgJson, target: string, lockstep: Set<s
  * Handles resolution, package.json rewrite, and reinstall; then `process.exit`s.
  */
 export declare function upgradeStacksPackages(projectRoot: string, options: PackageUpgradeOptions): Promise<never>;
-/**` pointed at them by workspace
- * reference. Delete that directory to move onto published packages and those
- * references resolve to nothing: `bun install` fails outright with
- * "@stacksjs/utils@workspace:* failed to resolve", and the app cannot install
- * at all until every one of them is rewritten by hand.
+/*` package rides the framework version, though, and the
+ * doc above used to describe a guard the code did not have: without `context`
+ * this rewrote `@stacksjs/bun-router: ^0.0.20` to `^0.72.4`, a version that
+ * package has never published, so the "upgrade" left the app unable to install
+ * - the same trap #2078 fixed for the root manifest. Pass `context` and an
+ * independently-versioned package takes the meta's declared range instead, or
+ * is reported rather than guessed at.
  */
-export declare function resolveManifestSpec(name: string, spec: string, target: string): string | null;
+export declare function resolveManifestSpec(name: string, spec: string, target: string, context?: ManifestSpecContext): string | null;
 /*` dependencies, and an upgrade that ignores them leaves the app
  * describing two different framework versions at once - or, after a vendored
  * core is removed, unable to install.
@@ -37,7 +39,7 @@ export declare function resolveManifestSpec(name: string, spec: string, target:
  * Returns what changed so the caller can report it. Writes nothing when
  * `dryRun` is set.
  */
-export declare function reconcileVendoredManifests(projectRoot: string, target: string, options?: { dryRun?: boolean }): ManifestChange[];
+export declare function reconcileVendoredManifests(projectRoot: string, target: string, options?: { dryRun?: boolean, context?: ManifestSpecContext }): ManifestChange[];
 export declare interface PackageUpgradeOptions {
   version?: string
   canary?: boolean
@@ -58,3 +60,8 @@ export declare interface ManifestChange {
   from: string
   to: string
 }
+/** What the framework knows about the target release, for spec decisions. */
+export declare interface ManifestSpecContext {
+  lockstep: Set<string>
+  metaDeps: Record<string, string>
+}

package/dist/upgrade/packages.js

@@ -4,7 +4,7 @@ import{existsSync,readdirSync,readFileSync,statSync,writeFileSync}from"node:fs";
 \u2714 Standalone package dependencies are up to date.
 `);process.exit(0)}async function resolveTarget(options){const res=await fetch("https://registry.npmjs.org/stacks").catch(()=>null);if(!res||!res.ok)throw Error("Could not reach the npm registry to resolve the target `stacks` version.");const meta=await res.json(),distTags=meta["dist-tags"]??{},versions=meta.versions??{};let version;if(options.version){if(!versions[options.version])throw Error(`stacks@${options.version} was not found on the npm registry.`);version=options.version}else{const tag=options.canary?"canary":"latest",resolved=distTags[tag];if(!resolved)throw Error(`The \`${tag}\` dist-tag is not published for \`stacks\`.`);version=resolved}const metaDeps=versions[version]?.dependencies??{};return{version,metaDeps}}export function baseVersion(range){return range.replace(/^[\^~>=<\s]+/,"").trim()}export function lockstepPackages(metaDeps,target){const lockstep=new Set(["stacks"]);for(const[name,range]of Object.entries(metaDeps))if(name.startsWith("@stacksjs/")&&baseVersion(range)===target)lockstep.add(name);return lockstep}export function applyBumps(pkg,target,lockstep){const changes=[];for(const field of["dependencies","devDependencies"]){const deps=pkg[field];if(!deps)continue;for(const[name,spec]of Object.entries(deps)){if(!lockstep.has(name))continue;const next=`${/^[\^~]/.test(spec)?spec[0]:/^\d/.test(spec)?"":"^"}${target}`;if(spec!==next){changes.push({name,from:spec,to:next});deps[name]=next}}}return changes}export async function upgradeStacksPackages(projectRoot,options){const pkgPath=join(projectRoot,"package.json");if(!existsSync(pkgPath)){console.error("No package.json found \u2014 nothing to upgrade.");process.exit(1)}const raw=readFileSync(pkgPath,"utf-8"),pkg=JSON.parse(raw),current=pkg.dependencies?.stacks??pkg.devDependencies?.stacks;if(!hasStacksDependency(pkg))return updateStandalonePackage(projectRoot,options);const{version:target,metaDeps}=await resolveTarget(options).catch((err)=>{console.error(`\u2717 ${err.message}`);process.exit(1)});console.log(`
   Upgrading the Stacks framework${options.canary?" (canary)":""} \u2192 ${target}`);if(current)console.log(`  current \`stacks\` constraint: ${current}
-`);const lockstep=lockstepPackages(metaDeps,target),changes=applyBumps(pkg,target,lockstep),projectManifestChanges=migratePackageProjectManifest(pkg),manifestChanges=reconcileVendoredManifests(projectRoot,target,{dryRun:options.dryRun});if(changes.length>0){console.log("  The following dependencies will be updated:");const width=Math.max(...changes.map((c)=>c.name.length));for(const c of changes)console.log(`    ${c.name.padEnd(width)}  ${c.from}  \u2192  ${c.to}`);console.log("")}if(manifestChanges.length>0){console.log(`  Vendored manifests under storage/framework (${manifestChanges.length}):`);const width=Math.max(...manifestChanges.map((c)=>c.name.length));for(const c of manifestChanges)console.log(`    ${c.name.padEnd(width)}  ${c.from}  \u2192  ${c.to}   ${c.file}`);console.log("")}if(projectManifestChanges.length>0)console.log(`  Project manifest migrations: ${projectManifestChanges.length}
+`);const lockstep=lockstepPackages(metaDeps,target),changes=applyBumps(pkg,target,lockstep),projectManifestChanges=migratePackageProjectManifest(pkg),manifestChanges=reconcileVendoredManifests(projectRoot,target,{dryRun:options.dryRun,context:{lockstep,metaDeps}});if(changes.length>0){console.log("  The following dependencies will be updated:");const width=Math.max(...changes.map((c)=>c.name.length));for(const c of changes)console.log(`    ${c.name.padEnd(width)}  ${c.from}  \u2192  ${c.to}`);console.log("")}if(manifestChanges.length>0){console.log(`  Vendored manifests under storage/framework (${manifestChanges.length}):`);const width=Math.max(...manifestChanges.map((c)=>c.name.length));for(const c of manifestChanges)console.log(`    ${c.name.padEnd(width)}  ${c.from}  \u2192  ${c.to}   ${c.file}`);console.log("")}if(projectManifestChanges.length>0)console.log(`  Project manifest migrations: ${projectManifestChanges.length}
 `);if(options.dryRun){const pending=measureDefaultsDrift(projectRoot);if(pending&&pending.length>0){const installed=installedDefaultsVersion(projectRoot);console.log(`  Managed project files, against the installed @stacksjs/defaults${installed?` (${installed})`:""}:`);console.log(`    ${summarizeStructureChanges(pending)}   in storage/framework/defaults and project support files
 `)}console.log(`  --dry-run: no files were written and nothing was installed.
 `);process.exit(0)}if(changes.length>0||projectManifestChanges.length>0){const trailing=raw.endsWith(`
@@ -17,6 +17,6 @@ import{existsSync,readdirSync,readFileSync,statSync,writeFileSync}from"node:fs";
 \u2714 Already up to date \u2014 dependencies and managed project files match the target.
 `);else console.log(`
 \u2714 Upgraded to stacks@${target}. Review the changelog: https://github.com/stacksjs/stacks/releases/tag/v${target}
-`);process.exit(0)}export function resolveManifestSpec(name,spec,target){if(name!=="stacks"&&!name.startsWith("@stacksjs/"))return null;if(spec.startsWith("workspace:"))return`^${target}`;if(baseVersion(spec)===target)return null;if(!/^[\^~]?\d/.test(spec))return null;return`${/^[\^~]/.test(spec)?spec[0]:""}${target}`}export function reconcileVendoredManifests(projectRoot,target,options={}){const root=join(projectRoot,"storage/framework");if(!existsSync(root))return[];const changes=[],walk=(dir)=>{let entries;try{entries=readdirSync(dir)}catch{return}for(const entry of entries){if(entry==="node_modules"||entry==="dist"||entry===".git")continue;const full=join(dir,entry);let stat;try{stat=statSync(full)}catch{continue}if(stat.isDirectory()){walk(full);continue}if(entry!=="package.json")continue;let raw;try{raw=readFileSync(full,"utf-8")}catch{continue}let pkg;try{pkg=JSON.parse(raw)}catch{continue}let touched=!1;for(const field of["dependencies","devDependencies"]){const deps=pkg[field];if(!deps)continue;for(const[name,spec]of Object.entries(deps)){const next=resolveManifestSpec(name,spec,target);if(!next)continue;changes.push({file:relative(projectRoot,full),name,from:spec,to:next});deps[name]=next;touched=!0}}if(touched&&!options.dryRun){const suffix=raw.endsWith(`
+`);process.exit(0)}export function resolveManifestSpec(name,spec,target,context){if(name!=="stacks"&&!name.startsWith("@stacksjs/"))return null;if(context&&!context.lockstep.has(name)){const declared=context.metaDeps[name];if(!declared)return null;return baseVersion(declared)===baseVersion(spec)?null:declared}if(spec.startsWith("workspace:"))return`^${target}`;if(baseVersion(spec)===target)return null;if(!/^[\^~]?\d/.test(spec))return null;return`${/^[\^~]/.test(spec)?spec[0]:""}${target}`}export function reconcileVendoredManifests(projectRoot,target,options={}){const root=join(projectRoot,"storage/framework");if(!existsSync(root))return[];const changes=[],walk=(dir)=>{let entries;try{entries=readdirSync(dir)}catch{return}for(const entry of entries){if(entry==="node_modules"||entry==="dist"||entry===".git")continue;const full=join(dir,entry);let stat;try{stat=statSync(full)}catch{continue}if(stat.isDirectory()){walk(full);continue}if(entry!=="package.json")continue;let raw;try{raw=readFileSync(full,"utf-8")}catch{continue}let pkg;try{pkg=JSON.parse(raw)}catch{continue}let touched=!1;for(const field of["dependencies","devDependencies"]){const deps=pkg[field];if(!deps)continue;for(const[name,spec]of Object.entries(deps)){const next=resolveManifestSpec(name,spec,target,options.context);if(!next)continue;changes.push({file:relative(projectRoot,full),name,from:spec,to:next});deps[name]=next;touched=!0}}if(touched&&!options.dryRun){const suffix=raw.endsWith(`
 `)?`
 `:"";writeFileSync(full,`${JSON.stringify(pkg,null,2)}${suffix}`)}}};walk(root);return changes}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@stacksjs/actions",
   "type": "module",
   "sideEffects": false,
-  "version": "0.72.5",
+  "version": "0.72.6",
   "description": "The Stacks actions.",
   "author": "Chris Breuer",
   "contributors": [
@@ -59,36 +59,36 @@
     "prepublishOnly": "bun run build"
   },
   "dependencies": {
-    "@stacksjs/config": "0.72.5",
+    "@stacksjs/config": "0.72.6",
     "@stacksjs/bumpx": "^0.2.6",
     "@stacksjs/bunpress": "^0.2.6",
     "@stacksjs/logsmith": "^0.2.3",
-    "@stacksjs/registry": "0.72.5",
+    "@stacksjs/registry": "0.72.6",
     "@stacksjs/stx": "^0.2.184",
     "@stacksjs/ts-cloud": "^0.8.3",
     "@stacksjs/ts-md": "^0.1.1",
     "craft-native": ">=0.0.55"
   },
   "devDependencies": {
-    "@stacksjs/api": "0.72.5",
-    "@stacksjs/cli": "0.72.5",
-    "@stacksjs/database": "0.72.5",
+    "@stacksjs/api": "0.72.6",
+    "@stacksjs/cli": "0.72.6",
+    "@stacksjs/database": "0.72.6",
     "@stacksjs/tlsx": "^0.13.2",
     "better-dx": "^0.2.23",
-    "@stacksjs/dns": "0.72.5",
-    "@stacksjs/enums": "0.72.5",
-    "@stacksjs/env": "0.72.5",
-    "@stacksjs/error-handling": "0.72.5",
-    "@stacksjs/image": "0.72.5",
-    "@stacksjs/logging": "0.72.5",
-    "@stacksjs/path": "0.72.5",
-    "@stacksjs/security": "0.72.5",
-    "@stacksjs/cms": "0.72.5",
-    "@stacksjs/sites": "0.72.5",
-    "@stacksjs/storage": "0.72.5",
-    "@stacksjs/strings": "0.72.5",
-    "@stacksjs/utils": "0.72.5",
-    "@stacksjs/validation": "0.72.5"
+    "@stacksjs/dns": "0.72.6",
+    "@stacksjs/enums": "0.72.6",
+    "@stacksjs/env": "0.72.6",
+    "@stacksjs/error-handling": "0.72.6",
+    "@stacksjs/image": "0.72.6",
+    "@stacksjs/logging": "0.72.6",
+    "@stacksjs/path": "0.72.6",
+    "@stacksjs/security": "0.72.6",
+    "@stacksjs/cms": "0.72.6",
+    "@stacksjs/sites": "0.72.6",
+    "@stacksjs/storage": "0.72.6",
+    "@stacksjs/strings": "0.72.6",
+    "@stacksjs/utils": "0.72.6",
+    "@stacksjs/validation": "0.72.6"
   },
   "peerDependencies": {
     "pickier": "^0.1.35"