@platformatic/runtime 0.30.1 → 0.31.0

package/fixtures/typescript/services/movies/.env

@@ -0,0 +1,4 @@
+PLT_SERVER_HOSTNAME=127.0.0.1
+PORT=3001
+PLT_SERVER_LOGGER_LEVEL=info
+DATABASE_URL=sqlite://./db.sqlite

package/index.js

@@ -4,6 +4,7 @@ const { platformaticRuntime } = require('./lib/config')
 const { start } = require('./lib/start')
 const unifiedApi = require('./lib/unified-api')
 const RuntimeApi = require('./lib/api')
+const { compile } = require('./lib/compile')
 
 module.exports.buildServer = buildServer
 module.exports.platformaticRuntime = platformaticRuntime
@@ -11,3 +12,4 @@ module.exports.schema = platformaticRuntime.schema
 module.exports.RuntimeApi = RuntimeApi
 module.exports.start = start
 module.exports.unifiedApi = unifiedApi
+module.exports.compile = compile

package/lib/compile.js

@@ -1,41 +1,50 @@
 'use strict'
 
-const { loadConfig, tsCompiler } = require('@platformatic/service')
+const { tsCompiler } = require('@platformatic/service')
+const { loadConfig } = require('./unified-api')
+const { dirname } = require('node:path')
+
 const pino = require('pino')
 const pretty = require('pino-pretty')
 const { isatty } = require('node:tty')
 
