wattpm-utils 3.13.1 → 3.15.0

package/index.js

@@ -10,9 +10,11 @@ import { version } from './lib/version.js'
 export async function main () {
   globalThis.platformatic = { executable: getExecutableId() }
 
-  const logger = createCliLogger('info')
-
   const options = {
+    'no-pretty': {
+      short: 'r',
+      type: 'boolean'
+    },
     verbose: {
       short: 'v',
       type: 'boolean'
@@ -28,6 +30,7 @@ export async function main () {
   }
 
   const { values, unparsed } = parseArgs(process.argv.slice(2), options)
+  const logger = createCliLogger('info', values['no-pretty'])
 
   if (values.version || unparsed[0] === 'version') {
     console.log(version)

package/lib/commands/external.js

@@ -23,6 +23,19 @@ import { installDependencies } from './dependencies.js'
 
 const originCandidates = ['origin', 'upstream']
 
+function parseGitUrl (url) {
+  const fragmentIndex = url.indexOf('#')
+
+  if (fragmentIndex === -1) {
+    return { url, branch: null }
+  }
+
+  const baseUrl = url.substring(0, fragmentIndex)
+  const branch = url.substring(fragmentIndex + 1)
+
+  return { url: baseUrl, branch }
+}
+
 async function parseLocalFolder (path) {
   // Read the package.json, if any
   const packageJsonPath = resolve(path, 'package.json')
@@ -256,7 +269,10 @@ async function importURL (logger, _, configurationFile, rawUrl, id, http, branch
     url = http ? `https://github.com/${rawUrl}.git` : `git@github.com:${rawUrl}.git`
   }
 
-  await importApplication(logger, configurationFile, id ?? basename(rawUrl, '.git'), null, url, branch)
+  const parsed = parseGitUrl(url)
+  const effectiveBranch = branch ?? parsed.branch
+
+  await importApplication(logger, configurationFile, id ?? basename(parsed.url, '.git'), null, parsed.url, effectiveBranch)
 }
 
 async function importLocal (logger, root, configurationFile, path, overridenId) {
@@ -371,10 +387,12 @@ export async function resolveApplications (
       const absolutePath = application.path
       const relativePath = relative(root, absolutePath)
 
-      // Clone and install dependencies
       childLogger.info(`Resolving application ${bold(application.id)} ...`)
 
-      let url = application.url
+      const parsedGitUrl = parseGitUrl(application.url)
+      let url = parsedGitUrl.url
+      const effectiveBranch = application.gitBranch ?? parsedGitUrl.branch
+
       if (url.startsWith('http') && username && password) {
         const parsed = new URL(url)
         parsed.username ||= username
@@ -385,9 +403,9 @@ export async function resolveApplications (
       const cloneArgs = ['clone', url, absolutePath, '--single-branch', '--depth', 1]
 
       let branchLabel = ''
-      if (application.gitBranch && application.gitBranch !== 'main') {
-        cloneArgs.push('--branch', application.gitBranch)
-        branchLabel = ` (branch ${bold(application.gitBranch)})`
+      if (effectiveBranch && effectiveBranch !== 'main') {
+        cloneArgs.push('--branch', effectiveBranch)
+        branchLabel = ` (branch ${bold(effectiveBranch)})`
       }
 
       if (username) {
@@ -583,7 +601,7 @@ export const help = {
         description: 'Do not install applications dependencies'
       },
       {
-        usage: 'P, --package-manager <executable>',
+        usage: '-P, --package-manager <executable>',
         description: 'Use an alternative package manager (the default is to autodetect it)'
       }
     ]
@@ -615,7 +633,7 @@ export const help = {
         description: 'Do not install applications dependencies'
       },
       {
-        usage: 'P, --package-manager <executable>',
+        usage: '-P, --package-manager <executable>',
         description: 'Use an alternative package manager (the default is to autodetect it)'
       }
     ],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wattpm-utils",
-  "version": "3.13.1",
+  "version": "3.15.0",
   "description": "The Node.js Application Server Utilities Commands",
   "main": "index.js",
   "type": "module",
@@ -28,9 +28,9 @@
     "dotenv": "^16.4.5",
     "execa": "^9.4.0",
     "semver": "^7.7.0",
-    "@platformatic/foundation": "3.13.1",
-    "@platformatic/runtime": "3.13.1",
-    "create-wattpm": "3.13.1"
+    "@platformatic/foundation": "3.15.0",
+    "@platformatic/runtime": "3.15.0",
+    "create-wattpm": "3.15.0"
   },
   "devDependencies": {
     "cleaner-spec-reporter": "^0.5.0",
@@ -40,7 +40,7 @@
     "neostandard": "^0.12.0",
     "typescript": "^5.5.4",
     "undici": "^7.0.0",
-    "@platformatic/node": "3.13.1"
+    "@platformatic/node": "3.15.0"
   },
   "engines": {
     "node": ">=22.19.0"