platformatic 2.15.0 → 2.16.0-alpha.1

package/lib/resolve.js

@@ -1,141 +1,47 @@
-import { join, relative, resolve as resolvePath } from 'node:path'
-import { access, writeFile, readFile, mkdir, readdir } from 'node:fs/promises'
-import { Store, getParser, getStringifier } from '@platformatic/config'
+import { Store } from '@platformatic/config'
 import { platformaticRuntime } from '@platformatic/runtime'
 import parseArgs from 'minimist'
 import pino from 'pino'
 import pretty from 'pino-pretty'
-import { execa } from 'execa'
-
-const RESOLVED_SERVICES_DIRNAME = 'external'
+import { resolveServices } from 'wattpm'
 
 export async function resolve (argv) {
   const args = parseArgs(argv, {
     alias: {
       config: 'c',
       username: 'u',
-      password: 'p',
+      password: 'p'
     },
-    boolean: ['test'],
-    string: ['config', 'username', 'password'],
-    default: { test: false },
+    string: ['config', 'username', 'password']
   })
 
-  const logger = pino(pretty({
-    translateTime: 'SYS:HH:MM:ss',
-    ignore: 'hostname,pid',
-  }))
+  const logger = pino(
+    pretty({
+      translateTime: 'SYS:HH:MM:ss',
+      ignore: 'hostname,pid'
+    })
+  )
   try {
-    await resolveServices(args.config, logger, {
-      test: args.test,
-      username: args.username,
-      password: args.password,
+    const store = new Store({
+      cwd: process.cwd(),
+      logger
     })
-  } catch (err) {
-    console.log(err)
-    process.exit(1)
-  }
-}
-
-async function resolveServices (configPath, logger, options = {}) {
-  const store = new Store({
-    cwd: process.cwd(),
-    logger,
-  })
-  store.add(platformaticRuntime)
-
-  const { configManager } = await store.loadConfig({
-    config: configPath,
-    overrides: {
-      onMissingEnv (key) {
-        return '{' + key + '}'
-      },
-    },
-  })
-
-  configPath = configManager.fullPath
-
-  const parseConfig = getParser(configPath)
-  const configFile = await readFile(configPath, 'utf8')
-  const config = await parseConfig(configFile)
-
-  if (!config.services || config.services.length === 0) {
-    logger.info('No external services to resolve')
-    return
-  }
-
-  const projectDir = configManager.dirname
-  const externalDir = join(projectDir, RESOLVED_SERVICES_DIRNAME)
-
-  const services = config.services || []
-  for (const service of services) {
-    if (service.url) {
-      let path = service.path
-      if (path && path.startsWith('{') && path.endsWith('}')) {
-        path = await configManager.replaceEnv(path)
-
-        // Failed to resolve the path
-        if (path.startsWith('{') && path.endsWith('}')) {
-          path = null
-        }
-      }
-
-      if (!path) {
-        await mkdir(externalDir, { recursive: true })
-        path = join(externalDir, service.id)
-        service.path = relative(projectDir, path)
-      } else {
-        path = resolvePath(projectDir, path)
-      }
-
-      const isNotEmpty = await isDirectoryNotEmpty(path)
-      if (isNotEmpty) {
-        logger.info(`Skipping ${service.id} as it is not empty`)
-        continue
-      }
-
-      const relativePath = relative(projectDir, path)
+    store.add(platformaticRuntime)
 
-      logger.info(`Cloning ${service.url} into ${relativePath}`)
-      if (!options.test) {
-        let url = service.url
-        if (options.username && options.password) {
-          const urlObj = new URL(service.url)
-          if (!urlObj.username && !urlObj.password) {
-            urlObj.username = options.username
-            urlObj.password = options.password
-          }
-          url = urlObj.href
+    const { configManager } = await store.loadConfig({
+      config: args.config,
+      overrides: {
+        onMissingEnv () {
+          return ''
         }
-        await execa('git', ['clone', url, path])
       }
+    })
 
-      // TODO: replace it with a proper runtime build step
-      logger.info(`Resolving dependencies for service "${service.id}"`)
-      if (!options.test) {
-        await execa('npm', ['i'], { cwd: path })
-      }
-
-      if (!service.path) {
-        service.path = relativePath
-      }
-    }
-  }
-
-  const stringifyConfig = getStringifier(configPath)
-  const newConfig = stringifyConfig(config)
-
-  await writeFile(configManager.fullPath, newConfig, 'utf8')
+    await resolveServices(logger, configManager.dirname, configManager.fullPath, args.username, args.password, false)
 
-  logger.info('✅ All external services have been resolved')
-}
-
-async function isDirectoryNotEmpty (directoryPath) {
-  try {
-    await access(directoryPath)
-    const files = await readdir(directoryPath)
-    return files.length > 0
+    logger.info('✅ All external services have been resolved')
   } catch (err) {
-    return false
+    console.log(err)
+    process.exit(1)
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "platformatic",
-  "version": "2.15.0",
+  "version": "2.16.0-alpha.1",
   "description": "Platformatic CLI",
   "main": "cli.js",
   "type": "module",
@@ -37,14 +37,14 @@
     "mkdirp": "^2.1.6",
     "neostandard": "^0.11.1",
     "typescript": "^5.5.3",
-    "@platformatic/astro": "2.15.0",
-    "@platformatic/composer": "2.15.0",
-    "@platformatic/db": "2.15.0",
-    "@platformatic/node": "2.15.0",
-    "@platformatic/next": "2.15.0",
-    "@platformatic/remix": "2.15.0",
-    "@platformatic/service": "2.15.0",
-    "@platformatic/vite": "2.15.0"
+    "@platformatic/composer": "2.16.0-alpha.1",
+    "@platformatic/astro": "2.16.0-alpha.1",
+    "@platformatic/db": "2.16.0-alpha.1",
+    "@platformatic/next": "2.16.0-alpha.1",
+    "@platformatic/node": "2.16.0-alpha.1",
+    "@platformatic/remix": "2.16.0-alpha.1",
+    "@platformatic/vite": "2.16.0-alpha.1",
+    "@platformatic/service": "2.16.0-alpha.1"
   },
   "dependencies": {
     "@fastify/error": "^4.0.0",
@@ -60,13 +60,14 @@
     "pino-pretty": "^13.0.0",
     "split2": "^4.2.0",
     "undici": "^6.9.0",
-    "@platformatic/basic": "2.15.0",
-    "@platformatic/client-cli": "2.15.0",
-    "@platformatic/config": "2.15.0",
-    "@platformatic/control": "2.15.0",
-    "@platformatic/runtime": "2.15.0",
-    "@platformatic/utils": "2.15.0",
-    "create-platformatic": "2.15.0"
+    "@platformatic/basic": "2.16.0-alpha.1",
+    "@platformatic/control": "2.16.0-alpha.1",
+    "@platformatic/config": "2.16.0-alpha.1",
+    "@platformatic/runtime": "2.16.0-alpha.1",
+    "@platformatic/client-cli": "2.16.0-alpha.1",
+    "@platformatic/utils": "2.16.0-alpha.1",
+    "create-platformatic": "2.16.0-alpha.1",
+    "wattpm": "2.16.0-alpha.1"
   },
   "scripts": {
     "test": "pnpm run lint && borp --no-timeout --concurrency 1",