platformatic 1.26.0 → 1.28.0

package/help/logs.txt

@@ -10,7 +10,7 @@ Options:
 * `-n, --name <string>` - The name of the runtime.
 * `-l, --level <string>` - The pino log level to stream. Default is `info`.
 * `-s, --service <string>` - The name of the service to stream logs from.
-* `--pretty` <boolean> - Pretty print the logs. Default is `true`.
+* `--pretty <boolean>` - Pretty print the logs. Default is `true`.
 
 If `--service` is not specified, the command will stream logs from all services.
 

package/lib/deploy.js

@@ -22,11 +22,6 @@ const UUID_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12
 const CREATE_NEW_WORKSPACE_CHOICE = Symbol('CREATE_NEW_WORKSPACE_CHOICE')
 const CREATE_NEW_APPLICATION_CHOICE = Symbol('CREATE_NEW_APPLICATION_CHOICE')
 
-const logger = pino(pretty({
-  translateTime: 'SYS:HH:MM:ss',
-  ignore: 'hostname,pid'
-}))
-
 async function askMissingWorkspaceDetails (
   workspaceType,
   workspaceId,
@@ -439,7 +434,13 @@ async function getUserWorkspaceDetails (deployServiceHost, userApiKey) {
 }
 
 export async function deploy (argv) {
-  console.log('This application will be deployed to ' + bold(green('Platformatic Cloud')) + '. To change the target use the --deploy-service-host flag')
+  const logger = pino(pretty({
+    translateTime: 'SYS:HH:MM:ss',
+    ignore: 'hostname,pid'
+  }))
+
+  logger.info('This application will be deployed to ' + bold(green('Platformatic Cloud')) + '. To change the target use the --deploy-service-host flag')
+
   try {
     const args = parseArgs(argv, {
       alias: {

package/lib/upgrade.js

@@ -1,21 +1,12 @@
-import ConfigManager from '@platformatic/config'
-import { analyze, write, upgrade as upgradeConfig } from '@platformatic/metaconfig'
+import { Store, getStringifier } from '@platformatic/config'
 import parseArgs from 'minimist'
-import { access } from 'fs/promises'
-import { resolve } from 'path'
-import { execa } from 'execa'
-import { getLatestNpmVersion } from '@platformatic/utils'
-
-const configFileNames = ConfigManager.listConfigFiles()
-
-async function isFileAccessible (filename) {
-  try {
-    await access(filename)
-    return true
-  } catch (err) {
-    return false
-  }
-}
+import { writeFile } from 'fs/promises'
+import { platformaticService } from '@platformatic/service'
+import { platformaticDB } from '@platformatic/db'
+import { platformaticComposer } from '@platformatic/composer'
+import { platformaticRuntime } from '@platformatic/runtime'
+import pino from 'pino'
+import pretty from 'pino-pretty'
 
 export async function upgrade (argv) {
   const args = parseArgs(argv, {
@@ -23,79 +14,46 @@ export async function upgrade (argv) {
       config: 'c'
     }
   })
+
+  const logger = pino(pretty({
+    translateTime: 'SYS:HH:MM:ss',
+    ignore: 'hostname,pid'
+  }))
   try {
-    await upgradeApp(args.config)
-    await upgradeSystem()
+    await upgradeApp(args.config, logger)
   } catch (err) {
-    // silently ignore errors
+    console.log(err)
+    process.exit(1)
   }
 }
 
-async function upgradeApp (config) {
-  let accessibleConfigFilename = config
-
-  if (!accessibleConfigFilename) {
-    const configFilesAccessibility = await Promise.all(configFileNames.map((fileName) => isFileAccessible(fileName)))
-    accessibleConfigFilename = configFileNames.find((value, index) => configFilesAccessibility[index])
-  }
-
-  if (!accessibleConfigFilename) {
-    console.error('No config file found')
-    process.exitCode = 1
-    return
-  }
-
-  accessibleConfigFilename = resolve(accessibleConfigFilename)
-
-  let meta = await analyze({ file: accessibleConfigFilename })
-
-  console.log(`Found ${meta.version} for Platformatic ${meta.kind} in ${meta.format} format`)
-
-  meta = upgradeConfig(meta)
-
-  await write(meta)
-  console.log('App Upgraded to', meta.version)
-}
-
-async function upgradeSystem () {
-  console.log('Checking latest platformatic version on npm registry...')
-  const currentRunningVersion = await checkSystemPlatformaticVersion()
-  const latestNpmVersion = await getLatestNpmVersion('platformatic')
-  if (latestNpmVersion) {
-    const compareResult = compareVersions(currentRunningVersion, latestNpmVersion)
-    switch (compareResult) {
-      case 0:
-        console.log(`✅ You are running the latest Platformatic version v${latestNpmVersion}!`)
-        break
-      case -1:
-        console.log(`✨ Version ${latestNpmVersion} of Platformatic has been released, please update with "npm update -g platformatic"`)
-        break
+async function upgradeApp (config, logger) {
+  const store = new Store({
+    cwd: process.cwd(),
+    logger
+  })
+  store.add(platformaticService)
+  store.add(platformaticDB)
+  store.add(platformaticComposer)
+  store.add(platformaticRuntime)
+
+  const { configManager } = await store.loadConfig({
+    config,
+    overrides: {
+      fixPaths: false,
+      onMissingEnv (key) {
+        return ''
+      }
     }
-  }
-}
-
-export function compareVersions (first, second) {
-  const [firstMajor, firstMinor, firstPatch] = first.split('.')
-  const [secondMajor, secondMinor, secondPatch] = second.split('.')
+  })
 
-  if (firstMajor < secondMajor) return -1
-  if (firstMajor > secondMajor) return 1
+  await configManager.parseAndValidate()
 
-  // firstMajor === secondMajor
-  if (firstMinor < secondMinor) return -1
-  if (firstMinor > secondMinor) return 1
+  const stringify = getStringifier(configManager.fullPath)
 
-  // firstMinor === secondMinor
-  if (firstPatch < secondPatch) return -1
-  if (firstPatch > secondPatch) return 1
+  const newConfig = stringify(configManager.current)
 
-  return 0
-}
+  await writeFile(configManager.fullPath, newConfig, 'utf8')
 
-async function checkSystemPlatformaticVersion () {
-  const { stdout } = await execa('platformatic', ['--version'])
-  if (stdout.match(/v\d+\.\d+\.\d+/)) {
-    return stdout.substring(1)
-  }
-  return '0.0.0'
+  logger.info(`✅ Updated ${configManager.fullPath}`)
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "platformatic",
-  "version": "1.26.0",
+  "version": "1.28.0",
   "description": "Platformatic CLI",
   "main": "cli.js",
   "type": "module",
@@ -27,9 +27,9 @@
     "mercurius"
   ],
   "devDependencies": {
-    "borp": "^0.9.0",
+    "borp": "^0.10.0",
     "c8": "^9.1.0",
-    "fastify": "^4.26.0",
+    "fastify": "^4.26.2",
     "license-checker": "^25.0.1",
     "mkdirp": "^2.1.6",
     "snazzy": "^9.0.0",
@@ -41,29 +41,28 @@
     "colorette": "^2.0.20",
     "commist": "^3.2.0",
     "desm": "^1.3.1",
-    "dotenv": "^16.4.1",
+    "dotenv": "^16.4.5",
     "execa": "^8.0.1",
     "graphql": "^16.8.1",
     "help-me": "^5.0.0",
-    "inquirer": "^9.2.13",
-    "mercurius": "^13.3.3",
+    "inquirer": "^9.2.16",
+    "mercurius": "^13.4.0",
     "minimist": "^1.2.8",
-    "pino": "^8.17.2",
+    "pino": "^8.19.0",
     "pino-pretty": "^10.3.1",
-    "undici": "^6.6.0",
-    "@platformatic/authenticate": "1.26.0",
-    "@platformatic/composer": "1.26.0",
-    "@platformatic/config": "1.26.0",
-    "@platformatic/client-cli": "1.26.0",
-    "@platformatic/control": "1.26.0",
-    "@platformatic/db": "1.26.0",
-    "@platformatic/deploy-client": "1.26.0",
-    "@platformatic/frontend-template": "1.26.0",
-    "@platformatic/metaconfig": "1.26.0",
-    "@platformatic/runtime": "1.26.0",
-    "@platformatic/utils": "1.26.0",
-    "@platformatic/service": "1.26.0",
-    "create-platformatic": "1.26.0"
+    "undici": "^6.9.0",
+    "@platformatic/authenticate": "1.28.0",
+    "@platformatic/config": "1.28.0",
+    "@platformatic/client-cli": "1.28.0",
+    "@platformatic/composer": "1.28.0",
+    "@platformatic/control": "1.28.0",
+    "@platformatic/db": "1.28.0",
+    "@platformatic/deploy-client": "1.28.0",
+    "@platformatic/frontend-template": "1.28.0",
+    "@platformatic/utils": "1.28.0",
+    "@platformatic/service": "1.28.0",
+    "@platformatic/runtime": "1.28.0",
+    "create-platformatic": "1.28.0"
   },
   "scripts": {
     "test": "pnpm run lint && borp --timeout 120000 --concurrency 1",