@platformatic/runtime 2.0.0-alpha.20 → 2.0.0-alpha.22

package/config.d.ts

@@ -5,7 +5,7 @@
  * and run json-schema-to-typescript to regenerate this file.
  */
 
-export type HttpsSchemasPlatformaticDevPlatformaticRuntime200Alpha20Json = {
+export type HttpsSchemasPlatformaticDevPlatformaticRuntime200Alpha22Json = {
   [k: string]: unknown;
 } & {
   $schema?: string;

package/fixtures/sample-runtime/package.json

@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "platformatic": "^1.25.0",
-    "@fastify/oauth2": "8.0.0"
+    "@fastify/oauth2": "8.0.1"
   },
   "engines": {
     "node": ">=20.16.0"

package/fixtures/sample-runtime-with-2-services/package.json

@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "platformatic": "^1.25.0",
-    "@fastify/oauth2": "8.0.0"
+    "@fastify/oauth2": "8.0.1"
   },
   "engines": {
     "node": ">=20.16.0"

package/lib/config.js

@@ -8,8 +8,9 @@ const ConfigManager = require('@platformatic/config')
 const errors = require('./errors')
 const { schema } = require('./schema')
 const upgrade = require('./upgrade')
+const { parseArgs } = require('node:util')
 
-async function _transformConfig (configManager) {
+async function _transformConfig (configManager, args) {
   const config = configManager.current
 
   let services
@@ -23,6 +24,19 @@ async function _transformConfig (configManager) {
     services = config.services ?? []
   }
 
+  const watchType = typeof config.watch
+  if (watchType === 'string') {
+    config.watch = config.watch === 'true'
+  } else if (watchType === 'undefined') {
+    const { values } = parseArgs({
+      args,
+      strict: false,
+      options: { production: { type: 'boolean', short: 'p', default: false } }
+    })
+
+    config.watch = !values.production
+  }
+
   if (config.autoload) {
     const { exclude = [], mappings = {} } = config.autoload
     let { path } = config.autoload
@@ -76,11 +90,14 @@ async function _transformConfig (configManager) {
       service.config = pathResolve(service.path, service.config)
     }
     service.entrypoint = service.id === config.entrypoint
-    service.watch = !!config.watch
     service.dependencies = []
     service.localServiceEnvVars = new Map()
     service.localUrl = `http://${service.id}.plt.local`
 
+    if (typeof service.watch === 'undefined') {
+      service.watch = config.watch
+    }
+
     if (service.entrypoint) {
       hasValidEntrypoint = true
     }
@@ -117,8 +134,8 @@ platformaticRuntime.configManagerConfig = {
     allErrors: true,
     strict: false
   },
-  async transformConfig () {
-    await _transformConfig(this)
+  async transformConfig (args) {
+    await _transformConfig(this, args)
   },
   upgrade
 }
@@ -157,8 +174,8 @@ async function wrapConfigInRuntimeConfig ({ configManager, args }) {
       allErrors: true,
       strict: false
     },
-    transformConfig () {
-      return _transformConfig(this)
+    transformConfig (args) {
+      return _transformConfig(this, args)
     }
   })
 

package/lib/generator/runtime-generator.js

@@ -162,7 +162,7 @@ class RuntimeGenerator extends BaseGenerator {
       entrypoint: this.entryPoint.name,
       watch: true,
       autoload: {
-        path: 'services',
+        path: this.config.autoload || 'services',
         exclude: ['docs'],
       },
       logger: {
@@ -254,7 +254,13 @@ class RuntimeGenerator extends BaseGenerator {
         // set default config
         service.setConfig()
       }
-      service.setTargetDirectory(join(this.targetDirectory, 'services', service.config.serviceName))
+      let basePath
+      if (this.existingConfig) {
+        basePath = this.existingConfig.autoload.path
+      } else {
+        basePath = join(this.targetDirectory, this.config.autoload || 'services')
+      }
+      service.setTargetDirectory(join(basePath, service.config.serviceName))
     })
   }
 

package/lib/runtime.js

@@ -147,7 +147,7 @@ class Runtime extends EventEmitter {
       this.startCollectingMetrics()
     }
 
-    this.logger.info(`Platformatic is now listening at ${this.#url}`)
+    this.#showUrl()
     return this.#url
   }
 
@@ -729,6 +729,10 @@ class Runtime extends EventEmitter {
     this.emit(status)
   }
 
+  #showUrl () {
+    this.logger.info(`Platformatic is now listening at ${this.#url}`)
+  }
+
   async #setupService (serviceConfig) {
     if (this.#status === 'stopping' || this.#status === 'closed') return
 
@@ -829,6 +833,10 @@ class Runtime extends EventEmitter {
         }
 
         this.logger?.info(`Service ${id} has been successfully reloaded ...`)
+
+        if (serviceConfig.entrypoint) {
+          this.#showUrl()
+        }
       } catch (e) {
         this.logger?.error(e)
       }

package/lib/start.js

@@ -114,7 +114,7 @@ async function setupAndStartRuntime (config) {
   return { address, runtime }
 }
 
-async function startCommand (args, throwAllErrors = false) {
+async function startCommand (args, throwAllErrors = false, returnRuntime = false) {
   try {
     const config = await loadConfig(
       {
@@ -138,7 +138,7 @@ async function startCommand (args, throwAllErrors = false) {
       await runtime.close()
     })
 
-    return res
+    return returnRuntime ? runtime : res
   } catch (err) {
     if (throwAllErrors) {
       throw err

package/lib/utils.js

@@ -7,7 +7,7 @@ const { join } = require('node:path')
 const {
   Store,
   loadConfig: pltConfigLoadConfig,
-  loadEmptyConfig: pltConfigLoadEmptyConfig,
+  loadEmptyConfig: pltConfigLoadEmptyConfig
 } = require('@platformatic/config')
 
 const { platformaticRuntime } = require('./config')
@@ -41,16 +41,16 @@ async function loadConfig (minimistConfig, args, overrides, replaceEnv = true) {
   const id = platformaticRuntime.schema.$id.replace('@platformatic/runtime', 'wattpm')
   const schema = {
     ...platformaticRuntime.schema,
-    $id: id,
+    $id: id
   }
   const configManagerConfig = {
     ...platformaticRuntime.configManagerConfig,
-    schema,
+    schema
   }
   const wattpm = {
     ...platformaticRuntime,
     schema,
-    configManagerConfig,
+    configManagerConfig
   }
   store.add(wattpm)
   store.add(platformaticBasic)
@@ -70,5 +70,5 @@ module.exports = {
   getRuntimeTmpDir,
   getServiceUrl,
   loadConfig,
-  loadEmptyConfig,
+  loadEmptyConfig
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/runtime",
-  "version": "2.0.0-alpha.20",
+  "version": "2.0.0-alpha.22",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -34,11 +34,11 @@
     "typescript": "^5.5.4",
     "undici-oidc-interceptor": "^0.5.0",
     "why-is-node-running": "^2.2.2",
-    "@platformatic/composer": "2.0.0-alpha.20",
-    "@platformatic/db": "2.0.0-alpha.20",
-    "@platformatic/sql-graphql": "2.0.0-alpha.20",
-    "@platformatic/service": "2.0.0-alpha.20",
-    "@platformatic/sql-mapper": "2.0.0-alpha.20"
+    "@platformatic/composer": "2.0.0-alpha.22",
+    "@platformatic/service": "2.0.0-alpha.22",
+    "@platformatic/sql-graphql": "2.0.0-alpha.22",
+    "@platformatic/sql-mapper": "2.0.0-alpha.22",
+    "@platformatic/db": "2.0.0-alpha.22"
   },
   "dependencies": {
     "@fastify/error": "^4.0.0",
@@ -68,13 +68,13 @@
     "undici": "^6.9.0",
     "undici-thread-interceptor": "^0.6.1",
     "ws": "^8.16.0",
-    "@platformatic/basic": "2.0.0-alpha.20",
-    "@platformatic/generators": "2.0.0-alpha.20",
-    "@platformatic/itc": "2.0.0-alpha.20",
-    "@platformatic/config": "2.0.0-alpha.20",
-    "@platformatic/telemetry": "2.0.0-alpha.20",
-    "@platformatic/ts-compiler": "2.0.0-alpha.20",
-    "@platformatic/utils": "2.0.0-alpha.20"
+    "@platformatic/basic": "2.0.0-alpha.22",
+    "@platformatic/generators": "2.0.0-alpha.22",
+    "@platformatic/config": "2.0.0-alpha.22",
+    "@platformatic/itc": "2.0.0-alpha.22",
+    "@platformatic/telemetry": "2.0.0-alpha.22",
+    "@platformatic/ts-compiler": "2.0.0-alpha.22",
+    "@platformatic/utils": "2.0.0-alpha.22"
   },
   "scripts": {
     "test": "npm run lint && borp --concurrency=1 --timeout=180000 && tsd",

package/schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://schemas.platformatic.dev/@platformatic/runtime/2.0.0-alpha.20.json",
+  "$id": "https://schemas.platformatic.dev/@platformatic/runtime/2.0.0-alpha.22.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {