wattpm 2.63.4 → 2.64.0

package/lib/utils.js

@@ -1,8 +1,5 @@
 import {
-  ConfigManager,
-  getParser,
-  getStringifier,
-  matchKnownSchema,
+  findConfigurationFile as findRawConfigurationFile,
   loadConfig as pltConfigLoadConfig,
   Store
 } from '@platformatic/config'
@@ -10,8 +7,7 @@ import { errors } from '@platformatic/control'
 import { platformaticRuntime, buildRuntime as pltBuildRuntime } from '@platformatic/runtime'
 import { bgGreen, black, bold } from 'colorette'
 import { existsSync } from 'node:fs'
-import { readFile, writeFile } from 'node:fs/promises'
-import { dirname, resolve } from 'node:path'
+import { resolve } from 'node:path'
 import { parseArgs as nodeParseArgs } from 'node:util'
 import { pino } from 'pino'
 import pinoPretty from 'pino-pretty'
@@ -31,22 +27,21 @@ export function createLogger (level) {
       }
     },
     pinoPretty({
-      colorize: true,
+      colorize: process.env.NO_COLOR !== 'true',
       customPrettifiers: {
         level (logLevel, _u1, _u2, { label, labelColorized, colors }) {
           return logLevel === 35 ? bgGreen(black(label)) : labelColorized
         }
-      }
+      },
+      sync: true
     })
   )
 }
 
