create-wattpm 3.0.0-alpha.4 → 3.0.0-alpha.6

package/bin/cli.js

@@ -1,12 +1,12 @@
 #!/usr/bin/env node
 
-import { checkNodeVersionForServices } from '@platformatic/foundation'
+import { checkNodeVersionForApplications } from '@platformatic/foundation'
 import { readFile } from 'fs/promises'
 import parseArgs from 'minimist'
 import { join } from 'node:path'
 import { createPlatformatic } from '../lib/index.js'
 
-checkNodeVersionForServices()
+checkNodeVersionForApplications()
 
 const _args = process.argv.slice(2)
 const args = parseArgs(_args, {

package/eslint.config.js

@@ -1,3 +1,3 @@
 import neostandard from 'neostandard'
 
-export default neostandard({})
+export default neostandard()

package/lib/index.js

@@ -2,7 +2,6 @@ import {
   createDirectory,
   defaultPackageManager,
   detectApplicationType,
-  executeWithTimeout,
   findConfigurationFileRecursive,
   generateDashedName,
   getPackageManager,
@@ -22,11 +21,25 @@ import ora from 'ora'
 import pino from 'pino'
 import pretty from 'pino-pretty'
 import resolveModule from 'resolve'
-import { request } from 'undici'
 import { createGitRepository } from './git.js'
-import { findComposerConfigFile, getUsername, getVersion, say } from './utils.js'
-const MARKETPLACE_HOST = 'https://marketplace.platformatic.dev'
-const defaultStackables = ['@platformatic/service', '@platformatic/composer', '@platformatic/db']
+import { findGatewayConfigFile, getUsername, getVersion, say } from './utils.js'
+
+const defaultCapabilities = [
+  '@platformatic/node',
+  '@platformatic/gateway',
+  '@platformatic/next',
+  '@platformatic/vite',
+  '@platformatic/astro',
+  '@platformatic/remix',
+  '@platformatic/nest',
+  '@platformatic/service',
+  '@platformatic/db',
+  '@platformatic/php',
+  '@platformatic/ai-warp',
+  '@platformatic/pg-hooks',
+  '@platformatic/rabbitmq-hooks',
+  '@platformatic/kafka-hooks'
+]
 
 export * from './git.js'
 export * from './utils.js'
@@ -82,8 +95,8 @@ async function importOrLocal ({ pkgManager, projectDir, pkg }) {
 
     let version = ''
 
-    if (defaultStackables.includes(pkg) || pkg === '@platformatic/runtime') {
-      // Let's find if we are using one of the default stackables
+    if (defaultCapabilities.includes(pkg) || pkg === '@platformatic/runtime') {
+      // Let's find if we are using one of the default capabilities
       // If we are, we have to use the "local" version of the package
 
       const meta = await JSON.parse(await readFile(join(import.meta.dirname, '..', 'package.json'), 'utf-8'))
@@ -123,37 +136,13 @@ async function findApplicationRoot (projectDir) {
   return null
 }
 
-export async function fetchStackables (marketplaceHost, modules = []) {
-  const stackables = new Set([...modules, ...defaultStackables])
-
-  // Skip the remote network request if we are running tests
-  if (process.env.PLT_MARKETPLACE_TEST) {
-    return Array.from(stackables)
-  }
-
-  let response
-  try {
-    response = await executeWithTimeout(request(new URL('/templates', marketplaceHost || MARKETPLACE_HOST)), 5000)
-  } catch (err) {
-    // No-op: we just use the default stackables
-  }
-
-  if (response && response.statusCode === 200) {
-    for (const stackable of await response.body.json()) {
-      stackables.add(stackable.name)
-    }
-  }
-
-  return Array.from(stackables)
-}
-
-export async function chooseStackable (inquirer, stackables) {
+export async function chooseCapability (inquirer, capabilities) {
   const options = await inquirer.prompt({
     type: 'list',
     name: 'type',
-    message: 'Which kind of service do you want to create?',
-    default: stackables[0],
-    choices: stackables
+    message: 'Which kind of application do you want to create?',
+    default: capabilities[0],
+    choices: capabilities
   })
 
   return options.type
@@ -215,7 +204,7 @@ export async function createPlatformatic (argv) {
       module: []
     },
     boolean: ['install'],
-    string: ['global-config', 'marketplace-host', 'module']
+    string: ['global-config', 'module']
   })
 
   const username = await getUsername()
@@ -232,14 +221,13 @@ export async function createPlatformatic (argv) {
 
   const pkgManager = getPkgManager()
   const modules = Array.isArray(args.module) ? args.module : [args.module]
-  await createApplication(logger, pkgManager, modules, args['marketplace-host'], args['install'])
+  await createApplication(logger, pkgManager, modules, args['install'])
 }
 
 export async function createApplication (
   logger,
   packageManager,
   modules,
-  marketplaceHost,
   install,
   additionalGeneratorOptions = {},
   additionalGeneratorConfig = {}
@@ -266,17 +254,17 @@ export async function createApplication (
       const { name: module, label } = await detectApplicationType(projectDir)
 
       // Check if the file belongs to a Watt application, this can happen for instance if we executed watt create
-      // in the services folder
+      // in the applications folder
       const existingRuntime = await findConfigurationFileRecursive(applicationRoot, null, '@platformatic/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 findComposerConfigFile(projectDir)
+        const existingApplication = await findGatewayConfigFile(projectDir)
 
-        if (existingService) {
-          const serviceConfig = await loadConfigurationFile(existingService)
+        if (existingApplication) {
+          const applicationConfig = await loadConfigurationFile(existingApplication)
 
-          if (serviceConfig.runtime) {
+          if (applicationConfig.runtime) {
             await say(`The ${label} application has already been wrapped into Watt.`)
             return
           }
@@ -377,25 +365,25 @@ export async function createApplication (
     await say('Using existing configuration ...')
   }
 
-  const stackables = await fetchStackables(marketplaceHost, modules)
+  const capabilities = Array.from(new Set([...modules, ...defaultCapabilities]))
 
-  const names = generator.existingServices ?? []
+  const names = generator.existingApplications ?? []
 
   while (true) {
-    const stackableName = await chooseStackable(inquirer, stackables)
-    // await say(`Creating a ${stackable} project in ${projectDir}...`)
+    const capabilityName = await chooseCapability(inquirer, capabilities)
+    // await say(`Creating a ${capability} project in ${projectDir}...`)
 
-    const stackable = await importOrLocal({
+    const capability = await importOrLocal({
       pkgManager: packageManager,
       name: projectName,
       projectDir,
-      pkg: stackableName
+      pkg: capabilityName
     })
 
-    const { serviceName } = await inquirer.prompt({
+    const { applicationName } = await inquirer.prompt({
       type: 'input',
-      name: 'serviceName',
-      message: 'What is the name of the service?',
+      name: 'applicationName',
+      message: 'What is the name of the application?',
       default: generateDashedName(),
       validate: value => {
         if (value.length === 0) {
@@ -414,41 +402,41 @@ export async function createApplication (
       }
     })
 
-    names.push(serviceName)
+    names.push(applicationName)
 
-    const stackableGenerator = stackable.Generator
-      ? new stackable.Generator({
+    const capabilityGenerator = capability.Generator
+      ? new capability.Generator({
         logger,
         inquirer,
-        serviceName,
+        applicationName,
         parent: generator,
         ...additionalGeneratorOptions
       })
       : new ImportGenerator({
         logger,
         inquirer,
-        serviceName,
-        module: stackableName,
-        version: await getPackageVersion(stackableName, projectDir),
+        applicationName,
+        module: capabilityName,
+        version: await getPackageVersion(capabilityName, projectDir),
         parent: generator,
         ...additionalGeneratorOptions
       })
 
-    stackableGenerator.setConfig({
-      ...stackableGenerator.config,
+    capabilityGenerator.setConfig({
+      ...capabilityGenerator.config,
       ...additionalGeneratorConfig,
-      serviceName
+      applicationName
     })
 
-    generator.addService(stackableGenerator, serviceName)
+    generator.addApplication(capabilityGenerator, applicationName)
 
-    await stackableGenerator.ask()
+    await capabilityGenerator.ask()
 
     const { shouldBreak } = await inquirer.prompt([
       {
         type: 'list',
         name: 'shouldBreak',
-        message: 'Do you want to create another service?',
+        message: 'Do you want to create another application?',
         default: false,
         choices: [
           { name: 'yes', value: false },
@@ -470,7 +458,7 @@ export async function createApplication (
       {
         type: 'list',
         name: 'entrypoint',
-        message: 'Which service should be exposed?',
+        message: 'Which application should be exposed?',
         choices: names.map(name => ({ name, value: name }))
       }
     ])
@@ -513,6 +501,7 @@ export async function createApplication (
     const content = `packages:
 # all packages in direct subdirs of packages/
 - 'services/*'
+- 'services/*'
 - 'web/*'`
     await writeFile(join(projectDir, 'pnpm-workspace.yaml'), content)
   }

package/lib/utils.js

@@ -3,11 +3,9 @@ import { execa } from 'execa'
 import { access, constants, readFile } from 'node:fs/promises'
 import { createRequire } from 'node:module'
 import { dirname, join, resolve } from 'node:path'
-import * as url from 'node:url'
 
 export const sleep = ms => new Promise(resolve => setTimeout(resolve, ms))
 export const randomBetween = (min, max) => Math.floor(Math.random() * (max - min + 1) + min)
-const __dirname = url.fileURLToPath(new URL('.', import.meta.url))
 
 const ansiCodes = {
   // Platformatic Green: #21FA90
@@ -72,7 +70,7 @@ export async function isDirectoryWriteable (directory) {
 export const findConfigFile = async directory => findConfigurationFile(directory)
 export const findDBConfigFile = async directory => findConfigurationFile(directory, 'db')
 export const findServiceConfigFile = async directory => findConfigurationFile(directory, 'service')
-export const findComposerConfigFile = async directory => findConfigurationFile(directory, 'composer')
+export const findGatewayConfigFile = async directory => findConfigurationFile(directory, 'gateway')
 export const findRuntimeConfigFile = async directory => findConfigurationFile(directory, 'runtime')
 
 /**
@@ -81,7 +79,7 @@ export const findRuntimeConfigFile = async directory => findConfigurationFile(di
  * @returns string
  */
 export async function getDependencyVersion (dependencyName) {
-  const rootPackageJson = join(__dirname, '..', 'package.json')
+  const rootPackageJson = join(import.meta.dirname, '..', 'package.json')
   const packageJsonContents = JSON.parse(await readFile(rootPackageJson, 'utf8'))
   const dependencies = packageJsonContents.dependencies
   const devDependencies = packageJsonContents.devDependencies
@@ -121,8 +119,8 @@ export async function getDependencyVersion (dependencyName) {
   }
 }
 
-export function convertServiceNameToPrefix (serviceName) {
-  return serviceName.replace(/-/g, '_').toUpperCase()
+export function convertApplicationNameToPrefix (applicationName) {
+  return applicationName.replace(/-/g, '_').toUpperCase()
 }
 
 export function addPrefixToEnv (env, prefix) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-wattpm",
-  "version": "3.0.0-alpha.4",
+  "version": "3.0.0-alpha.6",
   "description": "Create platformatic application interactive tool",
   "repository": {
     "type": "git",
@@ -24,13 +24,13 @@
     "resolve": "^1.22.8",
     "undici": "^7.0.0",
     "which": "^3.0.1",
-    "@platformatic/generators": "3.0.0-alpha.4",
-    "@platformatic/foundation": "3.0.0-alpha.4"
+    "@platformatic/foundation": "3.0.0-alpha.6",
+    "@platformatic/generators": "3.0.0-alpha.6"
   },
   "devDependencies": {
     "@types/node": "^22.5.0",
-    "borp": "^0.20.0",
     "c8": "^10.0.0",
+    "cleaner-spec-reporter": "^0.5.0",
     "cross-env": "^7.0.3",
     "eslint": "9",
     "esmock": "^2.6.4",
@@ -39,18 +39,18 @@
     "semver": "^7.6.0",
     "typescript": "~5.8.0",
     "yaml": "^2.4.1",
-    "@platformatic/composer": "3.0.0-alpha.4",
-    "@platformatic/service": "3.0.0-alpha.4",
-    "@platformatic/runtime": "3.0.0-alpha.4",
-    "@platformatic/db": "3.0.0-alpha.4"
+    "@platformatic/gateway": "3.0.0-alpha.6",
+    "@platformatic/db": "3.0.0-alpha.6",
+    "@platformatic/runtime": "3.0.0-alpha.6",
+    "@platformatic/service": "3.0.0-alpha.6"
   },
   "engines": {
     "node": ">=22.18.0"
   },
   "scripts": {
-    "test:cli": "borp --pattern \"test/cli/*test.js\" --timeout=1200000 --concurrency=1",
-    "test:unit": "pnpm run lint && cross-env NODE_OPTIONS=\"--loader=esmock --no-warnings\" borp --pattern \"test/unit/*test.js\" --timeout=1200000 --concurrency=1",
     "test": "npm run test:unit && npm run test:cli",
+    "test:cli": "node --test --test-reporter=cleaner-spec-reporter --test-concurrency=1 --test-timeout=2000000 test/cli/*.test.js",
+    "test:unit": "node --test --test-reporter=cleaner-spec-reporter --test-concurrency=1 --test-timeout=2000000 test/unit/*.test.js",
     "lint": "eslint"
   }
 }