-const { platformaticRuntime } = require('./config')
-
-async function compile (argv) {
-  const { configManager } = await loadConfig({}, argv, platformaticRuntime, {
+async function compile (argv, logger) {
+  const { configManager, configType } = await loadConfig({}, argv, undefined, {
     watch: false
   })
 
-  let stream
+  /* c8 ignore next */
+  if (!logger) {
+    let stream
 
-  /* c8 ignore next 6 */
-  if (isatty(process.stdout.fd)) {
-    stream = pretty({
-      translateTime: 'SYS:HH:MM:ss',
-      ignore: 'hostname,pid'
-    })
+    if (isatty(process.stdout.fd)) {
+      stream = pretty({
+        translateTime: 'SYS:HH:MM:ss',
+        ignore: 'hostname,pid'
+      })
+    }
+
+    logger = pino(stream)
   }
 
-  const logger = pino(stream)
+  let compiled = false
 
-  for (const service of configManager.current.services) {
-    const childLogger = logger.child({ name: service.id })
+  if (configType === 'runtime') {
+    for (const service of configManager.current.services) {
+      const childLogger = logger.child({ name: service.id })
 
-    const serviceConfig = await loadConfig({}, argv, platformaticRuntime, {
-      watch: false
-    })
+      const serviceConfig = await loadConfig({}, argv, undefined, {
+        watch: false
+      })
 
-    const compiled = await tsCompiler.compile(service.path, serviceConfig.config, childLogger)
-    if (!compiled) {
-      logger.trace('No typescript found, skipping compilation')
+      const serviceWasCompiled = await tsCompiler.compile(service.path, serviceConfig.config, childLogger)
+      compiled ||= serviceWasCompiled
     }
+  } else {
+    compiled = await tsCompiler.compile(dirname(configManager.fullPath), configManager.current, logger)
   }
+
+  return compiled
 }
 
 module.exports.compile = compile

package/lib/unified-api.js

@@ -135,7 +135,12 @@ async function _loadConfig (minimistConfig, args, configType, overrides) {
     configType = await getConfigType(args)
   }
 
-  return loadConfig(minimistConfig, args, getApp(configType), overrides)
+  const app = getApp(configType)
+  const res = await loadConfig(minimistConfig, args, app, overrides)
+  res.configType = configType
+  res.app = app
+
+  return res
 }
 
 async function _start (args) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/runtime",
-  "version": "0.30.1",
+  "version": "0.31.0",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -24,8 +24,8 @@
     "standard": "^17.1.0",
     "tsd": "^0.28.1",
     "typescript": "^5.1.6",
-    "@platformatic/sql-mapper": "0.30.1",
-    "@platformatic/sql-graphql": "0.30.1"
+    "@platformatic/sql-mapper": "0.31.0",
+    "@platformatic/sql-graphql": "0.31.0"
   },
   "dependencies": {
     "@hapi/topo": "^6.0.2",
@@ -40,11 +40,11 @@
     "pino": "^8.14.1",
     "pino-pretty": "^10.0.0",
     "undici": "^5.22.1",
-    "@platformatic/composer": "0.30.1",
-    "@platformatic/config": "0.30.1",
-    "@platformatic/db": "0.30.1",
-    "@platformatic/service": "0.30.1",
-    "@platformatic/utils": "0.30.1"
+    "@platformatic/composer": "0.31.0",
+    "@platformatic/config": "0.31.0",
+    "@platformatic/db": "0.31.0",
+    "@platformatic/service": "0.31.0",
+    "@platformatic/utils": "0.31.0"
   },
   "standard": {
     "ignore": [

package/runtime.mjs

@@ -7,7 +7,9 @@ import isMain from 'es-main'
 import helpMe from 'help-me'
 import parseArgs from 'minimist'
 import { start } from './lib/start.js'
-import { compile } from './lib/compile.js'
+import { compile as compileCmd } from './lib/compile.js'
+
+export const compile = compileCmd
 
 const help = helpMe({
   dir: join(import.meta.url, 'help'),

package/test/cli/compile.test.mjs

@@ -14,20 +14,8 @@ try {
 } catch {
 }
 
-test('compile without tsconfigs', async () => {
-  const config = join(import.meta.url, '..', '..', 'fixtures', 'configs', 'monorepo.json')
-  await execa(cliPath, ['compile', '-c', config])
-})
-
-test('compile with tsconfig', async (t) => {
-  const tmpDir = await mkdtemp(path.join(base, 'test-runtime-compile-'))
-  const prev = process.cwd()
-  process.chdir(tmpDir)
-  t.after(() => {
-    process.chdir(prev)
-  })
-
-  t.after(async () => {
+function delDir (tmpDir) {
+  return async function () {
     // We give up after 10s.
     // This is because on Windows, it's very hard to delete files if the file
     // system is not collaborating.
@@ -42,8 +30,24 @@ test('compile with tsconfig', async (t) => {
         }
       }
     }
+  }
+}
+
+test('compile without tsconfigs', async () => {
+  const config = join(import.meta.url, '..', '..', 'fixtures', 'configs', 'monorepo.json')
+  await execa(cliPath, ['compile', '-c', config])
+})
+
+test('compile with tsconfig', async (t) => {
+  const tmpDir = await mkdtemp(path.join(base, 'test-runtime-compile-'))
+  const prev = process.cwd()
+  process.chdir(tmpDir)
+  t.after(() => {
+    process.chdir(prev)
   })
 
+  t.after(delDir(tmpDir))
+
   const folder = join(import.meta.url, '..', '..', 'fixtures', 'typescript')
   await cp(folder, tmpDir, { recursive: true })
 
@@ -72,22 +76,7 @@ test('compile with tsconfig custom flags', async (t) => {
     process.chdir(prev)
   })
 
-  t.after(async () => {
-    // We give up after 10s.
-    // This is because on Windows, it's very hard to delete files if the file
-    // system is not collaborating.
-    for (let i = 0; i < 10; i++) {
-      try {
-        await rm(tmpDir, { recursive: true, force: true })
-        break
-      } catch (err) {
-        if (err.code === 'EBUSY') {
-          await sleep(1000)
-          continue
-        }
-      }
-    }
-  })
+  t.after(delDir(tmpDir))
 
   const folder = join(import.meta.url, '..', '..', 'fixtures', 'typescript-custom-flags')
   await cp(folder, tmpDir, { recursive: true })
@@ -108,3 +97,28 @@ test('compile with tsconfig custom flags', async (t) => {
     assert.deepStrictEqual(lines[i].msg, expected[i].msg)
   }
 })
+
+test('compile single service', async (t) => {
+  const tmpDir = await mkdtemp(path.join(base, 'test-runtime-compile-'))
+  const prev = process.cwd()
+  process.chdir(tmpDir)
+  t.after(() => {
+    process.chdir(prev)
+  })
+
+  t.after(delDir(tmpDir))
+
+  const folder = join(import.meta.url, '..', '..', 'fixtures', 'typescript', 'services', 'movies')
+  await cp(folder, tmpDir, { recursive: true })
+
+  const { stdout } = await execa(cliPath, ['compile'])
+
+  const lines = stdout.split('\n').map(JSON.parse)
+  const expected = [{
+    msg: 'Typescript compilation completed successfully.'
+  }]
+
+  for (let i = 0; i < expected.length; i++) {
+    assert.deepStrictEqual(lines[i].msg, expected[i].msg)
+  }
+})