@wyxos/zephyr 0.9.2 → 0.9.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wyxos/zephyr",
-  "version": "0.9.2",
+  "version": "0.9.4",
   "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

@@ -97,6 +97,41 @@ function formatVersionReferenceLabel(reference, currentVersion) {
     return `${prefix} ${reference.shortHash} (${reference.version})`
 }
 
+
+async function readRecentAppCommitSubjects(rootDir, versionReference, {runCommand} = {}) {
+    if (!versionReference?.hash || typeof runCommand !== 'function') {
+        return ''
+    }
+
+    try {
+        const {stdout = ''} = await runCommand('git', [
+            'log',
+            '--format=%s',
+            '--max-count=80',
+            `${versionReference.hash}..HEAD`
+        ], {
+            capture: true,
+            cwd: rootDir
+        })
+
+        return stdout.trim()
+    } catch {
+        return ''
+    }
+}
+
+function inferMinimumReleaseTypeFromCommitSubjects(commitSubjects) {
+    if (/breaking change|breaking changes|^[a-z]+(?:\(.+\))?!:/im.test(commitSubjects)) {
+        return 'major'
+    }
+
+    if (/\bfeat(?:\(.+\))?:/im.test(commitSubjects)) {
+        return 'minor'
+    }
+
+    return null
+}
+
 async function resolveDeploymentVersionValue(rootDir, {
     versionArg = null,
     pkg,
@@ -112,6 +147,7 @@ async function resolveDeploymentVersionValue(rootDir, {
 
     const versionBumps = await readVersionBumpCommits(rootDir, {runCommand})
     const versionReference = selectVersionSuggestionReference(pkg.version, versionBumps)
+    const commitSubjects = await readRecentAppCommitSubjects(rootDir, versionReference, {runCommand})
 
     return await resolveReleaseType({
         currentVersion: pkg.version,
@@ -123,7 +159,8 @@ async function resolveDeploymentVersionValue(rootDir, {
         logStep: logProcessing,
         logWarning,
         latestTag: versionReference?.hash ?? null,
-        referenceLabel: formatVersionReferenceLabel(versionReference, pkg.version)
+        referenceLabel: formatVersionReferenceLabel(versionReference, pkg.version),
+        minimumReleaseType: inferMinimumReleaseTypeFromCommitSubjects(commitSubjects)
     })
 }
 

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 applyReleaseTypeFloor(releaseType, floorReleaseType) {
+  const releaseWeight = RELEASE_TYPE_WEIGHTS[releaseType] ?? -1
+  const floorWeight = RELEASE_TYPE_WEIGHTS[floorReleaseType] ?? -1
+
+  if (floorWeight > releaseWeight) {
+    return floorReleaseType
+  }
+
+  return releaseType
+}
+
 function resolveSuggestedReleaseTypeOptions(currentVersion = '0.0.0') {
   const parsedVersion = semver.parse(currentVersion)
 
@@ -167,7 +187,8 @@ async function suggestReleaseType(rootDir = process.cwd(), {
   logStep,
   logWarning,
   latestTag = null,
-  referenceLabel = null
+  referenceLabel = null,
+  minimumReleaseType = null
 } = {}) {
   const context = await buildReleaseSuggestionContext(rootDir, {
     runCommand,
@@ -177,7 +198,10 @@ async function suggestReleaseType(rootDir = process.cwd(), {
     referenceLabel
   })
   const allowedSuggestedReleaseTypes = resolveSuggestedReleaseTypeOptions(currentVersion)
-  const heuristicReleaseType = inferReleaseTypeHeuristically(context)
+  const heuristicReleaseType = applyReleaseTypeFloor(
+    inferReleaseTypeHeuristically(context),
+    sanitizeSuggestedReleaseType(minimumReleaseType, allowedSuggestedReleaseTypes)
+  )
 
   if (!commandExistsImpl('codex')) {
     return {
@@ -234,10 +258,12 @@ async function suggestReleaseType(rootDir = process.cwd(), {
       }
     }
 
+    const flooredReleaseType = applyReleaseTypeFloor(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}`)
@@ -265,7 +291,8 @@ export async function resolveReleaseType({
   logStep,
   logWarning,
   latestTag = null,
-  referenceLabel = null
+  referenceLabel = null,
+  minimumReleaseType = null
 } = {}) {
   if (releaseType) {
     return releaseType
@@ -278,7 +305,8 @@ export async function resolveReleaseType({
     logStep,
     logWarning,
     latestTag,
-    referenceLabel
+    referenceLabel,
+    minimumReleaseType
   })
   const rangeLabel = suggested.referenceLabel || suggested.latestTag
     ? `based on changes since ${suggested.referenceLabel || suggested.latestTag}`