create-platformatic 0.21.0 → 0.22.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-platformatic",
-  "version": "0.21.0",
+  "version": "0.22.0",
   "description": "Create platformatic-db interactive tool",
   "repository": {
     "type": "git",
@@ -19,31 +19,32 @@
     "commist": "^3.2.0",
     "desm": "^1.3.0",
     "es-main": "^1.2.0",
-    "execa": "^7.0.0",
-    "fastify": "^4.13.0",
+    "execa": "^7.1.1",
+    "fastify": "^4.17.0",
     "help-me": "^4.2.0",
-    "inquirer": "^9.1.4",
+    "inquirer": "^9.2.0",
     "log-update": "^5.0.1",
     "minimist": "^1.2.8",
-    "mkdirp": "^2.1.3",
-    "ora": "^6.1.2",
+    "mkdirp": "^2.1.6",
+    "ora": "^6.3.0",
     "pino": "^8.11.0",
     "pino-pretty": "^10.0.0",
     "pupa": "^3.1.0",
-    "semver": "^7.3.8",
-    "undici": "^5.20.0"
+    "semver": "^7.5.0",
+    "undici": "^5.22.0",
+    "@platformatic/config": "0.22.0"
   },
   "devDependencies": {
     "ajv": "^8.12.0",
     "c8": "^7.13.0",
     "dotenv": "^16.0.3",
-    "esmock": "^2.1.0",
+    "esmock": "^2.2.1",
     "snazzy": "^9.0.0",
     "standard": "^17.0.0",
     "tap": "^16.3.4",
-    "yaml": "^2.2.1",
-    "@platformatic/db": "0.21.0",
-    "@platformatic/service": "0.21.0"
+    "yaml": "^2.2.2",
+    "@platformatic/db": "0.22.0",
+    "@platformatic/service": "0.22.0"
   },
   "scripts": {
     "test": "standard | snazzy && NODE_OPTIONS=--loader=esmock c8 --100 tap --no-coverage test/*test.mjs test/*/*test.mjs",

package/src/db/create-db.mjs

@@ -1,4 +1,4 @@
-import { writeFile, mkdir } from 'fs/promises'
+import { writeFile, mkdir, appendFile } from 'fs/promises'
 import { join, relative, resolve } from 'path'
 import { findDBConfigFile, isFileAccessible } from '../utils.mjs'
 
@@ -61,8 +61,13 @@ function generateConfig (migrations, plugin, types, typescript, version) {
       connectionString: '{DATABASE_URL}',
       graphql: true,
       openapi: true
-    },
-    migrations: { dir: migrations }
+    }
+  }
+
+  if (migrations) {
+    config.migrations = {
+      dir: migrations
+    }
   }
 
   if (plugin === true) {
@@ -136,9 +141,14 @@ async function createDB ({ hostname, database = 'sqlite', port, migrations = 'mi
     logger.info('Configuration file platformatic.db.json successfully created.')
 
     const env = generateEnv(hostname, port, database)
-    await writeFile(join(currentDir, '.env'), env)
+    const envFileExists = await isFileAccessible('.env', currentDir)
+    await appendFile(join(currentDir, '.env'), env)
     await writeFile(join(currentDir, '.env.sample'), env)
-    logger.info('Environment file .env successfully created.')
+    if (envFileExists) {
+      logger.info('Environment file .env found, appending new environment variables to existing .env file.')
+    } else {
+      logger.info('Environment file .env successfully created.')
+    }
   } else {
     logger.info(`Configuration file ${accessibleConfigFilename} found, skipping creation of configuration file.`)
   }

package/src/service/create-service.mjs

@@ -1,4 +1,4 @@
-import { writeFile, mkdir, readFile } from 'fs/promises'
+import { writeFile, mkdir, readFile, appendFile } from 'fs/promises'
 import { join } from 'path'
 import * as desm from 'desm'
 import { findServiceConfigFile, isFileAccessible } from '../utils.mjs'
@@ -142,9 +142,14 @@ async function createService ({ hostname, port, typescript = false }, logger, cu
     logger.info('Configuration file platformatic.service.json successfully created.')
 
     const env = generateEnv(hostname, port)
-    await writeFile(join(currentDir, '.env'), env)
+    const envFileExists = await isFileAccessible('.env', currentDir)
+    await appendFile(join(currentDir, '.env'), env)
     await writeFile(join(currentDir, '.env.sample'), env)
-    logger.info('Environment file .env successfully created.')
+    if (envFileExists) {
+      logger.info('Environment file .env found, appending new environment variables to existing .env file.')
+    } else {
+      logger.info('Environment file .env successfully created.')
+    }
   } else {
     logger.info(`Configuration file ${accessibleConfigFilename} found, skipping creation of configuration file.`)
   }

package/src/utils.mjs

@@ -4,6 +4,7 @@ import { resolve, join, dirname } from 'path'
 import { createRequire } from 'module'
 import semver from 'semver'
 import * as desm from 'desm'
+import ConfigManager from '@platformatic/config'
 
 export const sleep = ms => new Promise((resolve) => setTimeout(resolve, ms))
 export const randomBetween = (min, max) => Math.floor(Math.random() * (max - min + 1) + min)
@@ -67,22 +68,8 @@ export const validatePath = async projectPath => {
   return canAccessParent
 }
 
-const findConfigFile = async (directory, type) => {
-  const configFileNames = [
-    `platformatic.${type}.json`,
-    `platformatic.${type}.json5`,
-    `platformatic.${type}.yaml`,
-    `platformatic.${type}.yml`,
-    `platformatic.${type}.toml`,
-    `platformatic.${type}.tml`
-  ]
-  const configFilesAccessibility = await Promise.all(configFileNames.map((fileName) => isFileAccessible(fileName, directory)))
-  const accessibleConfigFilename = configFileNames.find((value, index) => configFilesAccessibility[index])
-  return accessibleConfigFilename
-}
-
-export const findDBConfigFile = async (directory) => (findConfigFile(directory, 'db'))
-export const findServiceConfigFile = async (directory) => (findConfigFile(directory, 'service'))
+export const findDBConfigFile = async (directory) => (ConfigManager.findConfigFile(directory, 'db'))
+export const findServiceConfigFile = async (directory) => (ConfigManager.findConfigFile(directory, 'service'))
 
 export const getDependencyVersion = async (dependencyName) => {
   const require = createRequire(import.meta.url)

package/test/db/create-db.test.mjs

@@ -136,6 +136,23 @@ test('creates project with no typescript and no plugin', async ({ equal }) => {
   equal(await isFileAccessible(join(tmpDir, 'plugin.js')), false)
 })
 
+test('creates project with no migrations', async ({ equal }) => {
+  const params = {
+    hostname: 'myhost',
+    port: 6666,
+    migrations: ''
+  }
+
+  await createDB(params, fakeLogger, tmpDir)
+
+  const pathToDbConfigFile = join(tmpDir, 'platformatic.db.json')
+  const dbConfigFile = readFileSync(pathToDbConfigFile, 'utf8')
+  const dbConfig = JSON.parse(dbConfigFile)
+  const { migrations } = dbConfig
+
+  equal(migrations, undefined)
+})
+
 test('creates project with typescript', async ({ equal, same }) => {
   const params = {
     hostname: 'myhost',