@platformatic/service 3.4.1 → 3.5.0

package/lib/upgrade.js

@@ -1,15 +1,13 @@
-'use strict'
-
-const { join } = require('path')
-
-module.exports = async function upgrade (config, version) {
-  const { semgrator } = await import('semgrator')
+import { abstractLogger } from '@platformatic/foundation'
+import { resolve } from 'node:path'
+import { semgrator } from 'semgrator'
 
+export async function upgrade (logger, config, version) {
   const iterator = semgrator({
     version,
-    path: join(__dirname, 'versions'),
+    path: resolve(import.meta.dirname, 'versions'),
     input: config,
-    logger: this.logger.child({ name: '@platformatic/service' }),
+    logger: logger?.child({ name: '@platformatic/service' }) ?? abstractLogger
   })
 
   let result

package/lib/utils.js

@@ -1,80 +1,9 @@
-'use strict'
+import { access, readFile, stat } from 'node:fs/promises'
+import { resolve } from 'node:path'
 
-const { access, readFile, stat } = require('node:fs/promises')
-const { resolve, join, relative, dirname, basename } = require('node:path')
-const { isatty } = require('tty')
+let _isDocker
 
-async function isFileAccessible (filename, directory) {
-  try {
-    const filePath = directory ? resolve(directory, filename) : filename
-    await access(filePath)
-    return true
-  } catch (err) {
-    return false
-  }
-}
-
-/* c8 ignore start */
-function addLoggerToTheConfig (config) {
-  // We might have a config with no server
-  if (!config.server) {
-    config.server = {}
-  }
-  // Set the logger if not present
-  if (!config.server.loggerInstance) {
-    let logger = config.server.logger
-    if (!logger) {
-      config.server.logger = { level: 'info' }
-      logger = config.server.logger
-    }
-
-    // If TTY use pino-pretty
-    if (isatty(1)) {
-      if (!logger.transport) {
-        logger.transport = {
-          target: 'pino-pretty',
-        }
-      }
-    }
-  }
-}
-/* c8 ignore stop */
-
-function getJSPluginPath (workingDir, tsPluginPath, compileDir) {
-  if (tsPluginPath.endsWith('js')) {
-    return tsPluginPath
-  }
-
-  if (tsPluginPath.indexOf(compileDir) === 0) {
-    // In this case, we passed through this function before and we have adjusted
-    // the path of the plugin to point to the dist/ folder. Then we restarted.
-    // Therefore, we can just return the path as is.
-    return tsPluginPath
-  }
-
-  const isTs = tsPluginPath.endsWith('ts')
-  let newBaseName
-
-  // TODO: investigate why c8 does not see those
-  /* c8 ignore next 5 */
-  if (isTs) {
-    newBaseName = basename(tsPluginPath, '.ts') + '.js'
-  } else {
-    newBaseName = basename(tsPluginPath)
-  }
-
-  const tsPluginRelativePath = relative(workingDir, tsPluginPath)
-  const jsPluginRelativePath = join(
-    dirname(tsPluginRelativePath),
-    newBaseName
-  )
-
-  return join(compileDir, jsPluginRelativePath)
-}
-
-let isDockerCached
-
-async function isDocker () {
+export async function isDocker () {
   async function hasDockerEnv () {
     try {
       await stat('/.dockerenv')
@@ -92,16 +21,34 @@ async function isDocker () {
     }
   }
 
-  if (isDockerCached === undefined) {
-    isDockerCached = await hasDockerEnv() || await hasDockerCGroup()
+  if (_isDocker === undefined) {
+    _isDocker = (await hasDockerEnv()) || (await hasDockerCGroup())
   }
 
-  return isDockerCached
+  return _isDocker
+}
+
+export async function isFileAccessible (filename, directory) {
+  try {
+    const filePath = directory ? resolve(directory, filename) : filename
+    await access(filePath)
+    return true
+  } catch (err) {
+    return false
+  }
 }
 
-module.exports = {
-  isDocker,
-  isFileAccessible,
-  getJSPluginPath,
-  addLoggerToTheConfig,
+export async function sanitizeHTTPSArgument (arg) {
+  if (typeof arg === 'string') {
+    return arg
+  } else if (!Array.isArray(arg)) {
+    return readFile(arg.path)
+  }
+
+  const sanitized = []
+  for (const item of arg) {
+    sanitized.push(typeof item === 'string' ? item : await readFile(item.path))
+  }
+
+  return sanitized
 }

package/lib/versions/0.16.0.js

@@ -1,9 +1,6 @@
-'use strict'
-
-module.exports = {
+export default {
   version: '0.16.0',
-  toVersion: '0.17.0',
-  up: function (config) {
+  up (config) {
     let kind = 'service'
     // This file will be reused in platformatic/db
     if (config.core) {
@@ -13,18 +10,18 @@ module.exports = {
     if (config.plugin) {
       if (Array.isArray(config.plugin)) {
         config.plugins = {
-          paths: config.plugin.map((p) => {
+          paths: config.plugin.map(p => {
             if (typeof p === 'string') {
               return p
             } else if (p.options) {
               return {
                 path: p.path,
-                options: p.options,
+                options: p.options
               }
             } else {
               return p.path
             }
-          }),
+          })
         }
 
         if (typeof config.plugin[0] === 'object') {
@@ -41,14 +38,16 @@ module.exports = {
       } else if (typeof config.plugin === 'object') {
         if (config.plugin.options) {
           config.plugins = {
-            paths: [{
-              path: config.plugin.path,
-              options: config.plugin.options,
-            }],
+            paths: [
+              {
+                path: config.plugin.path,
+                options: config.plugin.options
+              }
+            ]
           }
         } else {
           config.plugins = {
-            paths: [config.plugin.path],
+            paths: [config.plugin.path]
           }
         }
 
@@ -66,7 +65,7 @@ module.exports = {
         }
       } else {
         config.plugins = {
-          paths: [config.plugin],
+          paths: [config.plugin]
         }
       }
 
@@ -78,5 +77,5 @@ module.exports = {
     config.$schema = 'https://platformatic.dev/schemas/v0.17.0/' + kind
 
     return config
-  },
+  }
 }

package/lib/versions/{from-zero-twenty-eight-to-will-see.js → 0.28.0.js}

@@ -1,14 +1,11 @@
-'use strict'
-
-module.exports.migration = {
+export default {
   version: '0.28.0',
-  toVersion: '1.99.0',
-  up: function (config) {
+  up (config) {
     if (config.watch !== false) {
       config.watch = typeof config.watch === 'object' ? config.watch : true
     }
     delete config.plugins?.watch
 
     return config
-  },
+  }
 }

package/lib/versions/2.0.0.js

@@ -1,11 +1,8 @@
-'use strict'
+import { version } from '../schema.js'
 
-const { version } = require('../../package.json')
-
-module.exports.migration = {
+export default {
   version: '2.0.0',
-  toVersion: version,
-  up: function (config) {
+  up (config) {
     if (typeof config.allowCycles === 'boolean') {
       delete config.allowCycles
     }
@@ -13,5 +10,5 @@ module.exports.migration = {
     config.$schema = `https://schemas.platformatic.dev/@platformatic/service/${version}.json`
 
     return config
-  },
+  }
 }

package/lib/versions/3.0.0.js

@@ -0,0 +1,14 @@
+export default {
+  version: '2.99.0',
+  up (config) {
+    if (typeof config.plugins?.typescript !== 'undefined') {
+      delete config.plugins.typescript
+    }
+
+    if (typeof config.clients !== 'undefined') {
+      delete config.clients
+    }
+
+    return config
+  }
+}

package/package.json

@@ -1,12 +1,11 @@
 {
   "name": "@platformatic/service",
-  "version": "3.4.1",
+  "version": "3.5.0",
   "description": "",
   "main": "index.js",
-  "bin": {
-    "plt-service": "./service.mjs"
-  },
-  "author": "Matteo Collina <hello@matteocollina.com>",
+  "types": "index.d.ts",
+  "type": "module",
+  "author": "Platformatic Inc. <oss@platformatic.dev> (https://platformatic.dev)",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/platformatic/platformatic.git"
@@ -20,18 +19,16 @@
     "@fastify/aws-lambda": "^5.0.0",
     "@fastify/compress": "^8.0.0",
     "bindings": "^1.5.0",
-    "borp": "^0.17.0",
+    "cleaner-spec-reporter": "^0.5.0",
     "eslint": "9",
     "json-schema-to-typescript": "^15.0.0",
-    "neostandard": "^0.11.1",
+    "neostandard": "^0.12.0",
     "openapi-types": "^12.1.3",
     "pino-abstract-transport": "^2.0.0",
     "self-cert": "^2.0.0",
     "split2": "^4.2.0",
-    "strip-ansi": "^7.1.0",
-    "tsd": "^0.31.0",
     "typescript": "^5.5.4",
-    "undici": "^6.0.0",
+    "undici": "7.11.0",
     "vscode-json-languageservice": "^5.3.9",
     "why-is-node-running": "^2.2.2",
     "yaml": "^2.4.1"
@@ -39,57 +36,52 @@
   "dependencies": {
     "@fastify/accepts": "^5.0.0",
     "@fastify/autoload": "^6.0.0",
-    "@fastify/basic-auth": "^6.0.0",
     "@fastify/cors": "^10.0.0",
     "@fastify/deepmerge": "^2.0.0",
     "@fastify/error": "^4.0.0",
     "@fastify/static": "^8.0.0",
     "@fastify/swagger": "^9.0.0",
     "@fastify/under-pressure": "^9.0.0",
-    "@mercuriusjs/federation": "^4.0.0",
-    "@platformatic/fastify-http-metrics": "^0.1.0",
-    "@scalar/fastify-api-reference": "^1.19.5",
+    "@scalar/fastify-api-reference": "1.34.6",
+    "@types/node": "^22.10.6",
     "@types/ws": "^8.5.10",
     "ajv": "^8.12.0",
     "cli-progress": "^3.12.0",
     "close-with-grace": "^2.0.0",
     "code-block-writer": "^13.0.1",
     "colorette": "^2.0.20",
-    "commist": "^3.2.0",
     "console-table-printer": "^2.12.0",
-    "desm": "^1.3.1",
-    "env-schema": "^5.2.1",
-    "es-main": "^1.3.0",
-    "execa": "^8.0.1",
+    "env-schema": "^6.0.0",
+    "execa": "^9.0.0",
+    "fast-json-patch": "^3.1.1",
     "fastify": "^5.0.0",
-    "fastify-metrics": "^12.0.0",
     "fastify-plugin": "^5.0.0",
     "graphql": "^16.9.0",
     "help-me": "^5.0.0",
-    "mercurius": "^15.0.0",
+    "mercurius": "^16.0.0",
     "minimist": "^1.2.8",
     "my-ua-parser": "^2.0.2",
     "ora": "^6.3.1",
-    "pino": "^9.0.0",
-    "pino-pretty": "^11.0.0",
-    "prom-client": "^15.1.2",
+    "pino": "^9.9.0",
+    "pino-pretty": "^13.0.0",
     "rfdc": "^1.3.1",
     "semgrator": "^0.3.0",
-    "undici": "^6.9.0",
-    "@platformatic/client": "3.4.1",
-    "@platformatic/generators": "3.4.1",
-    "@platformatic/config": "3.4.1",
-    "@platformatic/scalar-theme": "3.4.1",
-    "@platformatic/ts-compiler": "3.4.1",
-    "@platformatic/telemetry": "3.4.1",
-    "@platformatic/utils": "3.4.1"
+    "undici": "^7.0.0",
+    "@platformatic/basic": "3.5.0",
+    "@platformatic/foundation": "3.5.0",
+    "@platformatic/generators": "3.5.0",
+    "@platformatic/metrics": "3.5.0",
+    "@platformatic/scalar-theme": "3.5.0",
+    "@platformatic/telemetry": "3.5.0"
+  },
+  "engines": {
+    "node": ">=22.19.0"
   },
   "scripts": {
-    "test": "pnpm run lint && borp -T --concurrency=1 --timeout=180000 && tsd",
-    "unit": "borp --pattern 'test/**/*.test.{js,mjs}' --ignore 'fixtures/**/*' --concurrency=1 --timeout=180000 --no-typescript",
+    "test": "node --test --test-reporter=cleaner-spec-reporter --test-concurrency=1 --test-timeout=2000000 test/*.test.js test/**/*.test.js",
     "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",
-    "lint": "eslint && tsd"
+    "build": "npm run gen-schema && npm run gen-types",
+    "lint": "eslint"
   }
 }