@platformatic/service 3.0.0-alpha.1 → 3.0.0-alpha.2

package/config.d.ts

@@ -253,6 +253,7 @@ export interface PlatformaticServiceConfig {
     | string;
   $schema?: string;
   module?: string;
+  application?: {};
   service?: {
     openapi?:
       | {
@@ -306,17 +307,6 @@ export interface PlatformaticServiceConfig {
           };
         };
   };
-  clients?: {
-    serviceId?: string;
-    name?: string;
-    type?: "openapi" | "graphql";
-    path?: string;
-    schema?: string;
-    url?: string;
-    fullResponse?: boolean;
-    fullRequest?: boolean;
-    validateResponse?: boolean;
-  }[];
   runtime?: {
     preload?: string | string[];
     basePath?: string;

package/index.d.ts

@@ -1,6 +1,6 @@
 import { BaseContext, BaseOptions, BaseStackable } from '@platformatic/basic'
+import { Configuration, ConfigurationOptions } from '@platformatic/foundation'
 import { BaseGenerator } from '@platformatic/generators'
-import { Configuration, ConfigurationOptions } from '@platformatic/utils'
 import { JSONSchemaType } from 'ajv'
 import { FastifyInstance } from 'fastify'
 import { PlatformaticServiceConfig } from './config'
@@ -41,6 +41,11 @@ export declare const skipTelemetryHooks: boolean
 export declare function platformaticService (app: FastifyInstance, stackable: ServiceStackable): Promise<void>
 
 export declare class Generator extends BaseGenerator.BaseGenerator {}
+export declare function applyTestHelperCustomizations (
+  helper: string,
+  mod: string,
+  customizations: Record<string, string>
+): string
 
 export declare const packageJson: Record<string, unknown>
 
@@ -55,7 +60,6 @@ export declare const schemaComponents: {
   graphqlBase: JSONSchemaType<object>
   graphql: JSONSchemaType<object>
   service: JSONSchemaType<object>
-  client: JSONSchemaType<object>
 }
 
 export declare const version: string

package/index.js

@@ -1,5 +1,5 @@
 import { transform as basicTransform, resolve, validationOptions } from '@platformatic/basic'
-import { kMetadata, loadConfiguration as utilsLoadConfiguration } from '@platformatic/utils'
+import { kMetadata, loadConfiguration as utilsLoadConfiguration } from '@platformatic/foundation'
 import { readFile } from 'node:fs/promises'
 import { join } from 'node:path'
 import { schema } from './lib/schema.js'
@@ -58,6 +58,6 @@ export async function create (configOrRoot, sourceOrConfig, context) {
 export const skipTelemetryHooks = true
 
 export { platformaticService } from './lib/application.js'
-export { Generator } from './lib/generator.js'
+export { applyTestHelperCustomizations, Generator } from './lib/generator.js'
 export { packageJson, schema, schemaComponents, version } from './lib/schema.js'
 export { ServiceStackable } from './lib/stackable.js'

package/lib/application.js

@@ -1,20 +1,13 @@
-import { isKeyEnabled } from '@platformatic/utils'
-import { setupClients } from './plugins/clients.js'
+import { isKeyEnabled } from '@platformatic/foundation'
 import { setupCors } from './plugins/cors.js'
 import { setupGraphQL } from './plugins/graphql.js'
 import { setupHealthCheck } from './plugins/health-check.js'
 import { setupOpenAPI } from './plugins/openapi.js'
 import { loadPlugins } from './plugins/plugins.js'
-import { setupTsCompiler } from './plugins/typescript.js'
 
 export async function platformaticService (app, stackable) {
   const config = await stackable.getConfig()
 
-  // This must be done before loading the plugins, so they can be configured accordingly
-  if (isKeyEnabled('clients', config)) {
-    await app.register(setupClients, config.clients)
-  }
-
   const serviceConfig = config.service || {}
 
   if (isKeyEnabled('openapi', serviceConfig)) {
@@ -27,21 +20,6 @@ export async function platformaticService (app, stackable) {
   }
 
   if (config.plugins) {
-    let registerTsCompiler = false
-
-    const typescript = config.plugins.paths && config.plugins.typescript
-
-    /* c8 ignore next 6 */
-    if (typescript === true) {
-      registerTsCompiler = true
-    } else if (typeof typescript === 'object') {
-      registerTsCompiler = typescript.enabled === true || typescript.enabled === undefined
-    }
-
-    if (registerTsCompiler) {
-      await app.register(setupTsCompiler, stackable.context)
-    }
-
     await app.register(loadPlugins, stackable.context)
   }
 

package/lib/generator.js

@@ -1,51 +1,261 @@
 import { BaseGenerator } from '@platformatic/generators'
+import { join } from 'node:path'
 
-export class Generator extends BaseGenerator {
-  constructor (opts = {}) {
-    super({
-      ...opts,
-      module: '@platformatic/service'
-    })
+const JS_PLUGIN_WITH_TYPES_SUPPORT = `\
+'use strict'
+
+/** @param {import('fastify').FastifyInstance} fastify */
+module.exports = async function (fastify, opts) {
+  fastify.decorate('example', 'foobar')
+}
+`
+
+const TS_PLUGIN_WITH_TYPES_SUPPORT = `\
+import { type FastifyInstance, type FastifyPluginOptions } from 'fastify'
+
+export default async function (fastify: FastifyInstance, opts: FastifyPluginOptions) {
+  fastify.decorate('example', 'foobar')
+}
+`
+
+const JS_ROUTES_WITH_TYPES_SUPPORT = `\
+'use strict'
+
+/** @param {import('fastify').FastifyInstance} fastify */
+module.exports = async function (fastify, opts) {
+  fastify.get('/example', async (request, reply) => {
+    return { hello: fastify.example }
+  })
+}
+`
+
+const TS_ROUTES_WITH_TYPES_SUPPORT = `\
+import { type FastifyInstance, type FastifyPluginOptions } from 'fastify'
+
+declare module 'fastify' {
+  interface FastifyInstance {
+    example: string
   }
+}
 
-  getDefaultConfig () {
-    const config = super.getDefaultConfig()
-    config.plugin = true
-    config.tests = true
-    return config
+export default async function (fastify: FastifyInstance, opts: FastifyPluginOptions) {
+  fastify.get('/example', async (request, reply) => {
+    return { hello: fastify.example }
+  })
+}
+`
+
+const TEST_ROUTES_JS = `\
+'use strict'
+
+const test = require('node:test')
+const assert = require('node:assert')
+const { getServer } = require('../helper')
+
+test('example', async (t) => {
+  const server = await getServer(t)
+  const res = await server.inject({
+    method: 'GET',
+    url: '/example'
+  })
+
+  assert.strictEqual(res.statusCode, 200)
+  assert.deepStrictEqual(res.json(), {
+    hello: 'foobar'
+  })
+})
+`
+
+const TEST_PLUGIN_JS = `\
+'use strict'
+
+const test = require('node:test')
+const assert = require('node:assert')
+const { getServer } = require('../helper')
+
+test('example decorator', async (t) => {
+  const server = await getServer(t)
+
+  assert.strictEqual(server.example, 'foobar')
+})
+`
+
+const TEST_ROUTES_TS = `\
+import test from 'node:test'
+import assert from 'node:assert'
+import { getServer } from '../helper'
+
+test('root', async (t) => {
+  const server = await getServer(t)
+  const res = await server.inject({
+    method: 'GET',
+    url: '/example'
+  })
+
+  assert.strictEqual(res.statusCode, 200)
+  assert.deepStrictEqual(res.json(), {
+    hello: 'foobar'
+  })
+})
+`
+
+const TEST_PLUGIN_TS = `\
+import test from 'node:test'
+import assert from 'node:assert'
+import { getServer } from '../helper'
+
+test('example decorator', async (t) => {
+  const server = await getServer(t)
+
+  assert.strictEqual(server.example, 'foobar')
+})
+`
+
+const TEST_HELPER_JS = `
+'use strict'
+
+const { join } = require('node:path')
+const { readFile } = require('node:fs/promises')
+const { buildServer } = require('$__MOD__')
+$__REQUIRES__
+
+async function getServer (t) {
+$__PRE__
+  const config = JSON.parse(await readFile(join(__dirname, '..', 'watt.json'), 'utf8'))
+  // Add your config customizations here. For example you want to set
+  // all things that are set in the config file to read from an env variable
+  config.server ||= {}
+  config.server.logger ||= {}
+  config.watch = false
+$__CONFIG__
+  // Add your config customizations here
+  const server = await buildServer(config)
+  t.after(() => server.close())
+$__POST__
+  return server
+}
+
+module.exports.getServer = getServer
+`
+
+const TEST_HELPER_TS = `
+import { join } from 'node:path'
+import { readFile } from 'node:fs/promises'
+import { buildServer } from '$__MOD__'
+import { test } from 'node:test'
+$__REQUIRES__
+
+type testfn = Parameters<typeof test>[0]
+type TestContext = Parameters<Exclude<testfn, undefined>>[0]
+
+export async function getServer (t: TestContext) {
+$__PRE__
+  // We go up two folder because this files executes in the dist folder
+  const config = JSON.parse(await readFile(join(__dirname, '..', '..', 'watt.json'), 'utf8'))
+  // Add your config customizations here. For example you want to set
+  // all things that are set in the config file to read from an env variable
+  config.server ||= {}
+  config.server.logger ||= {}
+  config.server.logger.level = 'warn'
+  config.watch = false
+$__CONFIG__
+  // Add your config customizations here
+  const server = await buildServer(config)
+  t.after(() => server.close())
+$__POST__
+  return server
+}
+  `
+
+const TS_CONFIG = `
+{
+  compilerOptions: {
+    module: 'commonjs',
+    esModuleInterop: true,
+    target: 'es2020',
+    sourceMap: true,
+    pretty: true,
+    noEmitOnError: true,
+    incremental: true,
+    strict: true,
+    outDir: 'dist',
+    skipLibCheck: true
+  },
+  watchOptions: {
+    watchFile: 'fixedPollingInterval',
+    watchDirectory: 'fixedPollingInterval',
+    fallbackPolling: 'dynamicPriority',
+    synchronousWatchDirectory: true,
+    excludeDirectories: ['**/node_modules', 'dist']
   }
+}
+`
 
-  async _beforePrepare () {
-    // if we are NOT updating, create env and files, otherwise leave as it is
-    if (!this.config.isUpdating) {
-      if (!this.config.isRuntimeContext) {
-        this.addEnvVars(
-          {
-            PLT_SERVER_HOSTNAME: this.config.hostname,
-            PLT_SERVER_LOGGER_LEVEL: 'info',
-            PORT: 3042
-          },
-          { overwrite: false }
-        )
-      }
+const PLT_ENVIRONMENT_TEMPLATE = `
+import { type FastifyInstance } from 'fastify'
+import { PlatformaticApplication, PlatformaticServiceConfig } from '@platformatic/service'
 
-      this.addEnvVars(
-        {
-          PLT_TYPESCRIPT: this.config.typescript
-        },
-        { overwrite: false, default: true }
-      )
+declare module 'fastify' {
+  interface FastifyInstance {
+    platformatic: PlatformaticApplication<PlatformaticServiceConfig>
+  }
+}
+`
 
-      this.config.dependencies = {
-        '@platformatic/service': `^${this.platformaticVersion}`
-      }
-    }
+const README = `
+# Platformatic Service API
+
+This is a generated [Platformatic Service](https://docs.platformatic.dev/docs/service/overview) application.
+
+## Requirements
+
+Platformatic supports macOS, Linux and Windows ([WSL](https://docs.microsoft.com/windows/wsl/) recommended).
+You'll need to have [Node.js](https://nodejs.org/) >= v18.8.0 or >= v20.6.0
+
+## Setup
+
+Install dependencies:
+
+\`\`\`bash
+npm install
+\`\`\`
+
+## Usage
+
+Run the API with:
+
+\`\`\`bash
+npm start
+\`\`\`
+
+### Explore
+- ⚡ The Platformatic DB server is running at http://localhost:3042/
+- 📔 View the REST API's Swagger documentation at http://localhost:3042/documentation/
+- 🔍 Try out the GraphiQL web UI at http://localhost:3042/graphiql
+`
+
+export function applyTestHelperCustomizations (testHelper, mod, customizations) {
+  return testHelper
+    .replaceAll('$__MOD__', mod || '@platformatic/service')
+    .replaceAll('$__REQUIRES__', customizations.requires || '')
+    .replaceAll('$__PRE__', customizations.pre || '')
+    .replaceAll('$__CONFIG__', customizations.config || '')
+    .replaceAll('$__POST__', customizations.post || '')
+}
+
+export class Generator extends BaseGenerator {
+  constructor (opts = {}) {
+    super({
+      module: '@platformatic/service',
+      ...opts
+    })
   }
 
   getConfigFieldsDefinitions () {
     if (this.config.isRuntimeContext) {
       return []
     }
+
     return [
       {
         var: 'PLT_SERVER_HOSTNAME',
@@ -71,75 +281,135 @@ export class Generator extends BaseGenerator {
     ]
   }
 
-  async _afterPrepare () {
-    // if we are NOT updating, create env and files, otherwise leave as it is
-    if (!this.config.isUpdating) {
-      const PLT_ENVIRONMENT_TEMPLATE = `
-import { FastifyInstance } from 'fastify'
-import { PlatformaticApplication, PlatformaticServiceConfig } from '@platformatic/service'
+  getDefaultConfig () {
+    const defaultBaseConfig = super.getDefaultConfig()
 
-declare module 'fastify' {
-  interface FastifyInstance {
-    platformatic: PlatformaticApplication<PlatformaticServiceConfig>
+    return {
+      ...defaultBaseConfig,
+      plugin: true,
+      tests: true
+    }
   }
-}
-`
 
-      const README = `
-# Platformatic Service API
+  async prepareQuestions () {
+    await super.prepareQuestions()
 
-This is a generated [Platformatic Service](https://docs.platformatic.dev/docs/service/overview) application.
-
-## Requirements
+    if (!this.config.skipTypescript) {
+      this.questions.push({
+        type: 'list',
+        name: 'typescript',
+        message: 'Do you want to use TypeScript?',
+        default: false,
+        choices: [
+          { name: 'yes', value: true },
+          { name: 'no', value: false }
+        ]
+      })
+    }
+  }
 
-Platformatic supports macOS, Linux and Windows ([WSL](https://docs.microsoft.com/windows/wsl/) recommended).
-You'll need to have [Node.js](https://nodejs.org/) >= v18.8.0 or >= v20.6.0
+  async _beforePrepare () {
+    if (this.config.isUpdating) {
+      return
+    }
 
-## Setup
+    if (!this.config.isRuntimeContext) {
+      this.addEnvVars(
+        {
+          PLT_SERVER_HOSTNAME: this.config.hostname,
+          PLT_SERVER_LOGGER_LEVEL: 'info',
+          PORT: 3042
+        },
+        { overwrite: false }
+      )
+    }
 
-Install dependencies:
+    this.config.dependencies = {
+      '@platformatic/service': `^${this.platformaticVersion}`
+    }
+  }
 
-\`\`\`bash
-npm install
-\`\`\`
+  async _afterPrepare () {
+    // if we are NOT updating, create env and files, otherwise leave as it is
+    if (this.config.isUpdating) {
+      return
+    }
 
-## Usage
+    if (this.config.typescript) {
+      this.addFile({ path: '', file: 'tsconfig.json', contents: TS_CONFIG })
+    }
 
-Run the API with:
+    this.addFile({ path: '', file: 'plt-env.d.ts', contents: PLT_ENVIRONMENT_TEMPLATE })
+    this.addFile({ path: '', file: 'README.md', contents: README })
 
-\`\`\`bash
-npm start
-\`\`\`
+    if (this.config.plugin) {
+      // create plugin
+      this.files.push({
+        path: 'plugins',
+        file: this.config.typescript ? 'example.ts' : 'example.js',
+        contents: this.config.typescript ? TS_PLUGIN_WITH_TYPES_SUPPORT : JS_PLUGIN_WITH_TYPES_SUPPORT
+      })
 
-### Explore
-- ⚡ The Platformatic DB server is running at http://localhost:3042/
-- 📔 View the REST API's Swagger documentation at http://localhost:3042/documentation/
-- 🔍 Try out the GraphiQL web UI at http://localhost:3042/graphiql
-`
+      this.files.push({
+        path: 'routes',
+        file: this.config.typescript ? 'root.ts' : 'root.js',
+        contents: this.config.typescript ? TS_ROUTES_WITH_TYPES_SUPPORT : JS_ROUTES_WITH_TYPES_SUPPORT
+      })
 
-      this.addFile({ path: '', file: 'plt-env.d.ts', contents: PLT_ENVIRONMENT_TEMPLATE })
-      this.addFile({ path: '', file: 'README.md', contents: README })
+      if (this.config.tests) {
+        if (this.config.typescript) {
+          this.files.push({
+            path: 'test',
+            file: 'helper.ts',
+            contents: applyTestHelperCustomizations(TEST_HELPER_TS, this.module, this.testHelperCustomizations ?? {})
+          })
+          this.files.push({
+            path: join('test', 'plugins'),
+            file: 'example.test.ts',
+            contents: TEST_PLUGIN_TS
+          })
+          this.files.push({
+            path: join('test', 'routes'),
+            file: 'root.test.ts',
+            contents: TEST_ROUTES_TS
+          })
+        } else {
+          this.files.push({
+            path: 'test',
+            file: 'helper.js',
+            contents: applyTestHelperCustomizations(TEST_HELPER_JS, this.module, this.testHelperCustomizations ?? {})
+          })
+          this.files.push({
+            path: join('test', 'plugins'),
+            file: 'example.test.js',
+            contents: TEST_PLUGIN_JS
+          })
+          this.files.push({
+            path: join('test', 'routes'),
+            file: 'root.test.js',
+            contents: TEST_ROUTES_JS
+          })
+        }
+      }
     }
   }
 
   async _getConfigFileContents () {
-    const { isRuntimeContext } = this.config
-    const version = this.platformaticVersion
     const config = {
-      $schema: `https://schemas.platformatic.dev/@platformatic/service/${version}.json`,
+      $schema: `https://schemas.platformatic.dev/@platformatic/service/${this.platformaticVersion}.json`,
       service: {
         openapi: true
       },
       watch: true
     }
+
     if (this.config.plugin) {
       config.plugins = {
-        paths: [{ path: './plugins', encapsulate: false }, './routes'],
-        typescript: `{${this.getEnvVarName('PLT_TYPESCRIPT')}}`
+        paths: [{ path: './plugins', encapsulate: false }, './routes']
       }
     }
 
-    if (!isRuntimeContext) {
+    if (!this.config.isRuntimeContext) {
       config.server = {
         hostname: '{PLT_SERVER_HOSTNAME}',
         port: '{PORT}',

package/lib/plugins/graphql.js

@@ -1,4 +1,4 @@
-import { deepmerge } from '@platformatic/utils'
+import { deepmerge } from '@platformatic/foundation'
 import fp from 'fastify-plugin'
 import mercurius from 'mercurius'
 

package/lib/plugins/openapi.js

@@ -1,5 +1,5 @@
 import Swagger from '@fastify/swagger'
-import { deepmerge } from '@platformatic/utils'
+import { deepmerge } from '@platformatic/foundation'
 import fp from 'fastify-plugin'
 
 // For some unknown reason, c8 is not detecting any of this

package/lib/plugins/plugins.js

@@ -1,53 +1,9 @@
-import { kMetadata } from '@platformatic/utils'
 import fp from 'fastify-plugin'
-import { readFile } from 'node:fs/promises'
-import { join, resolve } from 'node:path'
-import { getJSPluginPath, isFileAccessible } from '../utils.js'
 import { sandboxWrapper } from './sandbox-wrapper.js'
 
 async function loadPluginsPlugin (app, context) {
   const config = app.platformatic.config
 
-  let isOutDirAccessible = false
-  let outDir = null
-
-  const workingDir = context?.directory ?? config[kMetadata].root
-  const tsConfigPath = config.plugins.typescript?.tsConfig || join(workingDir, 'tsconfig.json')
-
-  // If the tsconfig.json file exists, then we need to adjust the plugin paths
-  // to point to the compiled JS files.
-  const isTsConfigAccessible = await isFileAccessible(tsConfigPath)
-  if (isTsConfigAccessible) {
-    const tsConfig = JSON.parse(await readFile(tsConfigPath, 'utf8'))
-    outDir = resolve(workingDir, tsConfig.compilerOptions.outDir)
-  }
-
-  /* c8 ignore next 3 */
-  if (config.plugins.typescript?.outDir) {
-    outDir = config.plugins.typescript.outDir
-  }
-
-  if (outDir) {
-    isOutDirAccessible = await isFileAccessible(outDir)
-
-    if (context?.isProduction && !isOutDirAccessible) {
-      throw new Error(
-        `Cannot access directory '${outDir}'. Please run the 'build' command before running in production mode.`
-      )
-    }
-  }
-
-  if (config.plugins.paths && isOutDirAccessible) {
-    config.plugins.paths = config.plugins.paths.map(plugin => {
-      /* c8 ignore next 3 */
-      const tmp =
-        typeof plugin === 'string'
-          ? getJSPluginPath(workingDir, plugin, outDir)
-          : { ...plugin, path: getJSPluginPath(workingDir, plugin.path, outDir) }
-      return tmp
-    })
-  }
-
   await app.register(sandboxWrapper, { packages: config.plugins.packages, paths: config.plugins.paths })
 }
 

package/lib/plugins/sandbox-wrapper.js

@@ -1,5 +1,5 @@
 import autoload from '@fastify/autoload'
-import { kMetadata } from '@platformatic/utils'
+import { kMetadata } from '@platformatic/foundation'
 import fp from 'fastify-plugin'
 import { stat } from 'node:fs/promises'
 import { createRequire } from 'node:module'

package/lib/schema.js

@@ -1,11 +1,12 @@
 #! /usr/bin/env node
 
+import { schemaComponents as basicSchemaComponents } from '@platformatic/basic'
 import {
   fastifyServer as server,
   schemaComponents as utilsSchemaComponents,
   watch,
   wrappedRuntime
-} from '@platformatic/utils'
+} from '@platformatic/foundation'
 import { readFileSync } from 'node:fs'
 import { resolve } from 'node:path'
 
@@ -1091,45 +1092,6 @@ export const plugins = {
           }
         ]
       }
-    },
-    typescript: {
-      anyOf: [
-        {
-          type: 'object',
-          properties: {
-            enabled: {
-              anyOf: [
-                {
-                  type: 'boolean'
-                },
-                {
-                  type: 'string'
-                }
-              ]
-            },
-            tsConfig: {
-              type: 'string',
-              resolvePath: true
-            },
-            outDir: {
-              type: 'string',
-              resolvePath: true
-            },
-            flags: {
-              type: 'array',
-              items: {
-                type: 'string'
-              }
-            }
-          }
-        },
-        {
-          type: 'boolean'
-        },
-        {
-          type: 'string'
-        }
-      ]
     }
   },
   additionalProperties: false,
@@ -1293,40 +1255,6 @@ export const service = {
   additionalProperties: false
 }
 
-export const clients = {
-  type: 'array',
-  items: {
-    type: 'object',
-    properties: {
-      serviceId: {
-        type: 'string'
-      },
-      name: {
-        type: 'string'
-      },
-      type: {
-        type: 'string',
-        enum: ['openapi', 'graphql']
-      },
-      path: {
-        type: 'string',
-        resolvePath: true
-      },
-      schema: {
-        type: 'string',
-        resolvePath: true
-      },
-      url: {
-        type: 'string'
-      },
-      fullResponse: { type: 'boolean' },
-      fullRequest: { type: 'boolean' },
-      validateResponse: { type: 'boolean' }
-    },
-    additionalProperties: false
-  }
-}
-
 export const schemaComponents = {
   $defs,
   plugins,
@@ -1335,8 +1263,7 @@ export const schemaComponents = {
   proxy,
   graphqlBase,
   graphql,
-  service,
-  clients
+  service
 }
 
 export const schema = {
@@ -1368,8 +1295,8 @@ export const schema = {
     module: {
       type: 'string'
     },
+    application: basicSchemaComponents.application,
     service,
-    clients,
     runtime: wrappedRuntime
   },
   additionalProperties: false,

package/lib/stackable.js

@@ -1,7 +1,6 @@
 import { BaseStackable, cleanBasePath, ensureTrailingSlash, getServerUrl } from '@platformatic/basic'
+import { buildPinoFormatters, buildPinoTimestamp, deepmerge, features, isKeyEnabled } from '@platformatic/foundation'
 import { telemetry } from '@platformatic/telemetry'
-import { compile } from '@platformatic/ts-compiler'
-import { buildPinoFormatters, buildPinoTimestamp, deepmerge, features, isKeyEnabled } from '@platformatic/utils'
 import fastify from 'fastify'
 import { printSchema } from 'graphql'
 import { randomUUID } from 'node:crypto'
@@ -88,15 +87,6 @@ export class ServiceStackable extends BaseStackable {
     return this.#app?.close()
   }
 
-  async build () {
-    return compile({
-      tsConfig: this.config.plugins?.typescript?.tsConfig,
-      flags: this.config.plugins?.typescript?.flags,
-      cwd: this.root,
-      logger: this.logger
-    })
-  }
-
   async inject (injectParams, onInject) {
     const response = await this.#app.inject(injectParams, onInject)
 

package/lib/upgrade.js

@@ -1,4 +1,4 @@
-import { abstractLogger } from '@platformatic/utils'
+import { abstractLogger } from '@platformatic/foundation'
 import { resolve } from 'node:path'
 import { semgrator } from 'semgrator'
 

package/lib/utils.js

@@ -1,5 +1,5 @@
 import { access, readFile, stat } from 'node:fs/promises'
-import { basename, dirname, join, relative, resolve } from 'node:path'
+import { resolve } from 'node:path'
 
 let _isDocker
 
@@ -38,34 +38,6 @@ export async function isFileAccessible (filename, directory) {
   }
 }
 
-export 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
-
-  /* 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)
-}
-
 export async function sanitizeHTTPSArgument (arg) {
   if (typeof arg === 'string') {
     return arg

package/lib/versions/0.16.0.js

@@ -1,6 +1,5 @@
 export default {
   version: '0.16.0',
-  toVersion: '0.17.0',
   up (config) {
     let kind = 'service'
     // This file will be reused in platformatic/db

package/lib/versions/0.28.0.js

@@ -1,6 +1,5 @@
 export default {
   version: '0.28.0',
-  toVersion: '1.99.0',
   up (config) {
     if (config.watch !== false) {
       config.watch = typeof config.watch === 'object' ? config.watch : true

package/lib/versions/2.0.0.js

@@ -2,7 +2,6 @@ import { version } from '../schema.js'
 
 export default {
   version: '2.0.0',
-  toVersion: version,
   up (config) {
     if (typeof config.allowCycles === 'boolean') {
       delete config.allowCycles

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,6 +1,6 @@
 {
   "name": "@platformatic/service",
-  "version": "3.0.0-alpha.1",
+  "version": "3.0.0-alpha.2",
   "description": "",
   "main": "index.js",
   "types": "index.d.ts",
@@ -27,9 +27,8 @@
     "pino-abstract-transport": "^2.0.0",
     "self-cert": "^2.0.0",
     "split2": "^4.2.0",
-    "strip-ansi": "^7.1.0",
     "typescript": "^5.5.4",
-    "undici": "7.10.0",
+    "undici": "7.11.0",
     "vscode-json-languageservice": "^5.3.9",
     "why-is-node-running": "^2.2.2",
     "yaml": "^2.4.1"
@@ -43,7 +42,7 @@
     "@fastify/static": "^8.0.0",
     "@fastify/swagger": "^9.0.0",
     "@fastify/under-pressure": "^9.0.0",
-    "@scalar/fastify-api-reference": "1.31.14",
+    "@scalar/fastify-api-reference": "1.33.0",
     "@types/node": "^22.10.6",
     "@types/ws": "^8.5.10",
     "ajv": "^8.12.0",
@@ -51,10 +50,8 @@
     "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",
     "env-schema": "^6.0.0",
-    "es-main": "^1.3.0",
     "execa": "^9.0.0",
     "fast-json-patch": "^3.1.1",
     "fastify": "^5.0.0",
@@ -65,19 +62,20 @@
     "minimist": "^1.2.8",
     "my-ua-parser": "^2.0.2",
     "ora": "^6.3.1",
-    "pino": "^9.0.0",
+    "pino": "^9.9.0",
     "pino-pretty": "^13.0.0",
     "rfdc": "^1.3.1",
     "semgrator": "^0.3.0",
     "undici": "^7.0.0",
-    "@platformatic/basic": "3.0.0-alpha.1",
-    "@platformatic/generators": "3.0.0-alpha.1",
-    "@platformatic/metrics": "3.0.0-alpha.1",
-    "@platformatic/telemetry": "3.0.0-alpha.1",
-    "@platformatic/scalar-theme": "3.0.0-alpha.1",
-    "@platformatic/ts-compiler": "3.0.0-alpha.1",
-    "@platformatic/client": "3.0.0-alpha.1",
-    "@platformatic/utils": "3.0.0-alpha.1"
+    "@platformatic/basic": "3.0.0-alpha.2",
+    "@platformatic/generators": "3.0.0-alpha.2",
+    "@platformatic/metrics": "3.0.0-alpha.2",
+    "@platformatic/scalar-theme": "3.0.0-alpha.2",
+    "@platformatic/telemetry": "3.0.0-alpha.2",
+    "@platformatic/foundation": "3.0.0-alpha.2"
+  },
+  "engines": {
+    "node": ">=22.18.0"
   },
   "scripts": {
     "test": "pnpm run lint && borp --concurrency=1 --timeout 1200000 --no-typescript",

package/schema.json

@@ -1,6 +1,6 @@
 {
-  "$id": "https://schemas.platformatic.dev/@platformatic/service/3.0.0-alpha.1.json",
-  "version": "3.0.0-alpha.1",
+  "$id": "https://schemas.platformatic.dev/@platformatic/service/3.0.0-alpha.2.json",
+  "version": "3.0.0-alpha.2",
   "title": "Platformatic Service Config",
   "type": "object",
   "properties": {
@@ -629,45 +629,6 @@
               }
             ]
           }
-        },
-        "typescript": {
-          "anyOf": [
-            {
-              "type": "object",
-              "properties": {
-                "enabled": {
-                  "anyOf": [
-                    {
-                      "type": "boolean"
-                    },
-                    {
-                      "type": "string"
-                    }
-                  ]
-                },
-                "tsConfig": {
-                  "type": "string",
-                  "resolvePath": true
-                },
-                "outDir": {
-                  "type": "string",
-                  "resolvePath": true
-                },
-                "flags": {
-                  "type": "array",
-                  "items": {
-                    "type": "string"
-                  }
-                }
-              }
-            },
-            {
-              "type": "boolean"
-            },
-            {
-              "type": "string"
-            }
-          ]
         }
       },
       "additionalProperties": false,
@@ -864,6 +825,13 @@
     "module": {
       "type": "string"
     },
+    "application": {
+      "type": "object",
+      "properties": {},
+      "additionalProperties": false,
+      "required": [],
+      "default": {}
+    },
     "service": {
       "type": "object",
       "properties": {
@@ -1025,48 +993,6 @@
       },
       "additionalProperties": false
     },
-    "clients": {
-      "type": "array",
-      "items": {
-        "type": "object",
-        "properties": {
-          "serviceId": {
-            "type": "string"
-          },
-          "name": {
-            "type": "string"
-          },
-          "type": {
-            "type": "string",
-            "enum": [
-              "openapi",
-              "graphql"
-            ]
-          },
-          "path": {
-            "type": "string",
-            "resolvePath": true
-          },
-          "schema": {
-            "type": "string",
-            "resolvePath": true
-          },
-          "url": {
-            "type": "string"
-          },
-          "fullResponse": {
-            "type": "boolean"
-          },
-          "fullRequest": {
-            "type": "boolean"
-          },
-          "validateResponse": {
-            "type": "boolean"
-          }
-        },
-        "additionalProperties": false
-      }
-    },
     "runtime": {
       "type": "object",
       "properties": {

package/lib/plugins/clients.js

@@ -1,17 +0,0 @@
-import client from '@platformatic/client'
-import { kMetadata } from '@platformatic/utils'
-import fp from 'fastify-plugin'
-import { createRequire } from 'node:module'
-import { resolve } from 'node:path'
-async function setupClientsPlugin (app, opts) {
-  for (const { path, url, serviceId, name, schema, type, fullRequest, fullResponse, validateResponse } of opts) {
-    if (path) {
-      const require = createRequire(resolve(app.platformatic.config[kMetadata].root, 'noop.js'))
-      app.register(await require(path), { url, serviceId })
-    } else {
-      app.register(client, { url, serviceId, name, path: schema, type, fullRequest, fullResponse, validateResponse })
-    }
-  }
-}
-
-export const setupClients = fp(setupClientsPlugin)

package/lib/plugins/typescript.js

@@ -1,17 +0,0 @@
-import compiler from '@platformatic/ts-compiler'
-import { kMetadata } from '@platformatic/utils'
-import fp from 'fastify-plugin'
-
-async function setupTsCompilerPlugin (app, context) {
-  const config = app.platformatic.config
-
-  await compiler.compile({
-    tsConfig: config.plugins?.typescript?.tsConfig,
-    flags: config.plugins?.typescript?.flags,
-    cwd: context?.directory ?? config[kMetadata].root,
-    clean: false,
-    logger: app.log
-  })
-}
-
-export const setupTsCompiler = fp(setupTsCompilerPlugin)