@platformatic/service 0.15.1 → 0.16.0

package/index.js

@@ -97,9 +97,10 @@ async function platformaticService (app, opts, toLoad = []) {
 }
 
 async function loadPlugin (app, config, pluginOptions) {
-  /* c8 ignore next 4 */
+  /* c8 ignore next 5 */
   if (pluginOptions.typescript !== undefined) {
-    const pluginPath = getJSPluginPath(pluginOptions.path, pluginOptions.typescript.outDir)
+    const configPath = app.platformatic.configManager.fullPath
+    const pluginPath = getJSPluginPath(configPath, pluginOptions.path, pluginOptions.typescript.outDir)
     pluginOptions = { ...pluginOptions, path: pluginPath }
   }
 
@@ -107,8 +108,9 @@ async function loadPlugin (app, config, pluginOptions) {
 
   // if not defined, we defaults to true (which can happen only if config is set programmatically,
   // that's why we ignore the coverage of the `undefined` case, which cannot be covered in cli tests)
+  // all individual plugin hot reload settings will be overloaded by global hot reload
   /* c8 ignore next 35  */
-  const hotReload = pluginOptions.hotReload !== false
+  const hotReload = config.hotReload ?? pluginOptions.hotReload !== false
   const isWatchEnabled = config.watch !== false
   if (isWatchEnabled && hotReload) {
     let options = pluginOptions

package/lib/compile.js

@@ -53,7 +53,7 @@ async function execute (logger, args, config) {
   }
 }
 
-async function compileWatch () {
+async function compileWatch (cwd) {
   const { execa } = await import('execa')
   const logger = pino(
     pretty({
@@ -62,8 +62,6 @@ async function compileWatch () {
     })
   )
 
-  const cwd = process.cwd()
-
   const tscExecutablePath = await getTSCExecutablePath(cwd)
   /* c8 ignore next 4 */
   if (tscExecutablePath === undefined) {

package/lib/config.js

@@ -38,6 +38,12 @@ class ServiceConfigManager extends ConfigManager {
     } else if (this.current.plugin) {
       this.current.plugin = fixPluginPath(this.current.plugin)
     }
+
+    // TODO: handle arrays
+    if (this.current.plugin?.typescript) {
+      const typescript = this.current.plugin.typescript
+      typescript.outDir = this._fixRelativePath(typescript.outDir)
+    }
   }
 
   _fixRelativePath (path) {

package/lib/schema.js

@@ -249,6 +249,9 @@ const platformaticServiceSchema = {
       anyOf: [watch, {
         type: 'boolean'
       }]
+    },
+    hotReload: {
+      type: 'boolean'
     }
   },
   required: ['server']

package/lib/start.mjs

@@ -23,8 +23,9 @@ async function start (_args) {
     config.plugin?.typescript?.build !== false
   ) {
     try {
-      await compileWatch()
+      await compileWatch(dirname(configManager.fullPath))
     } catch (error) {
+      console.error(error)
       process.exit(1)
     }
   } else if (config.plugin?.typescript !== undefined && config.plugin?.typescript?.build === false) {

package/lib/utils.js

@@ -41,14 +41,13 @@ function addLoggerToTheConfig (config) {
 }
 /* c8 ignore stop */
 
-function getJSPluginPath (tsPluginPath, compileDir) {
-  const cwd = process.cwd()
-  const tsPluginRelativePath = relative(cwd, tsPluginPath)
+function getJSPluginPath (configPath, tsPluginPath, compileDir) {
+  const tsPluginRelativePath = relative(dirname(configPath), tsPluginPath)
   const jsPluginRelativePath = join(
     dirname(tsPluginRelativePath),
     basename(tsPluginRelativePath, '.ts') + '.js'
   )
-  return join(cwd, compileDir, jsPluginRelativePath)
+  return join(compileDir, jsPluginRelativePath)
 }
 
 module.exports = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/service",
-  "version": "0.15.1",
+  "version": "0.16.0",
   "description": "",
   "main": "index.js",
   "author": "Matteo Collina <hello@matteocollina.com>",
@@ -54,8 +54,8 @@
     "pino-pretty": "^9.1.1",
     "rfdc": "^1.3.0",
     "ua-parser-js": "^1.0.32",
-    "@platformatic/config": "0.15.1",
-    "@platformatic/utils": "0.15.1"
+    "@platformatic/config": "0.16.0",
+    "@platformatic/utils": "0.16.0"
   },
   "standard": {
     "ignore": [

package/test/cli/compile.test.mjs

@@ -211,3 +211,36 @@ t.test('start command should not compile typescript if `build` is false', async
     t.pass()
   }
 })
+
+t.test('should compile typescript plugin with start command with different cwd', async (t) => {
+  const testDir = path.join(urlDirname(import.meta.url), '..', 'fixtures', 'typescript-plugin')
+  const dest = path.join(urlDirname(import.meta.url), '..', 'tmp', 'typescript-plugin-clone-4')
+
+  await cp(testDir, dest, { recursive: true })
+
+  const child = execa('node', [cliPath, 'start', '-c', path.join(dest, 'platformatic.service.json')])
+
+  t.teardown(async () => {
+    if (os.platform() === 'win32') {
+      try {
+        await execa('taskkill', ['/pid', child.pid, '/f', '/t'])
+      } catch (err) {
+        console.error(`Failed to kill process ${child.pid})`)
+      }
+    } else {
+      child.kill('SIGINT')
+    }
+  })
+
+  const splitter = split()
+  child.stdout.pipe(splitter)
+
+  for await (const data of splitter) {
+    const sanitized = stripAnsi(data)
+    if (sanitized.includes('Typescript plugin loaded')) {
+      t.pass()
+      return
+    }
+  }
+  t.fail('should compile typescript plugin with start command')
+})

package/test/tmp/typescript-plugin-clone-4/dist/plugin.js

@@ -0,0 +1,18 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+function default_1(app) {
+    return __awaiter(this, void 0, void 0, function* () {
+        app.log.info('Typescript plugin loaded');
+    });
+}
+exports.default = default_1;
+//# sourceMappingURL=plugin.js.map

package/test/tmp/typescript-plugin-clone-4/dist/plugin.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../plugin.ts"],"names":[],"mappings":";;;;;;;;;;;AAEA,mBAA+B,GAAoB;;QACjD,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAA;IAC1C,CAAC;CAAA;AAFD,4BAEC"}

package/test/tmp/typescript-plugin-clone-4/tsconfig.json

@@ -0,0 +1,22 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "esModuleInterop": true,
+    "target": "es6",
+    "moduleResolution": "node",
+    "sourceMap": true,
+    "pretty": true,
+    "noEmitOnError": true,
+    "outDir": "dist"
+  },
+  "watchOptions": {
+    "watchFile": "fixedPollingInterval",
+    "watchDirectory": "fixedPollingInterval",
+    "fallbackPolling": "dynamicPriority",
+    "synchronousWatchDirectory": true,
+    "excludeDirectories": [
+      "**/node_modules",
+      "dist"
+    ]
+  }
+}

package/test/utils.test.js

@@ -7,8 +7,8 @@ const { join, resolve } = require('path')
 test('should get the path of a JS plugin', (t) => {
   t.plan(1)
 
-  const result = getJSPluginPath('plugin.ts', 'dist')
-  const expected = join(process.cwd(), 'dist', 'plugin.js')
+  const result = getJSPluginPath('/something/platformatic.service.json', '/something/plugin.ts', '/something/dist')
+  const expected = join('/something', 'dist', 'plugin.js')
   t.equal(result, expected)
 })