@platformatic/runtime 1.41.0 → 1.42.0

package/index.d.ts

@@ -17,6 +17,7 @@ declare module '@platformatic/runtime' {
   export function loadConfig(minimistConfig: object, args: object, store: object, overrides: object, replaceEnv: boolean): void
   export function compile(argv: string[], logger: BaseLogger): void
   export function platformaticRuntime(): Promise<void>
+  export function wrapConfigInRuntimeConfig(args: object): object
   export const Generator: RuntimeGenerator.RuntimeGenerator
 }
 

package/index.js

@@ -1,6 +1,6 @@
 'use strict'
 const { buildServer } = require('./lib/build-server')
-const { platformaticRuntime } = require('./lib/config')
+const { platformaticRuntime, wrapConfigInRuntimeConfig } = require('./lib/config')
 const { start, startCommand } = require('./lib/start')
 const RuntimeApi = require('./lib/api')
 const { compile } = require('./lib/compile')
@@ -10,6 +10,7 @@ const RuntimeGenerator = require('./lib/generator/runtime-generator')
 
 module.exports.buildServer = buildServer
 module.exports.platformaticRuntime = platformaticRuntime
+module.exports.wrapConfigInRuntimeConfig = wrapConfigInRuntimeConfig
 module.exports.schema = platformaticRuntime.schema
 module.exports.RuntimeApi = RuntimeApi
 module.exports.start = start

package/lib/build-server.js

@@ -36,7 +36,7 @@ async function buildServerRuntime (options = {}) {
     }
   }
 
