@platformatic/service 1.13.7 → 1.14.1

package/lib/utils.js

@@ -1,7 +1,7 @@
 'use strict'
 
-const { access } = require('fs/promises')
-const { resolve, join, relative, dirname, basename } = require('path')
+const { access } = require('node:fs/promises')
+const { resolve, join, relative, dirname, basename } = require('node:path')
 const { isatty } = require('tty')
 
 async function isFileAccessible (filename, directory) {
@@ -70,8 +70,131 @@ function getJSPluginPath (workingDir, tsPluginPath, compileDir) {
   return join(compileDir, jsPluginRelativePath)
 }
 
+function convertOpenApiToFastifyPath (openApiPath) {
+  return openApiPath
+    .replace(/{wildcard}/g, '*')
+    .replace(/{(\w+)}/g, ':$1')
+}
+
+function updateOpenApiSchemaRefs (openapiSchema) {
+  const componentsPrefix = '#/components/schemas/'
+
+  for (const key of Object.keys(openapiSchema)) {
+    const value = openapiSchema[key]
+
+    if (key === '$ref' && value.startsWith(componentsPrefix)) {
+      openapiSchema.$ref = value
+        .replace(componentsPrefix, '')
+        .split('/', 1)
+        .join('#/')
+
+      continue
+    }
+
+    if (typeof value === 'object') {
+      updateOpenApiSchemaRefs(value)
+    }
+  }
+}
+
+function convertOpenApiToFastifyRouteSchema (openapiSchema) {
+  const routeSchema = {}
+
+  for (const openApiParam of openapiSchema.parameters ?? []) {
+    const name = openApiParam.name
+    const schema = openApiParam.schema
+
+    if (openApiParam.in === 'path') {
+      if (routeSchema.params === undefined) {
+        routeSchema.params = {
+          type: 'object',
+          properties: {},
+          required: []
+        }
+      }
+
+      routeSchema.params.properties[name] = schema
+      if (openApiParam.required) {
+        routeSchema.params.required.push(name)
+      }
+    }
+
+    if (openApiParam.in === 'header') {
+      if (routeSchema.headers === undefined) {
+        routeSchema.headers = {
+          type: 'object',
+          properties: {},
+          required: []
+        }
+      }
+
+      routeSchema.headers.properties[name] = schema
+      if (openApiParam.required) {
+        routeSchema.headers.required.push(name)
+      }
+    }
+
+    if (openApiParam.in === 'query') {
+      if (routeSchema.querystring === undefined) {
+        routeSchema.querystring = {
+          type: 'object',
+          properties: {},
+          required: []
+        }
+      }
+
+      routeSchema.querystring.properties[name] = schema
+      if (openApiParam.required) {
+        routeSchema.querystring.required.push(name)
+      }
+    }
+  }
+
+  if (openapiSchema.requestBody) {
+    const content = openapiSchema.requestBody.content
+    const contentType = Object.keys(content)[0]
+    routeSchema.body = content[contentType].schema
+  }
+
+  for (const statusCode of Object.keys(openapiSchema.responses ?? {})) {
+    const response = openapiSchema.responses[statusCode]
+    const responseSchema = response.content?.['application/json']?.schema
+    if (responseSchema) {
+      if (!routeSchema.response) {
+        routeSchema.response = {}
+      }
+      routeSchema.response[statusCode] = responseSchema
+    }
+  }
+
+  updateOpenApiSchemaRefs(routeSchema)
+
+  return routeSchema
+}
+
+function changeOpenapiSchemaPrefix (openapiSchema, oldVersionPrefix, newVersionPrefix) {
+  if (!oldVersionPrefix && !newVersionPrefix) return openapiSchema
+
+  const normalizedPaths = {}
+  for (const oldPath of Object.keys(openapiSchema.paths ?? {})) {
+    const newPath = oldVersionPrefix
+      ? oldPath.replace(oldVersionPrefix, newVersionPrefix)
+      : newVersionPrefix + oldPath
+
+    normalizedPaths[newPath] = openapiSchema.paths[oldPath]
+  }
+
+  return {
+    ...openapiSchema,
+    paths: normalizedPaths
+  }
+}
+
 module.exports = {
   isFileAccessible,
   getJSPluginPath,
-  addLoggerToTheConfig
+  addLoggerToTheConfig,
+  changeOpenapiSchemaPrefix,
+  convertOpenApiToFastifyPath,
+  convertOpenApiToFastifyRouteSchema
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/service",
-  "version": "1.13.7",
+  "version": "1.14.1",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -33,7 +33,7 @@
     "ts-standard": "^12.0.2",
     "tsd": "^0.29.0",
     "typescript": "^5.2.2",
-    "undici": "^5.25.4",
+    "undici": "^6.0.0",
     "vscode-json-languageservice": "^5.3.6",
     "why-is-node-running": "^2.2.2",
     "yaml": "^2.3.2"
@@ -44,6 +44,7 @@
     "@fastify/basic-auth": "^5.0.0",
     "@fastify/cors": "^8.4.0",
     "@fastify/deepmerge": "^1.3.0",
+    "@fastify/error": "^3.4.0",
     "@fastify/restartable": "^2.1.1",
     "@fastify/static": "^6.11.2",
     "@fastify/swagger": "^8.10.1",
@@ -53,28 +54,36 @@
     "@types/ws": "^8.5.6",
     "ajv": "^8.12.0",
     "close-with-grace": "^1.2.0",
+    "code-block-writer": "^12.0.0",
     "commist": "^3.2.0",
+    "colorette": "^2.0.20",
+    "cli-progress": "^3.12.0",
     "desm": "^1.3.0",
     "env-schema": "^5.2.0",
     "es-main": "^1.3.0",
     "execa": "^8.0.1",
     "fastify": "^4.23.2",
+    "fastify-openapi-glue": "^4.3.3",
     "fastify-metrics": "^10.3.2",
     "fastify-plugin": "^4.5.1",
     "graphql": "^16.8.1",
     "help-me": "^4.2.0",
     "mercurius": "^13.1.0",
     "minimist": "^1.2.8",
+    "openapi-schema-diff": "^0.0.1",
     "pino": "^8.15.3",
     "pino-pretty": "^10.2.0",
     "rfdc": "^1.3.0",
+    "undici": "^6.0.0",
     "ua-parser-js": "^1.0.36",
-    "@platformatic/config": "1.13.7",
-    "@platformatic/client": "1.13.7",
-    "@platformatic/telemetry": "1.13.7",
-    "@platformatic/utils": "1.13.7",
-    "@platformatic/generators": "1.13.7",
-    "@platformatic/swagger-ui-theme": "1.13.7"
+    "@platformatic/authenticate": "1.14.1",
+    "@platformatic/client": "1.14.1",
+    "@platformatic/generators": "1.14.1",
+    "@platformatic/swagger-ui-theme": "1.14.1",
+    "@platformatic/config": "1.14.1",
+    "@platformatic/telemetry": "1.14.1",
+    "@platformatic/metaconfig": "1.14.1",
+    "@platformatic/utils": "1.14.1"
   },
   "standard": {
     "ignore": [

package/service.mjs

@@ -8,6 +8,8 @@ import { readFile } from 'fs/promises'
 import { join } from 'desm'
 import { printAndExitLoadConfigError } from '@platformatic/config'
 import { generateJsonSchemaConfig } from './lib/gen-schema.js'
+import { bumpVersion } from './lib/bump-version.js'
+import { updateVersion } from './lib/update-version.js'
 import { generateTypes } from './lib/gen-types.mjs'
 
 import { buildCompileCmd } from './lib/compile.js'
@@ -45,6 +47,8 @@ program.register('compile', buildCompileCmd(platformaticService))
 program.register('types', wrapCommand(generateTypes))
 program.register('schema config', wrapCommand(generateJsonSchemaConfig))
 program.register('schema', help.toStdout.bind(null, ['schema']))
+program.register('versions bump', wrapCommand(bumpVersion))
+program.register('versions update', wrapCommand(updateVersion))
 
 export async function runService (argv) {
   const args = parseArgs(argv, {
@@ -54,7 +58,7 @@ export async function runService (argv) {
   })
 
   /* c8 ignore next 4 */
-  if (args.version) {
+  if (args.version && !args._.includes('versions')) {
     console.log('v' + JSON.parse(await readFile(join(import.meta.url, 'package.json'))).version)
     process.exit(0)
   }