@platformatic/node 2.58.0 → 2.59.1

package/index.js

@@ -17,6 +17,7 @@ import { readFile } from 'node:fs/promises'
 import { Server } from 'node:http'
 import { resolve as pathResolve, resolve } from 'node:path'
 import { packageJson, schema } from './lib/schema.js'
+import { getTsconfig, ignoreDirs, isServiceBuildable } from './lib/utils.js'
 
 const validFields = [
   'main',
@@ -70,6 +71,17 @@ export class NodeStackable extends BaseStackable {
     }
 
     const config = this.configManager.current
+
+    if (!this.isProduction && await isServiceBuildable(this.root, config)) {
+      this.logger.info(`Building "${this.serviceId}" before starting, in dev`)
+      try {
+        await this.build()
+        this.childManager = null
+      } catch (e) {
+        this.logger.error(`Error building "${this.serviceId}" before starting, in dev: ${e.message}`)
+      }
+    }
+
     const command = config.application.commands[this.isProduction ? 'production' : 'development']
 
     if (command) {
@@ -288,7 +300,6 @@ export class NodeStackable extends BaseStackable {
 
   async _findEntrypoint () {
     const config = this.configManager.current
-    const outputRoot = resolve(this.root, config.application.outputDirectory)
 
     if (config.node.main) {
       return pathResolve(this.root, config.node.main)
@@ -312,19 +323,7 @@ export class NodeStackable extends BaseStackable {
       }
     }
 
-    let root = this.root
-
-    if (this.isProduction) {
-      const hasCommand = this.configManager.current.application.commands.build
-      const hasBuildScript = await this.#hasBuildScript()
-
-      if (hasCommand || hasBuildScript) {
-        this.verifyOutputDirectory(outputRoot)
-        root = outputRoot
-      }
-    }
-
-    return pathResolve(root, entrypoint)
+    return pathResolve(this.root, entrypoint)
   }
 
   async #hasBuildScript () {
@@ -339,6 +338,32 @@ export class NodeStackable extends BaseStackable {
 
     return hasBuildScript
   }
+
+  async getWatchConfig () {
+    const config = this.configManager.current
+
+    const enabled = config.watch?.enabled !== false
+
+    if (!enabled) {
+      return { enabled, path: this.root }
+    }
+
+    // ignore the outDir from tsconfig or service config if any
+    let ignore = config.watch?.ignore
+    if (!ignore) {
+      const tsConfig = await getTsconfig(this.root, config)
+      if (tsConfig) {
+        ignore = ignoreDirs(tsConfig?.compilerOptions?.outDir, tsConfig?.watchOptions?.excludeDirectories)
+      }
+    }
+
+    return {
+      enabled,
+      path: this.root,
+      allow: config.watch?.allow,
+      ignore
+    }
+  }
 }
 
 async function getEntrypointInformation (root) {

package/lib/utils.js

@@ -0,0 +1,68 @@
+import path, { join } from 'node:path'
+import { readFile } from 'node:fs/promises'
+import json5 from 'json5'
+
+export async function isServiceBuildable (serviceRoot, config) {
+  // skip vite as stackable as it has its own build command
+  if (config?.vite) {
+    return false
+  }
+
+  if (config?.application?.commands?.build) {
+    return true
+  }
+
+  // Check if package.json exists and has a build command
+  const packageJsonPath = join(serviceRoot, 'package.json')
+
+  try {
+    // File exists, try to read and parse it
+    try {
+      const content = await readFile(packageJsonPath, 'utf8')
+      const packageJson = JSON.parse(content)
+      if (packageJson.scripts && packageJson.scripts.build) {
+        return true
+      }
+    } catch {
+      // Invalid JSON or other read error
+    }
+  } catch {
+    // package.json doesn't exist
+  }
+
+  return false
+}
+
+export async function getTsconfig (root, config) {
+  try {
+    const tsConfigPath = config?.plugins?.typescript?.tsConfig || path.resolve(root, 'tsconfig.json')
+    const tsConfig = json5.parse(await readFile(tsConfigPath, 'utf8'))
+
+    return Object.assign(tsConfig.compilerOptions, config?.plugins?.typescript)
+  } catch {
+    return null
+  }
+}
+
+export function ignoreDirs (outDir, watchOptionsExcludeDirectories) {
+  const ignore = new Set()
+
+  if (watchOptionsExcludeDirectories) {
+    for (const dir of watchOptionsExcludeDirectories) {
+      ignore.add(dir)
+    }
+  }
+
+  if (outDir) {
+    ignore.add(outDir)
+    if (!outDir.endsWith('/**')) {
+      ignore.add(`${outDir}/**`)
+    }
+  }
+
+  if (ignore.size === 0) {
+    return ['dist', 'dist/**']
+  }
+
+  return Array.from(ignore)
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/node",
-  "version": "2.58.0",
+  "version": "2.59.1",
   "description": "Platformatic Node.js Stackable",
   "main": "index.js",
   "type": "module",
@@ -15,27 +15,28 @@
   },
   "homepage": "https://github.com/platformatic/platformatic#readme",
   "dependencies": {
+    "json5": "^2.2.3",
     "light-my-request": "^6.0.0",
-    "@platformatic/config": "2.58.0",
-    "@platformatic/utils": "2.58.0",
-    "@platformatic/basic": "2.58.0"
+    "@platformatic/basic": "2.59.1",
+    "@platformatic/config": "2.59.1",
+    "@platformatic/utils": "2.59.1"
   },
   "devDependencies": {
     "borp": "^0.19.0",
-    "express": "^4.19.2",
     "eslint": "9",
+    "express": "^4.19.2",
     "fastify": "^5.0.0",
     "json-schema-to-typescript": "^15.0.1",
     "koa": "^2.15.3",
     "neostandard": "^0.12.0",
     "tsx": "^4.19.0",
     "typescript": "^5.5.4",
-    "@platformatic/composer": "2.58.0",
-    "@platformatic/service": "2.58.0"
+    "@platformatic/service": "2.59.1",
+    "@platformatic/composer": "2.59.1"
   },
   "scripts": {
-    "test": "npm run lint && borp --concurrency=1 --no-timeout",
-    "coverage": "npm run lint && borp -C -X test -X test/fixtures --concurrency=1 --no-timeout",
+    "test": "pnpm run lint && borp --concurrency=1 --no-timeout",
+    "coverage": "pnpm run lint && borp -C -X test -X test/fixtures --concurrency=1 --no-timeout",
     "gen-schema": "node lib/schema.js > schema.json",
     "gen-types": "json2ts > config.d.ts < schema.json",
     "build": "pnpm run gen-schema && pnpm run gen-types",

package/schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://schemas.platformatic.dev/@platformatic/node/2.58.0.json",
+  "$id": "https://schemas.platformatic.dev/@platformatic/node/2.59.1.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "Platformatic Node.js Stackable",
   "type": "object",