@platformatic/basic 2.0.0-alpha.15 → 2.0.0-alpha.17

package/index.js

@@ -7,13 +7,16 @@ import pino from 'pino'
 import { packageJson, schema } from './lib/schema.js'
 import { importFile } from './lib/utils.js'
 
+const importStackablePackageMarker = '__pltImportStackablePackage.js'
+
 function isImportFailedError (error, pkg) {
-  if (error.code !== 'ERR_MODULE_NOT_FOUND') {
+  if (error.code !== 'ERR_MODULE_NOT_FOUND' && error.code !== 'MODULE_NOT_FOUND') {
     return false
   }
 
   const match = error.message.match(/Cannot find package '(.+)' imported from (.+)/)
-  return match?.[1] === pkg
+
+  return match?.[1] === pkg || error.requireStack?.[0].endsWith(importStackablePackageMarker)
 }
 
 async function importStackablePackage (opts, pkg, autodetectDescription) {
@@ -27,7 +30,7 @@ async function importStackablePackage (opts, pkg, autodetectDescription) {
       }
 
       // Scope to the service
-      const require = createRequire(resolve(opts.context.directory, 'index.js'))
+      const require = createRequire(resolve(opts.context.directory, importStackablePackageMarker))
       const imported = require.resolve(pkg)
       return await importFile(imported)
     }
@@ -38,10 +41,10 @@ async function importStackablePackage (opts, pkg, autodetectDescription) {
 
     const rootFolder = relative(process.cwd(), workerData.dirname)
 
-    let errorMessage = `Unable to import package, "${pkg}". Please add it as a dependency `
+    let errorMessage = `Unable to import package '${pkg}'. Please add it as a dependency `
 
     if (rootFolder) {
-      errorMessage += `in the package.json file in the folder ${rootFolder}.`
+      errorMessage += `in the package.json file in the folder ${relative(rootFolder, opts.context.directory)}.`
     } else {
       errorMessage += 'in the root package.json file.'
     }

package/lib/base.js

@@ -1,4 +1,4 @@
-import deepmerge from '@fastify/deepmerge'
+import { deepmerge } from '@platformatic/utils'
 import { parseCommandString } from 'execa'
 import { spawn } from 'node:child_process'
 import { once } from 'node:events'
@@ -11,8 +11,6 @@ import { NonZeroExitCode } from './errors.js'
 import { cleanBasePath } from './utils.js'
 import { ChildManager } from './worker/child-manager.js'
 
-const merge = deepmerge()
-
 export class BaseStackable {
   #childManager
   #subprocess
@@ -25,7 +23,7 @@ export class BaseStackable {
     this.options = options
     this.root = root
     this.configManager = configManager
-    this.serverConfig = merge(options.context.serverConfig, configManager.current.server)
+    this.serverConfig = deepmerge(options.context.serverConfig ?? {}, configManager.current.server ?? {})
     this.openapiSchema = null
     this.getGraphqlSchema = null
     this.isEntrypoint = options.context.isEntrypoint
@@ -57,6 +55,10 @@ export class BaseStackable {
     return this.configManager.current
   }
 
+  async getEnv () {
+    return this.configManager.env
+  }
+
   async getWatchConfig () {
     const config = this.configManager.current
 

package/lib/worker/child-manager.js

@@ -1,5 +1,5 @@
 import { ITC, generateNotification } from '@platformatic/itc'
-import { createDirectory, errors } from '@platformatic/utils'
+import { createDirectory, ensureLoggableError } from '@platformatic/utils'
 import { once } from 'node:events'
 import { rm, writeFile } from 'node:fs/promises'
 import { createServer } from 'node:http'
@@ -213,7 +213,7 @@ export class ChildManager extends ITC {
   }
 
   #handleUnexpectedError (error, message, exitCode) {
-    this.#logger.error({ err: errors.ensureLoggableError(error) }, message)
+    this.#logger.error({ err: ensureLoggableError(error) }, message)
     process.exit(exitCode)
   }
 }

package/lib/worker/child-process.js

@@ -1,5 +1,5 @@
 import { ITC } from '@platformatic/itc'
-import { createPinoWritable, errors } from '@platformatic/utils'
+import { createPinoWritable, ensureLoggableError } from '@platformatic/utils'
 import { tracingChannel } from 'node:diagnostics_channel'
 import { once } from 'node:events'
 import { readFile } from 'node:fs/promises'
@@ -115,7 +115,7 @@ export class ChildProcess extends ITC {
       try {
         this.#listener(JSON.parse(message))
       } catch (error) {
-        this.#logger.error({ err: errors.ensureLoggableError(error) }, 'Handling a message failed.')
+        this.#logger.error({ err: ensureLoggableError(error) }, 'Handling a message failed.')
         process.exit(exitCodes.PROCESS_MESSAGE_HANDLING_FAILED)
       }
     })
@@ -158,7 +158,7 @@ export class ChildProcess extends ITC {
       })
 
       Reflect.defineProperty(process, 'stdout', { value: createPinoWritable(this.#logger, 'info') })
-      Reflect.defineProperty(process, 'stderr', { value: createPinoWritable(this.#logger, 'error') })
+      Reflect.defineProperty(process, 'stderr', { value: createPinoWritable(this.#logger, 'error', true) })
     } else {
       this.#logger = pino({ level: 'info', name: globalThis.platformatic.id })
     }
@@ -196,9 +196,8 @@ export class ChildProcess extends ITC {
 
   #setupHandlers () {
     function handleUnhandled (type, err) {
-      process._rawDebug(globalThis.platformatic.id, err)
       this.#logger.error(
-        { err: errors.ensureLoggableError(err) },
+        { err: ensureLoggableError(err) },
         `Child process for service ${globalThis.platformatic.id} threw an ${type}.`
       )
 

package/lib/worker/child-transport.js

@@ -1,5 +1,5 @@
 import { generateRequest } from '@platformatic/itc'
-import { errors } from '@platformatic/utils'
+import { ensureLoggableError } from '@platformatic/utils'
 import { once } from 'node:events'
 import { platform } from 'node:os'
 import { workerData } from 'node:worker_threads'
@@ -9,7 +9,7 @@ import { getSocketPath } from './child-manager.js'
 
 function logDirectError (message, error) {
   process._rawDebug(`Logger thread for child process of service ${workerData.id} ${message}.`, {
-    error: errors.ensureLoggableError(error)
+    error: ensureLoggableError(error)
   })
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/basic",
-  "version": "2.0.0-alpha.15",
+  "version": "2.0.0-alpha.17",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -16,7 +16,6 @@
   "homepage": "https://github.com/platformatic/platformatic#readme",
   "dependencies": {
     "@fastify/error": "^4.0.0",
-    "@fastify/deepmerge": "^2.0.0",
     "execa": "^9.3.1",
     "pino": "^9.3.2",
     "pino-abstract-transport": "^2.0.0",
@@ -24,9 +23,9 @@
     "split2": "^4.2.0",
     "undici": "^6.19.5",
     "ws": "^8.18.0",
-    "@platformatic/config": "2.0.0-alpha.15",
-    "@platformatic/itc": "2.0.0-alpha.15",
-    "@platformatic/utils": "2.0.0-alpha.15"
+    "@platformatic/config": "2.0.0-alpha.17",
+    "@platformatic/itc": "2.0.0-alpha.17",
+    "@platformatic/utils": "2.0.0-alpha.17"
   },
   "devDependencies": {
     "borp": "^0.17.0",
@@ -40,8 +39,8 @@
     "react-dom": "^18.3.1",
     "typescript": "^5.5.4",
     "vite": "^5.4.0",
-    "@platformatic/composer": "2.0.0-alpha.15",
-    "@platformatic/service": "2.0.0-alpha.15"
+    "@platformatic/composer": "2.0.0-alpha.17",
+    "@platformatic/service": "2.0.0-alpha.17"
   },
   "scripts": {
     "gen-schema": "node lib/schema.js > schema.json",

package/schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://schemas.platformatic.dev/@platformatic/basic/2.0.0-alpha.15.json",
+  "$id": "https://schemas.platformatic.dev/@platformatic/basic/2.0.0-alpha.17.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "Platformatic Stackable",
   "type": "object",