@platformatic/service 0.9.2 → 0.11.0

package/index.js

@@ -121,6 +121,7 @@ async function loadPlugin (app, config, pluginOptions) {
       if (plugin.__esModule === true) {
         plugin = plugin.default
       }
+      /* c8 ignore next 4 */
       await app.register(plugin, pluginOptions.options)
     }
   }

package/lib/compile.js

@@ -7,14 +7,11 @@ const loadConfig = require('./load-config.js')
 const { isFileAccessible } = require('./utils.js')
 
 async function getTSCExecutablePath (cwd) {
-  const { execa } = await import('execa')
-  const [npmBinLocalFolder, npmBinGlobalFolder] = await Promise.all([
-    execa('npm', ['bin'], { cwd }).then((result) => result.stdout),
-    execa('npm', ['bin', '-g'], { cwd }).then((result) => result.stdout)
-  ])
+  const typescriptPath = require.resolve('typescript')
+  const typescriptPathCWD = require.resolve('typescript', { paths: [process.cwd()] })
 
-  const tscLocalPath = join(npmBinLocalFolder, 'tsc')
-  const tscGlobalPath = join(npmBinGlobalFolder, 'tsc')
+  const tscLocalPath = join(typescriptPath, '..', '..', 'bin', 'tsc')
+  const tscGlobalPath = join(typescriptPathCWD, '..', '..', 'bin', 'tsc')
 
   const [tscLocalExists, tscGlobalExists] = await Promise.all([
     isFileAccessible(tscLocalPath),

package/lib/schema.js

@@ -168,8 +168,29 @@ const plugin = {
   required: ['path']
 }
 
+const pluginTypes = {
+  $id: 'https://schemas.platformatic.dev/service/pluginTypes',
+  $defs: {
+    plugin
+  },
+  anyOf: [{
+    type: 'array',
+    items: {
+      anyOf: [{
+        $ref: '#/$defs/plugin'
+      }, {
+        type: 'string'
+      }]
+    }
+  }, {
+    $ref: '#/$defs/plugin'
+  }, {
+    type: 'string'
+  }]
+}
+
 const metrics = {
-  $id: 'https://schemas.platformatic.dev/db/metrics',
+  $id: 'https://schemas.platformatic.dev/service/metrics',
   anyOf: [
     { type: 'boolean' },
     {
@@ -193,29 +214,11 @@ const metrics = {
 }
 
 const platformaticServiceSchema = {
-  $id: 'https://schemas.platformatic.dev/db',
+  $id: 'https://schemas.platformatic.dev/service',
   type: 'object',
-  $defs: {
-    plugin
-  },
   properties: {
     server,
-    plugin: {
-      anyOf: [{
-        type: 'array',
-        items: {
-          anyOf: [{
-            $ref: '#/$defs/plugin'
-          }, {
-            type: 'string'
-          }]
-        }
-      }, {
-        $ref: '#/$defs/plugin'
-      }, {
-        type: 'string'
-      }]
-    },
+    plugin: pluginTypes,
     metrics
   },
   additionalProperties: {
@@ -233,4 +236,5 @@ module.exports.metrics = metrics
 module.exports.cors = cors
 module.exports.server = server
 module.exports.plugin = plugin
+module.exports.pluginTypes = pluginTypes
 module.exports.watch = watch

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/service",
-  "version": "0.9.2",
+  "version": "0.11.0",
   "description": "",
   "main": "index.js",
   "author": "Matteo Collina <hello@matteocollina.com>",
@@ -35,8 +35,6 @@
     "@fastify/static": "^6.5.0",
     "@fastify/swagger": "^8.0.0",
     "@fastify/under-pressure": "^8.0.0",
-    "@platformatic/config": "0.9.2",
-    "@platformatic/utils": "0.9.2",
     "close-with-grace": "^1.1.0",
     "commist": "^3.1.2",
     "desm": "^1.2.0",
@@ -54,7 +52,9 @@
     "minimist": "^1.2.6",
     "pino": "^8.4.1",
     "pino-pretty": "^9.0.0",
-    "rfdc": "^1.3.0"
+    "rfdc": "^1.3.0",
+    "@platformatic/config": "0.11.0",
+    "@platformatic/utils": "0.11.0"
   },
   "standard": {
     "ignore": [