@wyxos/zephyr 0.9.1 → 0.9.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wyxos/zephyr",
-  "version": "0.9.1",
+  "version": "0.9.3",
   "description": "A streamlined deployment tool for web applications with intelligent Laravel project detection",
   "type": "module",
   "main": "./src/index.mjs",

package/src/application/deploy/bump-local-package-version.mjs

@@ -60,17 +60,22 @@ function selectVersionSuggestionReference(currentVersion, versionBumps) {
         return versionBumps[0] ?? null
     }
 
-    const currentMinorBoundary = versionBumps.find(({version}) => {
-        const parsed = semver.parse(version)
-
-        return parsed
+    let earliestKnownCurrentMinor = null
+    const currentMinorBoundary = versionBumps.find((versionBump) => {
+        const parsed = semver.parse(versionBump.version)
+        const isCurrentMinor = parsed
             && parsed.major === current.major
             && parsed.minor === current.minor
-            && parsed.patch === 0
             && parsed.prerelease.length === 0
+
+        if (isCurrentMinor) {
+            earliestKnownCurrentMinor = versionBump
+        }
+
+        return isCurrentMinor && parsed.patch === 0
     })
 
-    return currentMinorBoundary ?? versionBumps[0] ?? null
+    return currentMinorBoundary ?? earliestKnownCurrentMinor ?? versionBumps[0] ?? null
 }
 
 function formatVersionReferenceLabel(reference, currentVersion) {
@@ -80,13 +85,14 @@ function formatVersionReferenceLabel(reference, currentVersion) {
 
     const current = semver.parse(currentVersion)
     const parsed = semver.parse(reference.version)
-    const isCurrentMinorBoundary = current
+    const isCurrentMinor = current
         && parsed
         && parsed.major === current.major
         && parsed.minor === current.minor
-        && parsed.patch === 0
         && parsed.prerelease.length === 0
-    const prefix = isCurrentMinorBoundary ? 'current app minor baseline' : 'last app version bump'
+    const prefix = isCurrentMinor
+        ? parsed.patch === 0 ? 'current app minor baseline' : 'earliest known app minor baseline'
+        : 'last app version bump'
 
     return `${prefix} ${reference.shortHash} (${reference.version})`
 }

package/src/release/release-type.mjs

@@ -16,6 +16,15 @@ export const RELEASE_TYPES = [
   'prerelease'
 ]
 const STABLE_RELEASE_TYPES = ['major', 'minor', 'patch']
+const RELEASE_TYPE_WEIGHTS = {
+  prerelease: 0,
+  prepatch: 1,
+  patch: 1,
+  preminor: 2,
+  minor: 2,
+  premajor: 3,
+  major: 3
+}
 
 function sanitizeSuggestedReleaseType(message, allowedTypes = RELEASE_TYPES) {
   if (typeof message !== 'string') {
@@ -70,6 +79,17 @@ function inferReleaseTypeHeuristically({
   return 'patch'
 }
 
+function applyHeuristicFloor(releaseType, heuristicReleaseType) {
+  const releaseWeight = RELEASE_TYPE_WEIGHTS[releaseType] ?? -1
+  const heuristicWeight = RELEASE_TYPE_WEIGHTS[heuristicReleaseType] ?? -1
+
+  if (heuristicWeight > releaseWeight) {
+    return heuristicReleaseType
+  }
+
+  return releaseType
+}
+
 function resolveSuggestedReleaseTypeOptions(currentVersion = '0.0.0') {
   const parsedVersion = semver.parse(currentVersion)
 
@@ -234,10 +254,12 @@ async function suggestReleaseType(rootDir = process.cwd(), {
       }
     }
 
+    const flooredReleaseType = applyHeuristicFloor(releaseType, heuristicReleaseType)
+
     return {
       ...context,
-      releaseType,
-      source: 'codex'
+      releaseType: flooredReleaseType,
+      source: flooredReleaseType === releaseType ? 'codex' : 'codex+heuristic-floor'
     }
   } catch (error) {
     logWarning?.(`Codex could not suggest a release type: ${error.message}`)