create-platformatic 0.47.2 → 0.47.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-platformatic",
-  "version": "0.47.2",
+  "version": "0.47.3",
   "description": "Create platformatic-db interactive tool",
   "repository": {
     "type": "git",
@@ -34,7 +34,7 @@
     "semver": "^7.5.1",
     "undici": "^5.22.1",
     "which": "^3.0.1",
-    "@platformatic/config": "0.47.2"
+    "@platformatic/config": "0.47.3"
   },
   "devDependencies": {
     "ajv": "^8.12.0",
@@ -47,8 +47,8 @@
     "tap": "^16.3.6",
     "typescript": "~5.2.0",
     "yaml": "^2.3.1",
-    "@platformatic/db": "0.47.2",
-    "@platformatic/service": "0.47.2"
+    "@platformatic/db": "0.47.3",
+    "@platformatic/service": "0.47.3"
   },
   "scripts": {
     "test": "standard | snazzy && cross-env NODE_OPTIONS=\"--loader=esmock --no-warnings\" c8 tap --no-coverage test/*test.mjs test/*/*test.mjs",

package/src/composer/create-composer-cli.mjs

@@ -91,7 +91,8 @@ const createPlatformaticComposer = async (_args, opts) => {
 
   const params = {
     hostname: args.hostname,
-    port
+    port,
+    isRuntime: opts.isRuntime
   }
 
   const env = await createComposer(

package/src/db/create-db-cli.mjs

@@ -158,7 +158,8 @@ const createPlatformaticDB = async (_args, opts) => {
     migrations: wizardOptions.defaultMigrations ? args.migrations : '',
     plugin: generatePlugin,
     types: useTypes,
-    typescript: useTypescript
+    typescript: useTypescript,
+    isRuntime: opts.isRuntime
   }
 
   const env = await createDB(params, logger, projectDir, version)

package/src/db/create-db.mjs

@@ -332,7 +332,6 @@ export async function createDB ({ hostname, database = 'sqlite', port, migration
     const config = generateConfig(migrations, plugin, types, typescript, version)
     await writeFile(join(currentDir, 'platformatic.db.json'), JSON.stringify(config, null, 2))
     logger.info('Configuration file platformatic.db.json successfully created.')
-
     const env = generateEnv(hostname, port, connectionString, typescript)
     const envFileExists = await isFileAccessible('.env', currentDir)
     await appendFile(join(currentDir, '.env'), env)

package/src/runtime/create-runtime.mjs

@@ -1,4 +1,4 @@
-import { readFile, writeFile } from 'fs/promises'
+import { readFile, readdir, stat, unlink, writeFile } from 'fs/promises'
 import { findRuntimeConfigFile } from '../utils.mjs'
 import { join, relative, isAbsolute } from 'path'
 import * as desm from 'desm'
@@ -33,8 +33,83 @@ async function createRuntime (logger, currentDir = process.cwd(), version, servi
   } else {
     logger.info(`Configuration file ${accessibleConfigFilename} found, skipping creation of configuration file.`)
   }
+  if (servicesDir) {
+    const servicesDirFullPath = join(currentDir, servicesDir)
+
+    try {
+      await stat(servicesDirFullPath)
+      await cleanServicesConfig(logger, servicesDirFullPath, entrypoint)
+      await manageServicesEnvFiles(servicesDirFullPath, currentDir, entrypoint)
+    } catch (err) {
+      // do nothing. There are no services to manage, somehow.
+    }
+  }
 
   return {}
 }
+/**
+ *
+ * @param {string} servicesDir the services dir
+ * @param {string | null} entrypoint the entrypoint. If specified the function will filter it out
+ * @returns {Promise}
+ */
+async function getAllServices (servicesDir, entrypoint = null) {
+  const services = (await readdir(servicesDir))
+  if (entrypoint) {
+    return services.filter(dir => dir !== entrypoint)
+  }
+  return services
+}
+async function cleanServicesConfig (logger, servicesDir, entrypoint) {
+  const services = await getAllServices(servicesDir, entrypoint)
+  for (const svc of services) {
+    const serviceDir = join(servicesDir, svc)
+    const configFile = await findConfigFile(serviceDir)
+    if (!configFile) {
+      logger.warn(`Cannot find config file in ${serviceDir}`)
+    } else {
+      console.log(`Found config file ${configFile}`)
+      const configFilePath = join(serviceDir, configFile)
+      const config = JSON.parse(await readFile(configFilePath, 'utf8'))
+      delete config.server
+      await writeFile(configFilePath, JSON.stringify(config, null, 2))
+    }
+  }
+}
+
+async function manageServicesEnvFiles (servicesDir, runtimeDir, entrypoint) {
+  let mainEnvFile = ''
+  const services = await getAllServices(servicesDir)
+  for (const svc of services) {
+    const envFile = await readFile(join(servicesDir, svc, '.env'), 'utf8')
+    if (svc === entrypoint) {
+      // copy the whole file
+      mainEnvFile += `\n${envFile}`
+    } else {
+      // read .env file
+      const lines = envFile.split('\n')
+      lines.forEach((line) => {
+        // copy to main env file only if line _doesn't_ match
+        // i.e any other config or comments
+        if (!line.match(/(PLT_LOGGER_LEVEL|PORT|PLT_SERVER_HOSTNAME)=/)) {
+          mainEnvFile += `\n${line}`
+        }
+      })
+    }
+    try {
+      await unlink(join(servicesDir, svc, '.env.sample'))
+    } catch (err) {
+      // do nothing
+    }
+  }
+  await writeFile(join(runtimeDir, '.env'), mainEnvFile)
+}
+
+async function findConfigFile (dir) {
+  const allFiles = await readdir(dir)
+  return allFiles.find((file) => {
+    return file.match(/platformatic\.(.*)\.json/)
+  })
+}
 
 export default createRuntime

package/src/service/create-service-cli.mjs

@@ -70,7 +70,8 @@ const createPlatformaticService = async (_args, opts = {}) => {
   const params = {
     hostname: args.hostname,
     port,
-    typescript: useTypescript
+    typescript: useTypescript,
+    isRuntime: opts.isRuntime
   }
 
   const env = await createService(params, logger, projectDir, version)