@platformatic/generators 2.72.0 → 3.0.0-alpha.1

package/lib/base-generator.js

@@ -28,6 +28,8 @@ const fakeLogger = {
 }
 /* c8 ignore start */
 
+const DEFAULT_SERVICES_PATH = 'services'
+
 class BaseGenerator extends FileGenerator {
   constructor (opts = {}) {
     super(opts)
@@ -403,7 +405,7 @@ class BaseGenerator extends FileGenerator {
         ...this.config.dependencies
       },
       engines: {
-        node: '^22.14.0 || ^20.6.0'
+        node: '>=22.16.0'
       }
     }
 
@@ -470,7 +472,7 @@ class BaseGenerator extends FileGenerator {
 
   async loadFromDir (serviceName, runtimeRootPath) {
     const runtimePkgConfigFileData = JSON.parse(await readFile(join(runtimeRootPath, this.runtimeConfig), 'utf-8'))
-    const servicesPath = runtimePkgConfigFileData.autoload.path
+    const servicesPath = runtimePkgConfigFileData.autoload?.path ?? DEFAULT_SERVICES_PATH
     const servicePkgJsonFileData = JSON.parse(
       await readFile(join(runtimeRootPath, servicesPath, serviceName, 'platformatic.json'), 'utf-8')
     )

package/lib/create-plugin.js

@@ -3,7 +3,6 @@
 const { join } = require('path')
 
 const JS_PLUGIN_WITH_TYPES_SUPPORT = `\
-/// <reference path="../global.d.ts" />
 'use strict'
 /** @param {import('fastify').FastifyInstance} fastify */
 module.exports = async function (fastify, opts) {
@@ -12,7 +11,6 @@ module.exports = async function (fastify, opts) {
 `
 
 const TS_PLUGIN_WITH_TYPES_SUPPORT = `\
-/// <reference path="../global.d.ts" />
 import { FastifyInstance, FastifyPluginOptions } from 'fastify'
 
 export default async function (fastify: FastifyInstance, opts: FastifyPluginOptions) {
@@ -21,7 +19,6 @@ export default async function (fastify: FastifyInstance, opts: FastifyPluginOpti
 `
 
 const JS_ROUTES_WITH_TYPES_SUPPORT = `\
-/// <reference path="../global.d.ts" />
 'use strict'
 /** @param {import('fastify').FastifyInstance} fastify */
 module.exports = async function (fastify, opts) {
@@ -32,7 +29,6 @@ module.exports = async function (fastify, opts) {
 `
 
 const TS_ROUTES_WITH_TYPES_SUPPORT = `\
-/// <reference path="../global.d.ts" />
 import { FastifyInstance, FastifyPluginOptions } from 'fastify'
 
 declare module 'fastify' {

package/lib/import-generator.js

@@ -1,12 +1,10 @@
 'use strict'
 
-const { findConfigurationFile } = require('@platformatic/config')
-const { safeRemove } = require('@platformatic/utils')
-const { glob } = require('glob')
+const { safeRemove, findConfigurationFileRecursive } = require('@platformatic/utils')
 const { BaseGenerator } = require('./base-generator')
 const { spawnSync } = require('node:child_process')
-const { stat, readFile } = require('node:fs/promises')
-const { join, dirname } = require('node:path')
+const { stat, readFile, readdir } = require('node:fs/promises')
+const { join, dirname, resolve, relative } = require('node:path')
 
 class ImportGenerator extends BaseGenerator {
   constructor (options = {}) {
@@ -120,7 +118,7 @@ class ImportGenerator extends BaseGenerator {
   async #generateConfigFile (originalPath, updatedPath) {
     // Determine if there is a watt.json file in the application path - If it's missing, insert one
     // For import it means we don't update  the file, for copy it means it was already copied in #copy.
-    const existingConfig = await findConfigurationFile(originalPath)
+    const existingConfig = await findConfigurationFileRecursive(originalPath)
 
     if (existingConfig) {
       return
@@ -203,30 +201,29 @@ class ImportGenerator extends BaseGenerator {
   }
 
   async #copy (root) {
-    const files = await glob('**/*', {
-      cwd: root,
-      dot: true,
-      ignore: ['node_modules/**', 'package-lock.json', 'pnpm-lock.yaml', 'yarn.lock'],
-      withFileTypes: true
-    })
+    const files = await readdir(root, { withFileTypes: true, recursive: true })
+
+    for await (const file of files) {
+      const absolutePath = resolve(file.parentPath, file.name)
+      let path = relative(root, dirname(absolutePath))
 
-    for (const file of files) {
-      if (file.isDirectory()) {
+      if (
+        file.isDirectory() ||
+        ['package-lock.json', 'pnpm-lock.yaml', 'yarn.lock'].includes(file.name) ||
+        path.includes('node_modules')
+      ) {
         continue
       }
 
       /* c8 ignore next 6 */
-      let path = dirname(file.relative())
       if (path === '.') {
         path = ''
-      } else if (path.startsWith('./')) {
-        path = path.substring(2)
       }
 
       this.addFile({
         path,
         file: file.name,
-        contents: await readFile(file.fullpath())
+        contents: await readFile(resolve(file.parentPath, file.name))
       })
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/generators",
-  "version": "2.72.0",
+  "version": "3.0.0-alpha.1",
   "description": "Main classes and utils for generators.",
   "main": "index.js",
   "keywords": [],
@@ -11,11 +11,9 @@
     "change-case-all": "^2.1.0",
     "execa": "^9.6.0",
     "fastify": "^5.0.0",
-    "glob": "^11.0.2",
     "pino": "^9.0.0",
     "undici": "^7.0.0",
-    "@platformatic/config": "2.72.0",
-    "@platformatic/utils": "2.72.0"
+    "@platformatic/utils": "3.0.0-alpha.1"
   },
   "devDependencies": {
     "@types/inquirer": "^9.0.7",