-export function overrideFatal (logger) {
-  const originalFatal = logger.fatal.bind(logger)
-  logger.fatal = function (...args) {
-    originalFatal(...args)
-    process.exit(1)
-  }
+export function logFatalError (logger, ...args) {
+  process.exitCode = 1
+  logger.fatal(...args)
+  return false
 }
 
 export function parseArgs (args, options, stopAtFirstPositional = true) {
@@ -162,42 +157,18 @@ export function serviceToEnvVariable (service) {
 }
 
 export async function findConfigurationFile (logger, root, configurationFile) {
-  let current = root
-
-  while (!configurationFile) {
-    // Find a wattpm.json or watt.json file
-    configurationFile = await ConfigManager.findConfigFile(current, true)
-
-    // If a file is found, verify it actually represents a watt or runtime configuration
-    if (configurationFile) {
-      const configuration = await loadRawConfigurationFile(logger, resolve(current, configurationFile))
-
-      if (matchKnownSchema(configuration.$schema) !== 'runtime') {
-        configurationFile = null
-      }
-    }
-
-    if (!configurationFile) {
-      const newCurrent = dirname(current)
-
-      if (newCurrent === current) {
-        break
-      }
-
-      current = newCurrent
-    }
-  }
-
-  if (typeof configurationFile !== 'string') {
-    logger.fatal(
-      `Cannot find a supported Watt configuration file (like ${bold(
-        'watt.json'
-      )}, a ${bold('wattpm.json')} or a ${bold('platformatic.json')}) in ${bold(root)}.`
+  const configFile = await findRawConfigurationFile(root, configurationFile, 'runtime')
+
+  if (!configFile) {
+    return logFatalError(
+      logger,
+      `Cannot find a supported Watt configuration file (like ${bold('watt.json')}, a ${bold('wattpm.json')} or a ${bold(
+        'platformatic.json'
+      )}) in ${bold(root)}.`
     )
   }
 
-  const resolved = resolve(current, configurationFile)
-  return resolved
+  return configFile
 }
 
 export async function loadConfigurationFile (logger, configurationFile) {
@@ -221,18 +192,6 @@ export async function loadConfigurationFile (logger, configurationFile) {
   return configManager.current
 }
 
-export async function loadRawConfigurationFile (_, configurationFile) {
-  const parseConfig = getParser(configurationFile)
-
-  return parseConfig(await readFile(configurationFile, 'utf-8'))
-}
-
-export function saveConfigurationFile (logger, configurationFile, config) {
-  const stringifyConfig = getStringifier(configurationFile)
-
-  return writeFile(configurationFile, stringifyConfig(config), 'utf-8')
-}
-
 export async function buildRuntime (logger, configurationFile) {
   const store = new Store()
   store.add(platformaticRuntime)
@@ -243,7 +202,7 @@ export async function buildRuntime (logger, configurationFile) {
   const runtimeConfig = config.configManager
   try {
     return await pltBuildRuntime(runtimeConfig)
-    /* c8 ignore next 3 */
+    /* c8 ignore next 3 - Hard to test */
   } catch (e) {
     process.exit(1)
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wattpm",
-  "version": "2.63.4",
+  "version": "2.64.0",
   "description": "The Node.js Application Server",
   "main": "index.js",
   "type": "module",
@@ -36,11 +36,12 @@
     "semver": "^7.7.0",
     "split2": "^4.2.0",
     "table": "^6.8.2",
-    "@platformatic/basic": "2.63.4",
-    "@platformatic/config": "2.63.4",
-    "@platformatic/runtime": "2.63.4",
-    "@platformatic/utils": "2.63.4",
-    "@platformatic/control": "2.63.4"
+    "@platformatic/basic": "2.64.0",
+    "@platformatic/config": "2.64.0",
+    "@platformatic/runtime": "2.64.0",
+    "@platformatic/control": "2.64.0",
+    "@platformatic/utils": "2.64.0",
+    "create-platformatic": "2.64.0"
   },
   "devDependencies": {
     "borp": "^0.20.0",
@@ -50,7 +51,7 @@
     "neostandard": "^0.12.0",
     "typescript": "^5.5.4",
     "undici": "^7.0.0",
-    "@platformatic/node": "2.63.4"
+    "@platformatic/node": "2.64.0"
   },
   "scripts": {
     "test": "npm run lint && borp --concurrency=1 --timeout=300000",

package/schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://schemas.platformatic.dev/wattpm/2.63.4.json",
+  "$id": "https://schemas.platformatic.dev/wattpm/2.64.0.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {

package/lib/commands/init.js

@@ -1,119 +0,0 @@
-import { ensureLoggableError } from '@platformatic/utils'
-import { bold } from 'colorette'
-import { existsSync } from 'node:fs'
-import { mkdir, stat, writeFile } from 'node:fs/promises'
-import { basename, resolve } from 'node:path'
-import { defaultConfiguration, defaultPackageJson, defaultEnv } from '../defaults.js'
-import { gitignore } from '../gitignore.js'
-import { schema, version } from '../schema.js'
-import { getRoot, parseArgs, saveConfigurationFile, verbose } from '../utils.js'
-
-export async function initCommand (logger, args) {
-  const {
-    values: { 'package-manager': packageManager },
-    positionals
-  } = parseArgs(
-    args,
-    {
-      'package-manager': {
-        type: 'string',
-        short: 'p',
-        default: 'npm'
-      }
-    },
-    false
-  )
-
-  /* c8 ignore next */
-  const root = getRoot(positionals)
-  const web = resolve(root, 'web')
-  const configurationFile = resolve(root, 'watt.json')
-
-  // Check that the none of the files to be created already exist
-  if (existsSync(root)) {
-    const statObject = await stat(root)
-
-    if (!statObject.isDirectory()) {
-      logger.fatal(`Path ${bold(root)} exists but it is not a directory.`)
-    }
-
-    const webFolder = resolve(root, 'web')
-
-    if (existsSync(webFolder)) {
-      const statObject = await stat(webFolder)
-
-      if (!statObject.isDirectory()) {
-        logger.fatal(`Path ${bold(webFolder)} exists but it is not a directory.`)
-      }
-    }
-
-    for (const file of ['watt.json', 'package.json', '.gitignore']) {
-      if (existsSync(resolve(root, file))) {
-        logger.fatal(`Path ${bold(resolve(root, file))} already exists.`)
-      }
-    }
-  }
-
-  // Create the web folder, will implicitly create the root
-  try {
-    await mkdir(web, { recursive: true })
-    /* c8 ignore next 6 */
-  } catch (error) {
-    logger.fatal(
-      verbose ? { error: ensureLoggableError(error) } : undefined,
-      `Cannot create folder ${web}: ${error.message}`
-    )
-  }
-
-  await saveConfigurationFile(logger, configurationFile, {
-    $schema: schema.$id,
-    ...defaultConfiguration,
-    entrypoint: positionals[1] ?? undefined
-  })
-
-  await writeFile(resolve(root, '.env.sample'), defaultEnv, 'utf-8')
-  await writeFile(resolve(root, '.env'), defaultEnv, 'utf-8')
-
-  const packageJson = {
-    name: basename(root),
-    ...defaultPackageJson,
-    dependencies: { wattpm: `^${version}` }
-  }
-
-  if (packageManager === 'npm') {
-    packageJson.workspaces = ['web/*', 'external/*']
-  } else if (packageManager === 'pnpm') {
-    await saveConfigurationFile(logger, resolve(root, 'pnpm-workspace.yaml'), { packages: ['web/*', 'external/*'] })
-  }
-
-  // Write the package.json file
-  await saveConfigurationFile(logger, resolve(root, 'package.json'), packageJson)
-
-  // Write the .gitignore file
-  await writeFile(resolve(root, '.gitignore'), gitignore, 'utf-8')
-
-  logger.done(`Created a watt application in ${bold(root)}.`)
-}
-
-export const help = {
-  init: {
-    usage: 'init [root] [entrypoint]',
-    description: 'Creates a new application',
-    args: [
-      {
-        name: 'root',
-        description: 'The directory where to create the application (the default is the current directory)'
-      },
-      {
-        name: 'entrypoint',
-        description: 'The name of the entrypoint service'
-      }
-    ],
-    options: [
-      {
-        usage: 'p, --package-manager <executable>',
-        description: 'Use an alternative package manager'
-      }
-    ]
-  }
-}

package/lib/defaults.js

@@ -1,29 +0,0 @@
-export const defaultConfiguration = {
-  server: {
-    hostname: '{HOSTNAME}',
-    port: '{PORT}',
-  },
-  logger: {
-    level: 'info'
-  },
-  autoload: {
-    path: 'web'
-  }
-}
-
-export const defaultPackageJson = {
-  private: true,
-  scripts: {
-    dev: 'wattpm dev',
-    build: 'wattpm build',
-    start: 'wattpm start'
-  },
-  dependencies: {}
-}
-
-export const defaultServiceJson = {}
-
-export const defaultEnv = `
-PORT=3042
-HOSTNAME=127.0.0.1
-`