@platformatic/service 0.26.1 → 0.27.0

package/lib/compile.js

@@ -28,16 +28,18 @@ async function getTSCExecutablePath (cwd) {
   }
 }
 
-async function setup (cwd, config) {
-  const logger = pino(
-    pretty({
-      translateTime: 'SYS:HH:MM:ss',
-      ignore: 'hostname,pid'
-    })
-  )
-
-  if (config?.server.logger) {
-    logger.level = config.server.logger.level
+async function setup (cwd, config, logger) {
+  if (!logger) {
+    logger = pino(
+      pretty({
+        translateTime: 'SYS:HH:MM:ss',
+        ignore: 'hostname,pid'
+      })
+    )
+
+    if (config?.server.logger) {
+      logger.level = config.server.logger.level
+    }
   }
 
   const { execa } = await import('execa')
@@ -60,8 +62,8 @@ async function setup (cwd, config) {
   return { execa, logger, tscExecutablePath }
 }
 
-async function compile (cwd, config) {
-  const { execa, logger, tscExecutablePath } = await setup(cwd, config)
+async function compile (cwd, config, originalLogger) {
+  const { execa, logger, tscExecutablePath } = await setup(cwd, config, originalLogger)
   /* c8 ignore next 3 */
   if (!tscExecutablePath) {
     return false
@@ -80,8 +82,8 @@ async function compile (cwd, config) {
 // This path is tested but C8 does not see it that way given it needs to work
 // through execa.
 /* c8 ignore next 20 */
-async function compileWatch (cwd, config) {
-  const { execa, logger, tscExecutablePath } = await setup(cwd, config)
+async function compileWatch (cwd, config, originalLogger) {
+  const { execa, logger, tscExecutablePath } = await setup(cwd, config, originalLogger)
   if (!tscExecutablePath) {
     return false
   }

package/lib/gen-schema.js

@@ -1,3 +1,4 @@
+'use strict'
 
 const { writeFile } = require('fs/promises')
 const { schema: platformaticServiceSchema } = require('./schema.js')

package/lib/plugins/openapi.js

@@ -37,6 +37,7 @@ async function setupOpenAPI (app, opts) {
   app.register(SwaggerUI, {
     ...theme,
     ...opts,
+    logLevel: 'warn',
     prefix: '/documentation'
   })
 }

package/lib/plugins/typescript.js

@@ -23,13 +23,13 @@ async function setupTsCompiler (app) {
     let tsCompilerWatcher = persistentRef.tsCompilerWatcher
     if (!tsCompilerWatcher) {
       /* c8 ignore next 5 */
-      const { child } = await compiler.compileWatch(workingDir, config)
+      const { child } = await compiler.compileWatch(workingDir, config, app.log)
       app.log.debug('start watching typescript files')
       tsCompilerWatcher = child
     }
     app.decorate('tsCompilerWatcher', tsCompilerWatcher)
   } else {
-    await compiler.compile(workingDir, config)
+    await compiler.compile(workingDir, config, app.log)
   }
 
   app.addHook('onClose', async () => {

package/lib/root-endpoint/public/index.html

@@ -94,8 +94,18 @@
       <img height="256" src="logo-512x512.png"/>
       <h1>Welcome to Platformatic Service</h1>
       <h2><a href="https://oss.platformatic.dev" target="_blank">Documentation</a></h2>
-      <h2><a href="/documentation" target="_blank">OpenAPI Documentation</a></h2>
-      <h2><a href="/graphiql" target="_blank">GraphiQL</a></h2>
+      <h2><a id="openapi-link" target="_blank">OpenAPI Documentation</a></h2>
+      <h2><a id="graphql-link" target="_blank">GraphiQL</a></h2>
     </div>
+
+    <script>
+      const currentPath = window.location.pathname
+    
+      const openApiLink = document.getElementById('openapi-link')
+      openApiLink.href = currentPath + 'documentation/static/index.html'
+
+      const graphqlLink = document.getElementById('graphql-link')
+      graphqlLink.href = currentPath + 'graphiql'
+    </script>
   </body>
 </html>

package/lib/start.js

@@ -136,10 +136,7 @@ async function start (appType, _args) {
   try {
     // Set the location of the config
     app = await buildServer({ ...config, configManager }, appType)
-
     await app.start()
-    // TODO: this log is used in the start command. Should be replaced
-    app.log.info({ url: app.url })
   } catch (err) {
     // TODO route this to a logger
     console.error(err)

package/lib/utils.js

@@ -39,6 +39,13 @@ function getJSPluginPath (workingDir, tsPluginPath, compileDir) {
     return tsPluginPath
   }
 
+  if (tsPluginPath.indexOf(compileDir) === 0) {
+    // In this case, we passed through this function before and we have adjusted
+    // the path of the plugin to point to the dist/ folder. Then we restarted.
+    // Therefore, we can just return the path as is.
+    return tsPluginPath
+  }
+
   const isTs = tsPluginPath.endsWith('ts')
   let newBaseName
 
@@ -55,6 +62,7 @@ function getJSPluginPath (workingDir, tsPluginPath, compileDir) {
     dirname(tsPluginRelativePath),
     newBaseName
   )
+
   return join(compileDir, jsPluginRelativePath)
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/service",
-  "version": "0.26.1",
+  "version": "0.27.0",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -20,30 +20,30 @@
     "@fastify/aws-lambda": "^3.2.0",
     "@matteo.collina/worker": "^3.1.0",
     "bindings": "^1.5.0",
-    "c8": "^7.13.0",
+    "c8": "^8.0.0",
     "self-cert": "^2.0.0",
     "snazzy": "^9.0.0",
     "split2": "^4.2.0",
-    "standard": "^17.0.0",
-    "strip-ansi": "^7.0.1",
-    "tap": "^16.3.4",
+    "standard": "^17.1.0",
+    "strip-ansi": "^7.1.0",
+    "tap": "^16.3.6",
     "tsd": "^0.28.1",
-    "typescript": "^5.0.4",
+    "typescript": "^5.1.3",
     "undici": "^5.22.1",
     "vscode-json-languageservice": "^5.3.5",
     "why-is-node-running": "^2.2.2",
-    "yaml": "^2.2.2"
+    "yaml": "^2.3.1"
   },
   "dependencies": {
-    "@fastify/accepts": "^4.1.0",
+    "@fastify/accepts": "^4.2.0",
     "@fastify/autoload": "^5.7.1",
     "@fastify/basic-auth": "^5.0.0",
-    "@fastify/cors": "^8.2.1",
+    "@fastify/cors": "^8.3.0",
     "@fastify/deepmerge": "^1.3.0",
     "@fastify/restartable": "^2.1.0",
-    "@fastify/static": "^6.10.1",
+    "@fastify/static": "^6.10.2",
     "@fastify/swagger": "^8.5.1",
-    "@fastify/swagger-ui": "^1.8.1",
+    "@fastify/swagger-ui": "^1.9.0",
     "@fastify/under-pressure": "^8.2.0",
     "@mercuriusjs/federation": "^2.0.0",
     "close-with-grace": "^1.2.0",
@@ -52,7 +52,7 @@
     "env-schema": "^5.2.0",
     "es-main": "^1.2.0",
     "execa": "^7.1.1",
-    "fastify": "^4.17.0",
+    "fastify": "^4.18.0",
     "fastify-metrics": "^10.3.0",
     "fastify-plugin": "^4.5.0",
     "fastify-sandbox": "^0.13.1",
@@ -64,10 +64,10 @@
     "pino-pretty": "^10.0.0",
     "rfdc": "^1.3.0",
     "ua-parser-js": "^1.0.35",
-    "@platformatic/client": "0.26.1",
-    "@platformatic/swagger-ui-theme": "0.26.1",
-    "@platformatic/config": "0.26.1",
-    "@platformatic/utils": "0.26.1"
+    "@platformatic/client": "0.27.0",
+    "@platformatic/config": "0.27.0",
+    "@platformatic/swagger-ui-theme": "0.27.0",
+    "@platformatic/utils": "0.27.0"
   },
   "standard": {
     "ignore": [

package/test/cli/helper.mjs

@@ -41,8 +41,9 @@ export async function start (commandOpts, exacaOpts = {}) {
 
   for await (const messages of on(output, 'data')) {
     for (const message of messages) {
-      const url = message.url
-      if (url !== undefined) {
+      const text = message.msg
+      if (text && text.includes('Server listening at')) {
+        const url = text.match(/Server listening at (.*)/)[1]
         clearTimeout(errorTimeout)
         return { child, url, output }
       }

package/test/fixtures/nested-directories/modules/inventory/routes/product.js

@@ -1,4 +1,3 @@
-
 export default async function (fastify, opts) {
   fastify.get('/product/:sku', {
     schema: {

package/test/utils.test.js

@@ -28,3 +28,10 @@ test('isFileAccessible no dir', async (t) => {
   const file = resolve(join(__dirname, '..', 'fixtures', 'hello', 'platformatic.service.json'))
   t.equal(await isFileAccessible(file), true)
 })
+
+test('should return the same plugin folder if it\'s already the compiled one', (t) => {
+  t.plan(1)
+
+  const result = getJSPluginPath('/something', '/something/dist/plugins', '/something/dist')
+  t.equal(result, '/something/dist/plugins')
+})