@platformatic/next 3.52.4 → 3.53.0

package/config.d.ts

@@ -514,6 +514,10 @@ export interface PlatformaticNextJsConfig {
             additionalProperties?: never;
             [k: string]: unknown;
           };
+      /**
+       * Enable the OpenTelemetry diagnostic logger. Diagnostic messages are forwarded to the Platformatic global logger using the current logger level.
+       */
+      diagLogger?: boolean;
     };
     verticalScaler?: {
       enabled?: boolean;

package/lib/loader-next-15.cjs

@@ -1,13 +1,91 @@
 const { resolve } = require('node:path')
 const { fileURLToPath } = require('node:url')
-const fsPromises = require('node:fs').promises
-const { transformSync } = require('amaro')
+const fs = require('node:fs')
+const fsPromises = fs.promises
+const generate = require('@babel/generator')
 const { parse } = require('@babel/parser')
 const traverse = require('@babel/traverse')
+const {
+  blockStatement,
+  functionDeclaration,
+  identifier,
+  restElement,
+  returnStatement,
+  variableDeclaration,
+  variableDeclarator
+} = require('@babel/types')
+const { transformSync } = require('amaro')
 
 const originalReadFile = fsPromises.readFile
+const originalReadFileSync = fs.readFileSync
 const targetFile = resolve(fileURLToPath(globalThis.platformatic.root), 'next.config.ts')
 
+const originalId = '__pltEnhanceNextConfig'
+
+function parseSingleExpression (expr) {
+  return parse(expr, { allowAwaitOutsideFunction: true }).program.body[0]
+}
+
+function createEvaluatorWrapperFunction (original) {
+  return functionDeclaration(
+    identifier(originalId),
+    [restElement(identifier('args'))],
+    blockStatement([
+      parseSingleExpression("const { enhanceNextConfig } = await import('@platformatic/next')"),
+      variableDeclaration('const', [variableDeclarator(identifier('original'), original)]),
+      parseSingleExpression('const enhanced = await enhanceNextConfig(original, ...args)'),
+      returnStatement(identifier('enhanced'))
+    ]),
+    false,
+    true
+  )
+}
+
+function transformCJS (source) {
+  const ast = parse(source.toString(), { sourceType: 'module' })
+
+  traverse.default(ast, {
+    AssignmentExpression (path) {
+      const { left, right } = path.node
+
+      if (left.object.name === 'module' && left.property.name === 'exports') {
+        path.node.right = createEvaluatorWrapperFunction(right)
+        path.skip()
+      }
+    }
+  })
+
+  return generate.default(ast).code
+}
+
+function transformESM (source) {
+  const ast = parse(source.toString(), { sourceType: 'module' })
+
+  traverse.default(ast, {
+    ExportDefaultDeclaration (path) {
+      const declaration = path.node.declaration
+
+      if (path.node.declaration.type === 'FunctionDeclaration') {
+        path.insertBefore(
+          functionDeclaration(
+            identifier(originalId + 'Function'),
+            declaration.params,
+            declaration.body,
+            declaration.generator,
+            declaration.async
+          )
+        )
+
+        path.node.declaration = createEvaluatorWrapperFunction(identifier(originalId + 'Function'))
+      } else {
+        path.node.declaration = createEvaluatorWrapperFunction(declaration)
+      }
+    }
+  })
+
+  return generate.default(ast).code
+}
+
 function detectFormat (code) {
   let format = 'esm'
 
@@ -29,29 +107,69 @@ function detectFormat (code) {
   return format
 }
 
-fsPromises.readFile = async function readAndPatchNextConfigTS (url, options) {
-  if (url.startsWith('file://')) {
-    url = fileURLToPath(url)
+function normalizePath (url) {
+  if (typeof url === 'string' && url.startsWith('file://')) {
+    return fileURLToPath(url)
   }
 
-  const contents = await originalReadFile(url, options)
+  return url
+}
 
-  if (url !== targetFile) {
-    return contents
-  }
+function restoreReadMethods () {
+  fsPromises.readFile = originalReadFile
+  fs.readFileSync = originalReadFileSync
+}
 
+async function patchNextConfigTS (contents) {
   let transformed = contents
 
   if (!globalThis.platformatic.config.next?.useExperimentalAdapter) {
     const { code } = transformSync(contents.toString('utf-8'), { mode: 'strip-only' })
-
-    const { transformESM, transformCJS } = await import('./loader.js')
     const transformer = detectFormat(code) === 'esm' ? transformESM : transformCJS
     transformed = transformer(code)
 
-    // Restore the original method
-    fsPromises.readFile = originalReadFile
+    restoreReadMethods()
   }
 
   return transformed
 }
+
+fsPromises.readFile = async function readAndPatchNextConfigTS (url, options) {
+  url = normalizePath(url)
+
+  const contents = await originalReadFile(url, options)
+
+  if (url !== targetFile) {
+    return contents
+  }
+
+  return patchNextConfigTS(contents)
+}
+
+// Next.js 16.2.3+ loads next.config.ts via next/dist/build/next-config-ts/transpile-config.js,
+// which reads it synchronously before transpiling it.
+fs.readFileSync = function readAndPatchNextConfigTSSync (url, options) {
+  url = normalizePath(url)
+
+  const contents = originalReadFileSync(url, options)
+
+  if (url !== targetFile) {
+    return contents
+  }
+
+  if (globalThis.platformatic.config.next?.useExperimentalAdapter) {
+    return contents
+  }
+
+  const { code } = transformSync(contents.toString('utf-8'), { mode: 'strip-only' })
+  const transformer = detectFormat(code) === 'esm' ? transformESM : transformCJS
+  const transformed = transformer(code)
+
+  restoreReadMethods()
+
+  if (typeof options === 'string' || options?.encoding) {
+    return transformed
+  }
+
+  return Buffer.from(transformed)
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/next",
-  "version": "3.52.4",
+  "version": "3.53.0",
   "description": "Platformatic Next.js Capability",
   "main": "index.js",
   "type": "module",
@@ -25,8 +25,8 @@
     "light-my-request": "^6.0.0",
     "msgpackr": "^1.11.2",
     "semver": "^7.6.3",
-    "@platformatic/foundation": "3.52.4",
-    "@platformatic/basic": "3.52.4"
+    "@platformatic/basic": "3.53.0",
+    "@platformatic/foundation": "3.53.0"
   },
   "devDependencies": {
     "@fastify/reply-from": "^12.0.0",
@@ -43,8 +43,8 @@
     "next": "^16.1.0",
     "typescript": "^5.5.4",
     "ws": "^8.18.0",
-    "@platformatic/gateway": "3.52.4",
-    "@platformatic/service": "3.52.4"
+    "@platformatic/gateway": "3.53.0",
+    "@platformatic/service": "3.53.0"
   },
   "engines": {
     "node": ">=22.19.0"

package/schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://schemas.platformatic.dev/@platformatic/next/3.52.4.json",
+  "$id": "https://schemas.platformatic.dev/@platformatic/next/3.53.0.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "Platformatic Next.js Config",
   "type": "object",
@@ -1916,6 +1916,10 @@
                   }
                 }
               ]
+            },
+            "diagLogger": {
+              "type": "boolean",
+              "description": "Enable the OpenTelemetry diagnostic logger. Diagnostic messages are forwarded to the Platformatic global logger using the current logger level."
             }
           },
           "required": [