@platformatic/generators 1.15.1 → 1.16.0

package/lib/create-plugin.js

@@ -59,10 +59,11 @@ ${customization.requires || ''}
 
 async function getServer (t) {
 ${customization.pre || ''}
-  const config = JSON.parse(await readFile(join(__dirname, '..', 'platformatic.${mod}.json'), 'utf8'))
+  const config = JSON.parse(await readFile(join(__dirname, '..', 'platformatic.json'), 'utf8'))
   // Add your config customizations here. For example you want to set
   // all things that are set in the config file to read from an env variable
-  config.server.logger.level = 'warn'
+  config.server ||= {}
+  config.server.logger ||= {}
   config.watch = false
 ${customization.config || ''}
   // Add your config customizations here
@@ -125,9 +126,11 @@ type TestContext = Parameters<Exclude<testfn, undefined>>[0]
 export async function getServer (t: TestContext) {
 ${customizations.pre}
   // We go up two folder because this files executes in the dist folder
-  const config = JSON.parse(await readFile(join(__dirname, '..', '..', 'platformatic'), 'utf8'))
+  const config = JSON.parse(await readFile(join(__dirname, '..', '..', 'platformatic.json'), 'utf8'))
   // Add your config customizations here. For example you want to set
   // all things that are set in the config file to read from an env variable
+  config.server ||= {}
+  config.server.logger ||= {}
   config.server.logger.level = 'warn'
   config.watch = false
 ${customizations.config}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/generators",
-  "version": "1.15.1",
+  "version": "1.16.0",
   "description": "Main classes and utils for generators.",
   "main": "index.js",
   "keywords": [],

package/test/base-generator.test.js

@@ -295,8 +295,8 @@ test('should generate javascript plugin, routes and tests', async (t) => {
   assert.ok(bg.getFileObject('example.js', 'plugins'))
   assert.ok(bg.getFileObject('root.js', 'routes'))
 
-  assert.ok(bg.getFileObject('root.test.js', 'test/routes'))
-  assert.ok(bg.getFileObject('example.test.js', 'test/plugins'))
+  assert.ok(bg.getFileObject('root.test.js', join('test', 'routes')))
+  assert.ok(bg.getFileObject('example.test.js', join('test', 'plugins')))
 })
 
 test('should generate tsConfig file and typescript files', async (t) => {
@@ -335,8 +335,8 @@ test('should generate tsConfig file and typescript files', async (t) => {
   assert.ok(bg.getFileObject('example.ts', 'plugins'))
   assert.ok(bg.getFileObject('root.ts', 'routes'))
 
-  assert.ok(bg.getFileObject('root.test.ts', 'test/routes'))
-  assert.ok(bg.getFileObject('example.test.ts', 'test/plugins'))
+  assert.ok(bg.getFileObject('root.test.ts', join('test', 'routes')))
+  assert.ok(bg.getFileObject('example.test.ts', join('test', 'plugins')))
 })
 
 test('should throw if preapare fails', async (t) => {
@@ -521,7 +521,7 @@ test('support packages', async (t) => {
         {
           name: '@fastify/static',
           options: {
-            root: '{PLT_ROOT}/public'
+            root: join('{PLT_ROOT}', 'public')
           }
         }
       ]
@@ -561,7 +561,7 @@ test('support packages', async (t) => {
         {
           name: '@fastify/static',
           options: {
-            root: '{PLT_ROOT}/{PLT_MY_SERVICE_FST_PLUGIN_STATIC_ROOT}'
+            root: join('{PLT_ROOT}', '{PLT_MY_SERVICE_FST_PLUGIN_STATIC_ROOT}')
           }
         }
       ]

package/test/file-generator.test.js

@@ -39,9 +39,9 @@ describe('FileGenerator', () => {
     fg.addFile({ path: '/anotherpath', file: 'foobar.txt', contents: 'foobar' })
 
     assert.deepEqual(fg.listFiles(), [
-      'path/helloworld.txt',
-      'path/foobar.txt',
-      'anotherpath/foobar.txt'
+      join('path', 'helloworld.txt'),
+      join('path', 'foobar.txt'),
+      join('anotherpath', 'foobar.txt')
     ])
   })
   test('should append file content', async (t) => {

package/test/runner.js

@@ -2,16 +2,16 @@
 
 const { tap, spec } = require('node:test/reporters')
 const { run } = require('node:test')
-const path = require('node:path')
+const { join } = require('node:path')
 const glob = require('glob').globSync
 
 /* eslint-disable new-cap */
 const reporter = process.stdout.isTTY ? new spec() : tap
 
 const files = [
-  ...glob(path.join(__dirname, '*.test.js')),
-  ...glob(path.join(__dirname, 'cli', '*.test.mjs'))
-]
+  ...glob('*.test.{js,mjs}', { cwd: __dirname }),
+  ...glob('*/*.test.{js,mjs}', { cwd: __dirname })
+].map(file => join(__dirname, file))
 
 const stream = run({
   files,