wattpm 3.0.6 → 3.2.0

package/README.md

@@ -25,12 +25,12 @@ npx wattpm@latest init
 npm install wattpm
 ```
 
-Follow our [Quick Start Guide](https://docs.platformatic.dev/docs/getting-started/quick-start-watt)
+Follow our [Quick Start Guide](https://docs.platformatic.dev/docs/getting-started/quick-start)
 guide to get up and running with Platformatic.
 
 ## Documentation
 
-- [Getting Started](https://docs.platformatic.dev/docs/getting-started/quick-start-watt)
+- [Getting Started](https://docs.platformatic.dev/docs/getting-started/quick-start)
 - [Reference](https://docs.platformatic.dev/docs/reference/watt/overview)
 - [Guides](https://docs.platformatic.dev/docs/guides/build-modular-monolith)
 

package/lib/commands/admin.js

@@ -1,8 +1,8 @@
-import { getPackageManager, parseArgs } from '@platformatic/foundation'
-import { spawn } from 'node:child_process'
+import { parseArgs } from '@platformatic/foundation'
+import { runDelegatedCommand } from './create.js'
 
 export async function adminCommand (logger, args) {
-  let {
+  const {
     values: { latest, 'package-manager': packageManager }
   } = parseArgs(
     args,
@@ -19,27 +19,7 @@ export async function adminCommand (logger, args) {
     false
   )
 
-  if (!packageManager) {
-    packageManager = await getPackageManager(process.cwd())
-  }
-
-  const modifier = latest ? '@latest' : ''
-
-  let command = 'npx'
-  const commandArgs = ['@platformatic/watt-admin' + modifier]
-
-  if (packageManager === 'pnpm') {
-    command = 'pnpx'
-  } else {
-    commandArgs.unshift('-y')
-  }
-
-  logger.info(`Running watt-admin via ${command} ...`)
-  const proc = spawn(command, commandArgs, { stdio: 'inherit' })
-
-  proc.on('exit', code => {
-    process.exit(code)
-  })
+  return runDelegatedCommand(logger, packageManager, ['@platformatic/watt-admin' + (latest ? '@latest' : '')])
 }
 
 export const help = {

package/lib/commands/create.js

@@ -1,40 +1,97 @@
 import { getExecutableName, getPackageManager, parseArgs } from '@platformatic/foundation'
+import { bold } from 'colorette'
 import { spawn } from 'node:child_process'
+import { platform } from 'node:os'
+
+export async function runDelegatedCommand (logger, packageManager, args) {
+  if (!packageManager) {
+    packageManager = await getPackageManager(process.cwd())
+  }
+
+  let runner = 'npx'
+  if (packageManager === 'pnpm') {
+    runner = 'pnpx'
+  } else {
+    args.unshift('-y')
+  }
+
+  logger.info(`Running ${bold(runner)} ${bold(args.join(' '))} ...`)
+
+  const options = { stdio: 'inherit' }
+
+  if (platform() === 'win32') {
+    options.shell = true
+    options.windowsVerbatimArguments = true
+  }
+
+  const proc = spawn(runner, args, options)
+
+  proc.on('exit', code => {
+    process.exit(code)
+  })
+}
 
 export async function createCommand (logger, args) {
-  let {
-    values: { 'package-manager': packageManager }
+  const {
+    values: {
+      latest,
+      config,
+      'package-manager': packageManager,
+      'skip-dependencies': skipDependencies,
+      module: modules
+    }
   } = parseArgs(
     args,
     {
+      latest: {
+        type: 'boolean',
+        short: 'l'
+      },
+      // Keep following options in sync with the create command from wattpm-utils
+      config: {
+        type: 'string',
+        short: 'c',
+        default: 'watt.json'
+      },
       'package-manager': {
         type: 'string',
         short: 'P'
+      },
+      'skip-dependencies': {
+        type: 'boolean',
+        short: 's',
+        default: false
+      },
+      module: {
+        short: 'M',
+        type: 'string',
+        multiple: true,
+        default: []
       }
     },
     false,
     false
   )
 
-  if (!packageManager) {
-    packageManager = await getPackageManager(process.cwd())
-  }
+  const runArgs = ['wattpm-utils' + (latest ? '@latest' : ''), '--', 'create']
 
-  let command = 'npx'
-  const commandArgs = ['wattpm-utils']
+  runArgs.push('-c', config)
 
-  if (packageManager === 'pnpm') {
-    command = 'pnpx'
-  } else {
-    commandArgs.unshift('-y')
+  if (packageManager) {
+    runArgs.push('-P', packageManager)
   }
 
-  logger.info(`Running watt-utils create via ${command} ...`)
-  const proc = spawn(command, [...commandArgs, '--', 'create', ...args], { stdio: 'inherit' })
+  if (skipDependencies) {
+    runArgs.push('-s')
+  }
 
-  proc.on('exit', code => {
-    process.exit(code)
-  })
+  if (modules.length > 0) {
+    for (const m of modules) {
+      runArgs.push('-M', m)
+    }
+  }
+
+  return runDelegatedCommand(logger, packageManager, runArgs)
 }
 
 const createHelp = {
@@ -42,6 +99,10 @@ const createHelp = {
     return `Creates a new ${getExecutableName()} project`
   },
   options: [
+    {
+      usage: '-l --latest',
+      description: 'Use the latest version of @platformatic/watt-admin from'
+    },
     {
       usage: '-c, --config <config>',
       description: 'Name of the configuration file to use (the default is watt.json)'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wattpm",
-  "version": "3.0.6",
+  "version": "3.2.0",
   "description": "The Node.js Application Server",
   "main": "index.js",
   "type": "module",
@@ -13,7 +13,7 @@
   "bugs": {
     "url": "https://github.com/platformatic/platformatic/issues"
   },
-  "homepage": "https://docs.platformatic.dev/docs/getting-started/quick-start-watt",
+  "homepage": "https://docs.platformatic.dev/docs/getting-started/quick-start",
   "bin": {
     "watt": "./bin/cli.js",
     "wattpm": "./bin/cli.js"
@@ -29,9 +29,9 @@
     "pino-pretty": "^13.0.0",
     "split2": "^4.2.0",
     "table": "^6.8.2",
-    "@platformatic/control": "3.0.6",
-    "@platformatic/foundation": "3.0.6",
-    "@platformatic/runtime": "3.0.6"
+    "@platformatic/control": "3.2.0",
+    "@platformatic/foundation": "3.2.0",
+    "@platformatic/runtime": "3.2.0"
   },
   "devDependencies": {
     "cleaner-spec-reporter": "^0.5.0",
@@ -42,10 +42,10 @@
     "neostandard": "^0.12.0",
     "typescript": "^5.5.4",
     "undici": "^7.0.0",
-    "@platformatic/node": "3.0.6"
+    "@platformatic/node": "3.2.0"
   },
   "engines": {
-    "node": ">=22.18.0"
+    "node": ">=22.19.0"
   },
   "scripts": {
     "test": "node --test --test-reporter=cleaner-spec-reporter --test-concurrency=1 --test-timeout=2000000 test/*.test.js test/**/*.test.js",

package/schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://schemas.platformatic.dev/wattpm/3.0.6.json",
+  "$id": "https://schemas.platformatic.dev/wattpm/3.2.0.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "Platformatic Runtime Config",
   "type": "object",
@@ -1665,8 +1665,19 @@
                 }
               ]
             },
-            "additionalProperties": false
-          }
+            "plugins": {
+              "type": "array",
+              "items": {
+                "anyOf": [
+                  {
+                    "type": "string",
+                    "resolvePath": true
+                  }
+                ]
+              }
+            }
+          },
+          "additionalProperties": false
         }
       ]
     },