@platformatic/astro 2.72.0 → 3.0.0-alpha.1

package/config.d.ts

@@ -5,7 +5,7 @@
  * and run json-schema-to-typescript to regenerate this file.
  */
 
-export interface PlatformaticAstroStackable {
+export interface PlatformaticAstroConfig {
   $schema?: string;
   logger?: {
     level: (

package/index.js

@@ -1,342 +1,31 @@
-import middie from '@fastify/middie'
-import fastifyStatic from '@fastify/static'
-import {
-  BaseStackable,
-  transformConfig as basicTransformConfig,
-  cleanBasePath,
-  createServerListener,
-  ensureTrailingSlash,
-  errors,
-  getServerUrl,
-  importFile,
-  resolvePackage,
-  schemaOptions
-} from '@platformatic/basic'
-import { ConfigManager } from '@platformatic/config'
-import { features } from '@platformatic/utils'
-import fastify from 'fastify'
-import { existsSync } from 'node:fs'
-import { readFile, writeFile } from 'node:fs/promises'
-import { dirname, resolve } from 'node:path'
-import { satisfies } from 'semver'
-import { packageJson, schema } from './lib/schema.js'
-
-const supportedVersions = '^4.0.0 || ^5.0.0'
-
-export class AstroStackable extends BaseStackable {
-  #astro
-  #app
-  #server
-  #basePath
-
-  constructor (options, root, configManager) {
-    super('astro', packageJson.version, options, root, configManager)
-  }
-
-  async init () {
-    if (this.isProduction) {
-      return
-    }
-
-    this.#astro = resolve(dirname(resolvePackage(this.root, 'astro')), '../..')
-    const astroPackage = JSON.parse(await readFile(resolve(this.#astro, 'package.json'), 'utf-8'))
-
-    if (!satisfies(astroPackage.version, supportedVersions)) {
-      throw new errors.UnsupportedVersion('astro', astroPackage.version, supportedVersions)
-    }
-  }
-
-  async start ({ listen }) {
-    // Make this idempotent
-    if (this.url) {
-      return this.url
-    }
-
-    if (this.isProduction) {
-      await this.#startProduction(listen)
-    } else {
-      await this.#startDevelopment(listen)
-    }
-
-    await this._collectMetrics()
-  }
-
-  async stop () {
-    if (this.childManager) {
-      return this.stopCommand()
-    }
-
-    return this.isProduction ? this.#app.close() : this.#app.stop()
-  }
-
-  async build () {
-    const config = this.configManager.current
-    const command = config.application.commands.build
-    const configFile = config.astro.configFile // Note: Astro expect this to be a relative path to the root
-    let basePath = config.application?.basePath
-      ? ensureTrailingSlash(cleanBasePath(config.application?.basePath))
-      : undefined
-
-    if (command) {
-      return this.buildWithCommand(command, basePath)
-    }
-
-    await this.init()
-    const { build } = await importFile(resolve(this.#astro, 'dist/core/index.js'))
-
-    try {
-      globalThis.platformatic.isBuilding = true
-
-      await build({
-        root: this.root,
-        base: basePath,
-        outDir: config.application.outputDirectory,
-        mode: 'production',
-        configFile,
-        logLevel: this.logger.level,
-        integrations: [
-          {
-            name: 'platformatic',
-            hooks: {
-              'astro:config:done': ({ config }) => {
-                basePath = ensureTrailingSlash(cleanBasePath(config.base))
-              }
-            }
-          }
-        ]
-      })
-    } finally {
-      globalThis.platformatic.isBuilding = false
-    }
-
-    await writeFile(
-      resolve(this.root, config.application.outputDirectory, '.platformatic-build.json'),
-      JSON.stringify({ basePath }),
-      'utf-8'
-    )
-  }
-
-  /* c8 ignore next 5 */
-  async getWatchConfig () {
-    return {
-      enabled: false
-    }
-  }
-
-  getMeta () {
-    const config = this.subprocessConfig ?? this.#app?.config
-
-    const composer = {
-      tcp: typeof this.url !== 'undefined',
-      url: this.url,
-      prefix: this.basePath ?? config?.base ?? this.#basePath,
-      wantsAbsoluteUrls: true,
-      needsRootTrailingSlash: true,
-      needsRefererBasedRedirect: !this.isProduction
-    }
-
-    return { composer }
-  }
-
-  // This is only used in non SSR production mode as in other modes a TCP server is started
-  async inject (injectParams, onInject) {
-    const res = await this.#app.inject(injectParams, onInject)
-
-    /* c8 ignore next 3 */
-    if (onInject) {
-      return
-    }
-
-    // Since inject might be called from the main thread directly via ITC, let's clean it up
-    const { statusCode, headers, body, payload, rawPayload } = res
-    return { statusCode, headers, body, payload, rawPayload }
-  }
-
-  async #startDevelopment () {
-    // Make this idempotent
-    if (this.url) {
-      return this.url
-    }
-
-    const config = this.configManager.current
-    const command = this.configManager.current.application.commands.development
-
-    this.#basePath = config.application?.basePath
-      ? ensureTrailingSlash(cleanBasePath(config.application?.basePath))
-      : undefined
-
-    this.registerGlobals({ basePath: this.#basePath })
-
-    if (command) {
-      return this.startWithCommand(command)
-    }
-
-    // Prepare options
-    const { hostname, port } = this.serverConfig ?? {}
-    const configFile = config.astro.configFile // Note: Astro expect this to be a relative path to the root
-
-    const serverOptions = {
-      host: hostname || '127.0.0.1',
-      port: port || 0
-    }
-
-    // Require Astro
-    const serverPromise = createServerListener(
-      (this.isEntrypoint ? serverOptions?.port : undefined) ?? true,
-      (this.isEntrypoint ? serverOptions?.hostname : undefined) ?? true
-    )
-    const { dev } = await importFile(resolve(this.#astro, 'dist/core/index.js'))
-
-    // Create the server and listen
-    this.#app = await dev({
-      root: this.root,
-      base: this.#basePath,
-      mode: 'development',
-      configFile,
-      logLevel: this.logger.level,
-      server: serverOptions,
-      vite: {
-        server: {
-          allowedHosts: ['.plt.local']
-        }
-      },
-      integrations: [
-        {
-          name: 'platformatic',
-          hooks: {
-            'astro:config:setup': ({ config }) => {
-              this.#basePath = ensureTrailingSlash(cleanBasePath(config.base))
-
-              /*
-                As Astro generates invalid paths in development mode which ignore the basePath
-                (see https://github.com/withastro/astro/issues/11445), make sure we provide
-                the prefix in HMR path.
-              */
-              config.vite.server ??= {}
-              config.vite.server.hmr ??= {}
-              config.vite.server.hmr.path = `/${this.#basePath}/`.replaceAll(/\/+/g, '/')
-              config.vite.server.fs ??= {}
-              config.vite.server.fs.strict = false
-            }
-          }
-        }
-      ]
-    })
-
-    this.#server = await serverPromise
-    this.url = getServerUrl(this.#server)
-  }
-
-  async #startProduction (listen) {
-    const config = this.configManager.current
-    const command = this.configManager.current.application.commands.production
-    const outputDirectory = config.application.outputDirectory
-
-    this.#basePath = config.application?.basePath
-      ? ensureTrailingSlash(cleanBasePath(config.application?.basePath))
-      : undefined
-
-    this.registerGlobals({ basePath: this.#basePath })
-
-    if (command) {
-      return this.startWithCommand(command)
-    }
-
-    if (this.#app && listen) {
-      const serverOptions = this.serverConfig
-      const listenOptions = { host: serverOptions?.hostname || '127.0.0.1', port: serverOptions?.port || 0 }
-
-      if (this.isProduction && features.node.reusePort) {
-        listenOptions.reusePort = true
-      }
-
-      await this.#app.listen(listenOptions)
-      this.url = getServerUrl(this.#app.server)
-      return this.url
-    }
-
-    this.#app = fastify({ loggerInstance: this.logger })
-
-    const root = resolve(this.root, outputDirectory)
-    this.verifyOutputDirectory(root)
-
-    const buildInfoPath = resolve(root, '.platformatic-build.json')
-
-    if (!this.#basePath && existsSync(buildInfoPath)) {
-      try {
-        const buildInfo = JSON.parse(await readFile(buildInfoPath, 'utf-8'))
-        this.#basePath = buildInfo.basePath
-      } catch (e) {
-        console.log(e)
-      }
-    }
-
-    const ssrEntrypoint = resolve(this.root, outputDirectory, 'server/entry.mjs')
-
-    if (existsSync(ssrEntrypoint)) {
-      const { handler } = await importFile(ssrEntrypoint)
-
-      await this.#app.register(fastifyStatic, {
-        root: resolve(this.root, outputDirectory, 'client'),
-        prefix: this.#basePath,
-        prefixAvoidTrailingSlash: true,
-        schemaHide: true
-      })
-
-      await this.#app.register(middie)
-      await this.#app.use(this.#basePath, handler)
-    } else {
-      await this.#app.register(fastifyStatic, {
-        root,
-        prefix: this.#basePath,
-        prefixAvoidTrailingSlash: true,
-        schemaHide: true
-      })
-    }
-
-    await this.#app.ready()
-  }
+import { transform as basicTransform, resolve, validationOptions } from '@platformatic/basic'
+import { kMetadata, loadConfiguration as utilsLoadConfiguration } from '@platformatic/utils'
+import { schema } from './lib/schema.js'
+import { AstroStackable } from './lib/stackable.js'
+
+/* c8 ignore next 5 */
+export async function transform (config, schema, options) {
+  config = await basicTransform(config, schema, options)
+  config.watch = { enabled: false }
+  return config
 }
 
-/* c8 ignore next 9 */
-function transformConfig () {
-  if (this.current.watch === undefined) {
-    this.current.watch = { enabled: false }
-  }
+export async function loadConfiguration (configOrRoot, sourceOrConfig, context) {
+  const { root, source } = await resolve(configOrRoot, sourceOrConfig, 'application')
 
-  if (typeof this.current.watch !== 'object') {
-    this.current.watch = { enabled: this.current.watch || false }
-  }
-
-  return basicTransformConfig.call(this)
-}
-
-export async function buildStackable (opts) {
-  const root = opts.context.directory
-
-  const configManager = new ConfigManager({
-    schema,
-    source: opts.config ?? {},
-    schemaOptions,
-    transformConfig,
-    dirname: root,
-    context: opts.context
+  return utilsLoadConfiguration(source, context?.schema ?? schema, {
+    validationOptions,
+    transform,
+    replaceEnv: true,
+    root,
+    ...context
   })
-  await configManager.parseAndValidate()
-
-  return new AstroStackable(opts, root, configManager)
 }
 
-export { schema, schemaComponents } from './lib/schema.js'
-
-export default {
-  configType: 'astro',
-  configManagerConfig: {
-    schemaOptions,
-    transformConfig
-  },
-  buildStackable,
-  schema,
-  version: packageJson.version,
-  modulesToLoad: []
+export async function create (configOrRoot, sourceOrConfig, context) {
+  const config = await loadConfiguration(configOrRoot, sourceOrConfig, context)
+  return new AstroStackable(config[kMetadata].root, config, context)
 }
+
+export { packageJson, schema, schemaComponents, version } from './lib/schema.js'
+export * from './lib/stackable.js'

package/lib/schema.js

@@ -1,8 +1,10 @@
 import { schemaComponents as basicSchemaComponents } from '@platformatic/basic'
 import { schemaComponents as utilsSchemaComponents } from '@platformatic/utils'
 import { readFileSync } from 'node:fs'
+import { resolve } from 'node:path'
 
-export const packageJson = JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf-8'))
+export const packageJson = JSON.parse(readFileSync(resolve(import.meta.dirname, '../package.json'), 'utf8'))
+export const version = packageJson.version
 
 export const astro = {
   type: 'object',
@@ -20,7 +22,7 @@ export const schemaComponents = { astro }
 export const schema = {
   $id: `https://schemas.platformatic.dev/@platformatic/astro/${packageJson.version}.json`,
   $schema: 'http://json-schema.org/draft-07/schema#',
-  title: 'Platformatic Astro Stackable',
+  title: 'Platformatic Astro Config',
   type: 'object',
   properties: {
     $schema: {

package/lib/stackable.js

@@ -0,0 +1,298 @@
+import middie from '@fastify/middie'
+import fastifyStatic from '@fastify/static'
+import {
+  BaseStackable,
+  cleanBasePath,
+  createServerListener,
+  ensureTrailingSlash,
+  errors,
+  getServerUrl,
+  importFile,
+  resolvePackage
+} from '@platformatic/basic'
+import { features } from '@platformatic/utils'
+import fastify from 'fastify'
+import { existsSync } from 'node:fs'
+import { readFile, writeFile } from 'node:fs/promises'
+import { dirname, resolve } from 'node:path'
+import { satisfies } from 'semver'
+import { version } from './schema.js'
+
+const supportedVersions = '^4.0.0 || ^5.0.0'
+
+export class AstroStackable extends BaseStackable {
+  #astro
+  #app
+  #server
+  #basePath
+
+  constructor (root, config, context) {
+    super('astro', version, root, config, context)
+  }
+
+  async init () {
+    await super.init()
+
+    if (this.isProduction) {
+      return
+    }
+
+    this.#astro = resolve(dirname(resolvePackage(this.root, 'astro')), '../..')
+    const astroPackage = JSON.parse(await readFile(resolve(this.#astro, 'package.json'), 'utf-8'))
+
+    if (!satisfies(astroPackage.version, supportedVersions)) {
+      throw new errors.UnsupportedVersion('astro', astroPackage.version, supportedVersions)
+    }
+  }
+
+  async start ({ listen }) {
+    // Make this idempotent
+    if (this.url) {
+      return this.url
+    }
+
+    if (this.isProduction) {
+      await this.#startProduction(listen)
+    } else {
+      await this.#startDevelopment(listen)
+    }
+
+    await this._collectMetrics()
+  }
+
+  async stop () {
+    if (this.childManager) {
+      return this.stopCommand()
+    }
+
+    return this.isProduction ? this.#app.close() : this.#app.stop()
+  }
+
+  async build () {
+    const config = this.config
+    const command = config.application.commands.build
+    const configFile = config.astro.configFile // Note: Astro expect this to be a relative path to the root
+    let basePath = config.application?.basePath
+      ? ensureTrailingSlash(cleanBasePath(config.application?.basePath))
+      : undefined
+
+    if (command) {
+      return this.buildWithCommand(command, basePath)
+    }
+
+    await this.init()
+    const { build } = await importFile(resolve(this.#astro, 'dist/core/index.js'))
+
+    try {
+      globalThis.platformatic.isBuilding = true
+
+      await build({
+        root: this.root,
+        base: basePath,
+        outDir: config.application.outputDirectory,
+        mode: 'production',
+        configFile,
+        logLevel: this.logger.level,
+        integrations: [
+          {
+            name: 'platformatic',
+            hooks: {
+              'astro:config:done': ({ config }) => {
+                basePath = ensureTrailingSlash(cleanBasePath(config.base))
+              }
+            }
+          }
+        ]
+      })
+    } finally {
+      globalThis.platformatic.isBuilding = false
+    }
+
+    await writeFile(
+      resolve(this.root, config.application.outputDirectory, '.platformatic-build.json'),
+      JSON.stringify({ basePath }),
+      'utf-8'
+    )
+  }
+
+  /* c8 ignore next 5 */
+  async getWatchConfig () {
+    return {
+      enabled: false
+    }
+  }
+
+  getMeta () {
+    const config = this.subprocessConfig ?? this.#app?.config
+
+    const composer = {
+      tcp: typeof this.url !== 'undefined',
+      url: this.url,
+      prefix: this.basePath ?? config?.base ?? this.#basePath,
+      wantsAbsoluteUrls: true,
+      needsRootTrailingSlash: true,
+      needsRefererBasedRedirect: !this.isProduction
+    }
+
+    return { composer }
+  }
+
+  // This is only used in non SSR production mode as in other modes a TCP server is started
+  async inject (injectParams, onInject) {
+    const res = await this.#app.inject(injectParams, onInject)
+
+    /* c8 ignore next 3 */
+    if (onInject) {
+      return
+    }
+
+    // Since inject might be called from the main thread directly via ITC, let's clean it up
+    const { statusCode, headers, body, payload, rawPayload } = res
+    return { statusCode, headers, body, payload, rawPayload }
+  }
+
+  async #startDevelopment () {
+    // Make this idempotent
+    if (this.url) {
+      return this.url
+    }
+
+    const config = this.config
+    const command = this.config.application.commands.development
+
+    this.#basePath = config.application?.basePath
+      ? ensureTrailingSlash(cleanBasePath(config.application?.basePath))
+      : undefined
+
+    this.registerGlobals({ basePath: this.#basePath })
+
+    if (command) {
+      return this.startWithCommand(command)
+    }
+
+    // Prepare options
+    const { hostname, port } = this.serverConfig ?? {}
+    const configFile = config.astro.configFile // Note: Astro expect this to be a relative path to the root
+
+    const serverOptions = {
+      host: hostname || '127.0.0.1',
+      port: port || 0
+    }
+
+    // Require Astro
+    const serverPromise = createServerListener(
+      (this.isEntrypoint ? serverOptions?.port : undefined) ?? true,
+      (this.isEntrypoint ? serverOptions?.hostname : undefined) ?? true
+    )
+    const { dev } = await importFile(resolve(this.#astro, 'dist/core/index.js'))
+
+    // Create the server and listen
+    this.#app = await dev({
+      root: this.root,
+      base: this.#basePath,
+      mode: 'development',
+      configFile,
+      logLevel: this.logger.level,
+      server: serverOptions,
+      vite: {
+        server: {
+          allowedHosts: ['.plt.local']
+        }
+      },
+      integrations: [
+        {
+          name: 'platformatic',
+          hooks: {
+            'astro:config:setup': ({ config }) => {
+              this.#basePath = ensureTrailingSlash(cleanBasePath(config.base))
+
+              /*
+                As Astro generates invalid paths in development mode which ignore the basePath
+                (see https://github.com/withastro/astro/issues/11445), make sure we provide
+                the prefix in HMR path.
+              */
+              config.vite.server ??= {}
+              config.vite.server.hmr ??= {}
+              config.vite.server.hmr.path = `/${this.#basePath}/`.replaceAll(/\/+/g, '/')
+              config.vite.server.fs ??= {}
+              config.vite.server.fs.strict = false
+            }
+          }
+        }
+      ]
+    })
+
+    this.#server = await serverPromise
+    this.url = getServerUrl(this.#server)
+  }
+
+  async #startProduction (listen) {
+    const config = this.config
+    const command = this.config.application.commands.production
+    const outputDirectory = config.application.outputDirectory
+
+    this.#basePath = config.application?.basePath
+      ? ensureTrailingSlash(cleanBasePath(config.application?.basePath))
+      : undefined
+
+    this.registerGlobals({ basePath: this.#basePath })
+
+    if (command) {
+      return this.startWithCommand(command)
+    }
+
+    if (this.#app && listen) {
+      const serverOptions = this.serverConfig
+      const listenOptions = { host: serverOptions?.hostname || '127.0.0.1', port: serverOptions?.port || 0 }
+
+      if (this.isProduction && features.node.reusePort) {
+        listenOptions.reusePort = true
+      }
+
+      await this.#app.listen(listenOptions)
+      this.url = getServerUrl(this.#app.server)
+      return this.url
+    }
+
+    this.#app = fastify({ loggerInstance: this.logger })
+
+    const root = resolve(this.root, outputDirectory)
+    this.verifyOutputDirectory(root)
+
+    const buildInfoPath = resolve(root, '.platformatic-build.json')
+
+    if (!this.#basePath && existsSync(buildInfoPath)) {
+      try {
+        const buildInfo = JSON.parse(await readFile(buildInfoPath, 'utf-8'))
+        this.#basePath = buildInfo.basePath
+      } catch (e) {
+        console.log(e)
+      }
+    }
+
+    const ssrEntrypoint = resolve(this.root, outputDirectory, 'server/entry.mjs')
+
+    if (existsSync(ssrEntrypoint)) {
+      const { handler } = await importFile(ssrEntrypoint)
+
+      await this.#app.register(fastifyStatic, {
+        root: resolve(this.root, outputDirectory, 'client'),
+        prefix: this.#basePath,
+        prefixAvoidTrailingSlash: true,
+        schemaHide: true
+      })
+
+      await this.#app.register(middie)
+      await this.#app.use(this.#basePath, handler)
+    } else {
+      await this.#app.register(fastifyStatic, {
+        root,
+        prefix: this.#basePath,
+        prefixAvoidTrailingSlash: true,
+        schemaHide: true
+      })
+    }
+
+    await this.#app.ready()
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/astro",
-  "version": "2.72.0",
+  "version": "3.0.0-alpha.1",
   "description": "Platformatic Astro Stackable",
   "main": "index.js",
   "type": "module",
@@ -19,9 +19,8 @@
     "@fastify/static": "^8.0.0",
     "fastify": "^5.0.0",
     "semver": "^7.6.3",
-    "@platformatic/basic": "2.72.0",
-    "@platformatic/config": "2.72.0",
-    "@platformatic/utils": "2.72.0"
+    "@platformatic/basic": "3.0.0-alpha.1",
+    "@platformatic/utils": "3.0.0-alpha.1"
   },
   "devDependencies": {
     "@astrojs/node": "^9.2.0",
@@ -29,17 +28,16 @@
     "borp": "^0.20.0",
     "eslint": "9",
     "json-schema-to-typescript": "^15.0.1",
-    "minimatch": "^10.0.3",
     "neostandard": "^0.12.0",
     "typescript": "^5.5.4",
     "vite": "^5.4.4",
     "ws": "^8.18.0",
-    "@platformatic/composer": "2.72.0",
-    "@platformatic/service": "2.72.0"
+    "@platformatic/composer": "3.0.0-alpha.1",
+    "@platformatic/service": "3.0.0-alpha.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": "npm run lint && borp --concurrency=1 --timeout 1200000",
+    "coverage": "npm run lint && borp -C -X test -X test/fixtures --concurrency=1 --timeout 1200000",
     "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,7 +1,7 @@
 {
-  "$id": "https://schemas.platformatic.dev/@platformatic/astro/2.72.0.json",
+  "$id": "https://schemas.platformatic.dev/@platformatic/astro/3.0.0-alpha.1.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "Platformatic Astro Stackable",
+  "title": "Platformatic Astro Config",
   "type": "object",
   "properties": {
     "$schema": {