create-platformatic 2.65.1 → 2.66.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-platformatic",
-  "version": "2.65.1",
+  "version": "2.66.0",
   "description": "Create platformatic application interactive tool",
   "repository": {
     "type": "git",
@@ -20,6 +20,7 @@
     "desm": "^1.3.1",
     "es-main": "^1.3.0",
     "execa": "^9.0.0",
+    "glob": "^11.0.2",
     "help-me": "^5.0.0",
     "inquirer": "^9.2.16",
     "minimist": "^1.2.8",
@@ -31,9 +32,9 @@
     "strip-ansi": "^7.1.0",
     "undici": "^7.0.0",
     "which": "^3.0.1",
-    "@platformatic/generators": "2.65.1",
-    "@platformatic/utils": "2.65.1",
-    "@platformatic/config": "2.65.1"
+    "@platformatic/config": "2.66.0",
+    "@platformatic/generators": "2.66.0",
+    "@platformatic/utils": "2.66.0"
   },
   "devDependencies": {
     "@types/node": "^22.5.0",
@@ -48,10 +49,10 @@
     "neostandard": "^0.12.0",
     "typescript": "~5.8.0",
     "yaml": "^2.4.1",
-    "@platformatic/composer": "2.65.1",
-    "@platformatic/db": "2.65.1",
-    "@platformatic/runtime": "2.65.1",
-    "@platformatic/service": "2.65.1"
+    "@platformatic/composer": "2.66.0",
+    "@platformatic/db": "2.66.0",
+    "@platformatic/runtime": "2.66.0",
+    "@platformatic/service": "2.66.0"
   },
   "scripts": {
     "test:cli": "borp --pattern \"test/cli/*test.mjs\" --timeout=300000 --concurrency=1",

package/src/index.mjs

@@ -1,15 +1,17 @@
-import { ConfigManager } from '@platformatic/config'
+import ConfigManager, { findConfigurationFile, loadConfigurationFile } from '@platformatic/config'
 import { createDirectory, executeWithTimeout, generateDashedName, getPkgManager } from '@platformatic/utils'
 import { execa } from 'execa'
+import { glob } from 'glob'
 import defaultInquirer from 'inquirer'
 import parseArgs from 'minimist'
+import { existsSync } from 'node:fs'
 import { readFile, writeFile } from 'node:fs/promises'
-import { basename, join, resolve as pathResolve } from 'node:path'
+import { basename, dirname, join, resolve } from 'node:path'
 import { pathToFileURL } from 'node:url'
 import ora from 'ora'
 import pino from 'pino'
 import pretty from 'pino-pretty'
-import resolve from 'resolve'
+import * as resolveModule from 'resolve'
 import { request } from 'undici'
 import { createGitRepository } from './create-git-repository.mjs'
 import { getUsername, getVersion, say } from './utils.mjs'
@@ -57,7 +59,7 @@ async function importOrLocal ({ pkgManager, name, projectDir, pkg }) {
     return await import(pkg)
   } catch (err) {
     try {
-      const fileToImport = resolve.sync(pkg, { basedir: projectDir })
+      const fileToImport = resolveModule.sync(pkg, { basedir: projectDir })
       return await import(pathToFileURL(fileToImport))
     } catch {
       // No-op
@@ -81,11 +83,93 @@ async function importOrLocal ({ pkgManager, name, projectDir, pkg }) {
     await execa(pkgManager, ['install', pkg + version], { cwd: projectDir })
     spinner.succeed()
 
-    const fileToImport = resolve.sync(pkg, { basedir: projectDir })
+    const fileToImport = resolveModule.sync(pkg, { basedir: projectDir })
     return await import(pathToFileURL(fileToImport))
   }
 }
 
+async function findApplicationRoot (projectDir) {
+  if (existsSync(resolve(projectDir, 'package.json'))) {
+    return projectDir
+  }
+
+  const files = await glob('**/*.{js,mjs,cjs,ts,mts,cts}', { cwd: projectDir })
+
+  if (files.length > 0) {
+    return dirname(resolve(projectDir, files[0]))
+  }
+
+  return null
+}
+
+export async function determineApplicationType (projectDir) {
+  let rootPackageJson
+  try {
+    rootPackageJson = JSON.parse(await readFile(resolve(projectDir, 'package.json'), 'utf-8'))
+  } catch {
+    rootPackageJson = {}
+  }
+
+  const { dependencies, devDependencies } = rootPackageJson
+
+  if (dependencies?.next || devDependencies?.next) {
+    return ['@platformatic/next', 'Next.js']
+  } else if (dependencies?.['@remix-run/dev'] || devDependencies?.['@remix-run/dev']) {
+    return ['@platformatic/remix', 'Remix']
+  } else if (dependencies?.astro || devDependencies?.astro) {
+    return ['@platformatic/astro', 'Astro']
+  } else if (dependencies?.vite || devDependencies?.vite) {
+    return ['@platformatic/vite', 'Vite']
+  }
+
+  return ['@platformatic/node', 'Node.js']
+}
+
+export async function wrapApplication (
+  logger,
+  inquirer,
+  packageManager,
+  module,
+  install,
+  projectDir,
+  additionalGeneratorOptions = {},
+  additionalGeneratorConfig = {}
+) {
+  const projectName = basename(projectDir)
+
+  const runtime = await importOrLocal({
+    pkgManager: packageManager,
+    name: projectName,
+    projectDir,
+    pkg: '@platformatic/runtime'
+  })
+
+  const generator = new runtime.WrappedGenerator({
+    logger,
+    module,
+    name: projectName,
+    inquirer,
+    ...additionalGeneratorOptions
+  })
+  generator.setConfig({
+    ...generator.config,
+    ...additionalGeneratorConfig,
+    targetDirectory: projectDir,
+    typescript: false
+  })
+
+  await generator.ask()
+  await generator.prepare()
+  await generator.writeFiles()
+
+  if (install) {
+    logger.info(`Installing dependencies for the application using ${packageManager} ...`)
+    await execa(packageManager, ['install'], { cwd: projectDir, stdio: 'inherit' })
+  }
+
+  logger.info(`You are all set! Run \`${packageManager} start\` to start your project.`)
+}
+
 export async function createPlatformatic (argv) {
   const args = parseArgs(argv, {
     default: {
@@ -119,13 +203,75 @@ export async function createApplication (
   modules,
   marketplaceHost,
   install,
-  additionalGeneratorOptions = {}
+  additionalGeneratorOptions = {},
+  additionalGeneratorConfig = {}
 ) {
   // This is only used for testing for now, but might be useful in the future
-  const inquirer = process.env.INQUIRER_PATH ? await import(process.env.INQUIRER_PATH) : defaultInquirer
+  const inquirer = process.env.USER_INPUT_HANDLER ? await import(process.env.USER_INPUT_HANDLER) : defaultInquirer
 
+  // Check in the directory and its parents if there is a config file
+  let shouldChooseProjectDir = true
   let projectDir = process.cwd()
-  if (!(await ConfigManager.findConfigFile())) {
+  const runtimeConfigFile = await findConfigurationFile(projectDir, null, 'runtime')
+
+  if (runtimeConfigFile) {
+    shouldChooseProjectDir = false
+    projectDir = dirname(runtimeConfigFile)
+  } else {
+    // Check the current directory for suitable config files
+    const applicationRoot = await findApplicationRoot(projectDir)
+
+    if (applicationRoot) {
+      const [module, label] = await determineApplicationType(projectDir)
+
+      // Check if the file belongs to a Watt application, this can happen for instance if we executed watt create
+      // in the services folder
+      const existingRuntime = await findConfigurationFile(applicationRoot, null, 'runtime')
+
+      if (!existingRuntime) {
+        // If there is a watt.json file with a runtime property, we assume we already executed watt create and we exit.
+        const existingService = await ConfigManager.findConfigFile(projectDir)
+
+        if (existingService) {
+          const serviceConfig = await loadConfigurationFile(existingService)
+
+          if (serviceConfig.runtime) {
+            await say(`The ${label} application has already been wrapped into Watt.`)
+            return
+          }
+        }
+
+        const { shouldWrap } = await inquirer.prompt({
+          type: 'list',
+          name: 'shouldWrap',
+          message: `This folder seems to already contain a ${label} application. Do you want to wrap into Watt?`,
+          // default: 'yes',
+          choices: [
+            { name: 'yes', value: true },
+            { name: 'no', value: false }
+          ]
+        })
+
+        if (shouldWrap) {
+          return wrapApplication(
+            logger,
+            inquirer,
+            packageManager,
+            module,
+            install,
+            process.cwd(),
+            additionalGeneratorOptions,
+            { ...additionalGeneratorConfig, skipTypescript: true }
+          )
+        }
+      } else {
+        projectDir = dirname(existingRuntime)
+        shouldChooseProjectDir = false
+      }
+    }
+  }
+
+  if (shouldChooseProjectDir) {
     const optionsDir = await inquirer.prompt({
       type: 'input',
       name: 'dir',
@@ -133,11 +279,11 @@ export async function createApplication (
       default: 'platformatic'
     })
 
-    projectDir = pathResolve(process.cwd(), optionsDir.dir)
+    projectDir = resolve(process.cwd(), optionsDir.dir)
+    await createDirectory(projectDir)
   }
-  const projectName = basename(projectDir)
 
-  await createDirectory(projectDir)
+  const projectName = basename(projectDir)
 
   const runtime = await importOrLocal({
     pkgManager: packageManager,
@@ -155,6 +301,7 @@ export async function createApplication (
 
   generator.setConfig({
     ...generator.config,
+    ...additionalGeneratorConfig,
     targetDirectory: projectDir
   })