create-platformatic 2.67.0-alpha.2 → 2.67.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-platformatic",
-  "version": "2.67.0-alpha.2",
+  "version": "2.67.0",
   "description": "Create platformatic application interactive tool",
   "repository": {
     "type": "git",
@@ -32,9 +32,9 @@
     "strip-ansi": "^7.1.0",
     "undici": "^7.0.0",
     "which": "^3.0.1",
-    "@platformatic/config": "2.67.0-alpha.2",
-    "@platformatic/generators": "2.67.0-alpha.2",
-    "@platformatic/utils": "2.67.0-alpha.2"
+    "@platformatic/generators": "2.67.0",
+    "@platformatic/utils": "2.67.0",
+    "@platformatic/config": "2.67.0"
   },
   "devDependencies": {
     "@types/node": "^22.5.0",
@@ -49,10 +49,10 @@
     "neostandard": "^0.12.0",
     "typescript": "~5.8.0",
     "yaml": "^2.4.1",
-    "@platformatic/composer": "2.67.0-alpha.2",
-    "@platformatic/db": "2.67.0-alpha.2",
-    "@platformatic/service": "2.67.0-alpha.2",
-    "@platformatic/runtime": "2.67.0-alpha.2"
+    "@platformatic/composer": "2.67.0",
+    "@platformatic/runtime": "2.67.0",
+    "@platformatic/service": "2.67.0",
+    "@platformatic/db": "2.67.0"
   },
   "scripts": {
     "test:cli": "borp --pattern \"test/cli/*test.mjs\" --timeout=300000 --concurrency=1",

package/src/index.mjs

@@ -1,4 +1,5 @@
 import ConfigManager, { findConfigurationFile, loadConfigurationFile } from '@platformatic/config'
+import { ImportGenerator } from '@platformatic/generators'
 import { createDirectory, executeWithTimeout, generateDashedName, getPkgManager } from '@platformatic/utils'
 import { execa } from 'execa'
 import { glob } from 'glob'
@@ -7,7 +8,7 @@ import parseArgs from 'minimist'
 import { existsSync } from 'node:fs'
 import { readFile, writeFile } from 'node:fs/promises'
 import { basename, dirname, join, resolve } from 'node:path'
-import { pathToFileURL } from 'node:url'
+import { fileURLToPath, pathToFileURL } from 'node:url'
 import ora from 'ora'
 import pino from 'pino'
 import pretty from 'pino-pretty'
@@ -54,6 +55,35 @@ export async function chooseStackable (inquirer, stackables) {
   return options.type
 }
 
+async function getPackageVersion (pkg, projectDir) {
+  let main
+  try {
+    main = import.meta.resolve(pkg)
+  } catch {
+    main = resolveModule.sync(pkg, { basedir: projectDir })
+  }
+
+  if (main.startsWith('file:')) {
+    main = fileURLToPath(main)
+  }
+
+  let root = dirname(main)
+
+  while (!existsSync(join(root, 'package.json'))) {
+    const parent = dirname(root)
+
+    if (parent === root) {
+      // We reached the root of the filesystem
+      throw new Error(`Could not find package.json for ${pkg}.`)
+    }
+
+    root = parent
+  }
+
+  const packageJsonPath = JSON.parse(await readFile(join(root, 'package.json'), 'utf-8'))
+  return packageJsonPath.version
+}
+
 async function importOrLocal ({ pkgManager, name, projectDir, pkg }) {
   try {
     return await import(pkg)
@@ -79,8 +109,14 @@ async function importOrLocal ({ pkgManager, name, projectDir, pkg }) {
       }
     }
 
-    const spinner = ora(`Installing ${pkg + version}...`).start()
-    await execa(pkgManager, ['install', pkg + version], { cwd: projectDir })
+    const spinner = ora(`Installing ${pkg + version} using ${pkgManager} ...`).start()
+    const args = []
+
+    if (pkgManager === 'pnpm' && existsSync(resolve(projectDir, 'pnpm-workspace.yaml'))) {
+      args.push('-w')
+    }
+
+    await execa(pkgManager, ['install', ...args, pkg + version], { cwd: projectDir })
     spinner.succeed()
 
     const fileToImport = resolveModule.sync(pkg, { basedir: projectDir })
@@ -349,13 +385,27 @@ export async function createApplication (
 
     names.push(serviceName)
 
-    const stackableGenerator = new stackable.Generator({
-      logger,
-      inquirer
-    })
+    const stackableGenerator = stackable.Generator
+      ? new stackable.Generator({
+        logger,
+        inquirer,
+        serviceName,
+        parent: generator,
+        ...additionalGeneratorOptions
+      })
+      : new ImportGenerator({
+        logger,
+        inquirer,
+        serviceName,
+        module: stackableName,
+        version: await getPackageVersion(stackableName, projectDir),
+        parent: generator,
+        ...additionalGeneratorOptions
+      })
 
     stackableGenerator.setConfig({
       ...stackableGenerator.config,
+      ...additionalGeneratorConfig,
       serviceName
     })
 
@@ -404,12 +454,7 @@ export async function createApplication (
   await generator.prepare()
 
   if (chooseEntrypoint) {
-    // This can return null if the generator was not supposed to modify the config
-    const configObject = generator.getFileObject(generator.runtimeConfig)
-    const config = configObject ? JSON.parse(configObject.contents) : generator.existingConfigRaw
-    config.entrypoint = entrypoint
-
-    generator.addFile({ path: '', file: generator.runtimeConfig, contents: JSON.stringify(config, null, 2) })
+    await generator.updateConfigEntryPoint(entrypoint)
   }
 
   await generator.writeFiles()