@platformatic/generators 1.40.0 → 1.41.1

package/lib/base-generator.js

@@ -180,11 +180,13 @@ class BaseGenerator extends FileGenerator {
         const generatedConfigFile = JSON.parse(this.getFileObject('platformatic.json', '').contents)
         const fileFromDisk = await this.loadFile({ file: 'platformatic.json', path: '' })
         const currentConfigFile = JSON.parse(fileFromDisk.contents)
-        if (generatedConfigFile.plugins && generatedConfigFile.plugins.packages) {
-          currentConfigFile.plugins.packages = generatedConfigFile.plugins.packages
-        } else {
-          // remove packages because new configuration does not have them
-          currentConfigFile.plugins.packages = []
+        if (currentConfigFile.plugins) {
+          if (generatedConfigFile.plugins && generatedConfigFile.plugins.packages) {
+            currentConfigFile.plugins.packages = generatedConfigFile.plugins.packages
+          } else {
+            // remove packages because new configuration does not have them
+            currentConfigFile.plugins.packages = []
+          }
         }
         this.reset()
         this.addFile({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/generators",
-  "version": "1.40.0",
+  "version": "1.41.1",
   "description": "Main classes and utils for generators.",
   "main": "index.js",
   "keywords": [],
@@ -16,7 +16,7 @@
   },
   "devDependencies": {
     "@types/inquirer": "^9.0.7",
-    "borp": "^0.13.0",
+    "borp": "^0.14.0",
     "c8": "^9.1.0",
     "snazzy": "^9.0.0",
     "standard": "^17.1.0",

package/test/base-generator.test.js

@@ -375,7 +375,7 @@ test('should generate tsConfig file and typescript files', async (t) => {
   assert.ok(bg.getFileObject('example.test.ts', join('test', 'plugins')))
 })
 
-test('should throw if preapare fails', async (t) => {
+test('should throw if prepare fails', async (t) => {
   const bg = new BaseGenerator({
     module: '@platformatic/service'
   })
@@ -841,6 +841,44 @@ test('on update should just touch the packages configuration', async (t) => {
     '@fastify/foo-plugin': '1.42.0'
   })
 })
+
+test('on update should just touch the packages configuration', async (t) => {
+  mockNpmJsRequestForPkgs(['@fastify/foo-plugin'])
+  const runtimeDirectory = join(__dirname, 'fixtures', 'sample-runtime', 'services', 'no-plugin')
+  const dir = await moveToTmpdir(after)
+  await cp(runtimeDirectory, dir, { recursive: true })
+
+  const bg = new BaseGenerator({
+    module: '@platformatic/service',
+    targetDirectory: dir
+  })
+  bg.setConfig({
+    isUpdating: true
+  })
+  await bg.addPackage({
+    name: '@fastify/foo-plugin',
+    options: [
+      {
+        path: 'name',
+        type: 'string',
+        value: 'foobar',
+        name: 'FST_PLUGIN_FOO_FOOBAR'
+      }
+    ]
+  })
+  await bg.prepare()
+
+  assert.equal(bg.files.length, 1)
+  assert.equal(bg.files[0].file, 'platformatic.json')
+  assert.equal(bg.files[0].path, '')
+
+  const configFileContents = JSON.parse(bg.files[0].contents)
+  assert.equal(configFileContents.plugins, undefined)
+  assert.deepEqual(bg.config.dependencies, {
+    '@fastify/foo-plugin': '1.42.0'
+  })
+})
+
 describe('runtime context', () => {
   test('should set config.envPrefix correctly', async (t) => {
     const bg = new BaseGenerator({

package/test/fixtures/sample-runtime/services/no-plugin/platformatic.json

@@ -0,0 +1,7 @@
+{
+  "$schema": "https://platformatic.dev/schemas/v1.25.0/service",
+  "service": {
+    "openapi": true
+  },
+  "watch": true
+}