-  return buildRuntime(options.configManager)
+  return buildRuntime(options.configManager, options.env)
 }
 
 async function buildServer (options) {

package/lib/errors.js

@@ -24,7 +24,6 @@ module.exports = {
   NodeInspectorFlagsNotSupportedError: createError(`${ERROR_PREFIX}_NODE_INSPECTOR_FLAGS_NOT_SUPPORTED`, 'The Node.js inspector flags are not supported. Please use \'platformatic start --inspect\' instead.'),
   FailedToUnlinkManagementApiSocket: createError(`${ERROR_PREFIX}_FAILED_TO_UNLINK_MANAGEMENT_API_SOCKET`, 'Failed to unlink management API socket "%s"'),
   LogFileNotFound: createError(`${ERROR_PREFIX}_LOG_FILE_NOT_FOUND`, 'Log file with index %s not found', 404),
-  CannotFindGeneratorForTemplateError: createError(`${ERROR_PREFIX}_CANNOT_FIND_GENERATOR_FOR_TEMPLATE`, 'Cannot find a generator for template "%s"'),
   WorkerIsRequired: createError(`${ERROR_PREFIX}_REQUIRED_WORKER`, 'The worker parameter is required'),
 
   // TODO: should remove next one as it's not used anymore

package/lib/generator/runtime-generator.js

@@ -8,13 +8,11 @@ const { envObjectToString } = require('@platformatic/generators/lib/utils')
 const { readFile, readdir, stat, rm } = require('node:fs/promises')
 const { ConfigManager } = require('@platformatic/config')
 const { platformaticRuntime } = require('../config')
-const ServiceGenerator = require('@platformatic/service/lib/generator/service-generator')
-const DBGenerator = require('@platformatic/db/lib/generator/db-generator')
-const ComposerGenerator = require('@platformatic/composer/lib/generator/composer-generator')
-const { CannotFindGeneratorForTemplateError } = require('../errors')
 const { getServiceTemplateFromSchemaUrl } = require('@platformatic/generators/lib/utils')
 const { DotEnvTool } = require('dotenv-tool')
 const { getArrayDifference } = require('../utils')
+const { createRequire } = require('node:module')
+const { pathToFileURL } = require('node:url')
 
 class RuntimeGenerator extends BaseGenerator {
   constructor (opts) {
@@ -299,17 +297,10 @@ class RuntimeGenerator extends BaseGenerator {
     }
   }
 
-  getGeneratorForTemplate (templateName) {
-    switch (templateName) {
-      case '@platformatic/service':
-        return ServiceGenerator
-      case '@platformatic/db':
-        return DBGenerator
-      case '@platformatic/composer':
-        return ComposerGenerator
-      default:
-        throw new CannotFindGeneratorForTemplateError(templateName)
-    }
+  async _getGeneratorForTemplate (dir, pkg) {
+    const _require = createRequire(dir)
+    const fileToImport = _require.resolve(pkg)
+    return (await import(pathToFileURL(fileToImport))).Generator
   }
 
   async loadFromDir () {
@@ -327,11 +318,13 @@ class RuntimeGenerator extends BaseGenerator {
       const dirStat = await stat(currentServicePath)
       if (dirStat.isDirectory()) {
         // load the package json file
-        const servicePkgJson = JSON.parse(await readFile(join(currentServicePath, 'platformatic.json'), 'utf-8'))
-        // get generator for this module
-        const template = getServiceTemplateFromSchemaUrl(servicePkgJson.$schema)
-        const Generator = this.getGeneratorForTemplate(template)
-        const instance = new Generator()
+        const servicePltJson = JSON.parse(await readFile(join(currentServicePath, 'platformatic.json'), 'utf-8'))
+        // get module to load
+        const template = servicePltJson.module || getServiceTemplateFromSchemaUrl(servicePltJson.$schema)
+        const Generator = await this._getGeneratorForTemplate(currentServicePath, template)
+        const instance = new Generator({
+          logger: this.logger
+        })
         this.addService(instance, s)
         output.services.push(await instance.loadFromDir(s, this.targetDirectory))
       }
@@ -387,8 +380,10 @@ class RuntimeGenerator extends BaseGenerator {
     // handle new services
     for (const newService of newConfig.services) {
       // create generator for the service
-      const ServiceGenerator = this.getGeneratorForTemplate(newService.template)
-      const serviceInstance = new ServiceGenerator()
+      const ServiceGenerator = await this._getGeneratorForTemplate(join(this.targetDirectory, 'package.json'), newService.template)
+      const serviceInstance = new ServiceGenerator({
+        logger: this.logger
+      })
       const baseConfig = {
         isRuntimeContext: true,
         targetDirectory: join(this.targetDirectory, 'services', newService.name),

package/lib/start.js

@@ -37,7 +37,8 @@ function startWorker ({ config, dirname, runtimeLogsDir }, env) {
   return worker
 }
 
-async function buildRuntime (configManager, env = process.env) {
+async function buildRuntime (configManager, env) {
+  env = env || process.env
   const config = configManager.current
 
   if (inspector.url()) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/runtime",
-  "version": "1.41.0",
+  "version": "1.42.0",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -34,8 +34,8 @@
     "typescript": "^5.4.2",
     "undici-oidc-interceptor": "^0.5.0",
     "why-is-node-running": "^2.2.2",
-    "@platformatic/sql-mapper": "1.41.0",
-    "@platformatic/sql-graphql": "1.41.0"
+    "@platformatic/sql-graphql": "1.42.0",
+    "@platformatic/sql-mapper": "1.42.0"
   },
   "dependencies": {
     "@fastify/error": "^3.4.1",
@@ -63,13 +63,13 @@
     "undici": "^6.9.0",
     "why-is-node-running": "^2.2.2",
     "ws": "^8.16.0",
-    "@platformatic/composer": "1.41.0",
-    "@platformatic/config": "1.41.0",
-    "@platformatic/db": "1.41.0",
-    "@platformatic/generators": "1.41.0",
-    "@platformatic/service": "1.41.0",
-    "@platformatic/telemetry": "1.41.0",
-    "@platformatic/utils": "1.41.0"
+    "@platformatic/composer": "1.42.0",
+    "@platformatic/db": "1.42.0",
+    "@platformatic/config": "1.42.0",
+    "@platformatic/service": "1.42.0",
+    "@platformatic/generators": "1.42.0",
+    "@platformatic/telemetry": "1.42.0",
+    "@platformatic/utils": "1.42.0"
   },
   "standard": {
     "ignore": [