galbe 0.15.0 → 0.15.2

package/bin/commands/build.ts

@@ -3,7 +3,7 @@ import { $ } from 'bun'
 import { Command, Option } from 'commander'
 import { resolve, relative, dirname } from 'path'
 import { tmpdir } from 'os'
-import { mkdir, rm, exists } from 'fs/promises'
+import { mkdir, rm } from 'fs/promises'
 
 import { CWD, fmtVal, silentExec } from '../util'
 import { Galbe } from '../../src'
@@ -20,7 +20,7 @@ const createBuildIndex = async (indexPath: string, g: Galbe, buildId: string, ou
   if (existsSync(`${indexDir}/galbe.config.ts`)) configPath = `${indexDir}/galbe.config.ts`
   else if (existsSync(`${indexDir}/galbe.config.js`)) configPath = `${indexDir}/galbe.config.js`
 
-  const routes = new Map<string, { filepath: string, static?: { path: string, root: string } }>()
+  const routes = new Map<string, { filepath: string; static?: { path: string; root: string } }>()
   let errors: any[] = []
   // Create GalbeProxy here
   // use it to define routes
@@ -45,15 +45,19 @@ const createBuildIndex = async (indexPath: string, g: Galbe, buildId: string, ou
 
   let buildIndex =
     `import galbe from '${relative(buildPath, indexPath)}';\n` +
-    (configPath ? `import config from '${relative(buildPath, configPath)}';\n` : '') + 
-    (configPath ? `import {softMerge} from '${relative(buildPath, `${indexDir}/node_modules/galbe/src/util`)}';\n` : '') +
+    (configPath ? `import config from '${relative(buildPath, configPath)}';\n` : '') +
+    (configPath
+      ? `import {softMerge} from '${relative(buildPath, `${indexDir}/node_modules/galbe/src/util`)}';\n`
+      : '') +
     (configPath ? `let conf = galbe.config;\ngalbe.config = softMerge(config, conf)\n` : '') +
     `${[...routes.values()].map((r, idx) => `import _${idx} from '${relative(buildPath, r.filepath)}'`).join(';\n')}\n` +
     `Bun.env.BUN_ENV = 'production';\n` +
     `Bun.env.GALBE_BUILD = '${buildId}';\n` +
     `galbe.meta = ${JSON.stringify(g.meta)};\n` +
     `${[...routes].map((_, idx) => `_${idx}(galbe)`).join(';\n')};\n` +
-    `galbe.listen();\n`
+    `galbe.listen();\n` +
+    `process.on('SIGTERM', () => galbe.stop());\n` +
+    `process.on('SIGINT', () => galbe.stop());\n`
 
   await Bun.write(resolve(buildPath, 'index.ts'), buildIndex)
 
@@ -86,7 +90,7 @@ export default (cmd: Command) => {
 
       const bunfig = config ? (await import(resolve(CWD, config)))?.default || {} : {}
 
-      if(await exists(outPath)) await rm(outPath, { recursive: true })
+      if (existsSync(outPath)) await rm(outPath, { recursive: true })
 
       let error = null
       Bun.write(Bun.stdout, '📦 \x1b[1;30mBuilding \x1b[36mGalbe\x1b[0m\x1b[1;30m app\x1b[0m')
@@ -134,7 +138,7 @@ export default (cmd: Command) => {
         console.log(...bo.logs)
       }
       if (compile) {
-        await $`bun build --compile ${resolve(CWD, out, 'index.js')} --outfile ${outPath}/bin`
+        await $`bun build --compile --minify --sourcemap --bytecode ${resolve(CWD, out, 'index.js')} --outfile ${outPath}/bin`
       }
 
       await rm(dirname(buildIndex), { recursive: true })

package/bin/commands/generate/cli/index.ts

@@ -157,7 +157,7 @@ export default (cmd: Command) => {
         })
       }
 
-      Bun.write(Bun.stdout, ' : \x1b[1;30m\x1b[32mdone\x1b[0m\n')
+      Bun.write(Bun.stdout, ` : \x1b[1;30m\x1b[32mdone\x1b[0m\nCLI ${mode} generated at ${out}\n`)
       process.exit(0)
     })
 }

package/bin/commands/generate/cli/targets/cac.ts

@@ -177,7 +177,7 @@ function generateSingleCommand(c: GalbeCLICommand, cliVar: string, includeTag: b
     .map(o => {
       const cleanName = sanitizeOptionName(o.name)
       const short = o.short && !builtinShorts.has(o.short) ? `-${o.short}, ` : ''
-      const optType = o.type || '[string]'
+      const optType = o.type != null ? o.type : '[string]'
       const defVal = o.default !== undefined ? `, { default: ${serializeValue(o.default)} }` : ''
       return `  .option('${short}--${cleanName} ${optType}', ${JSON.stringify(o.description || o.name)}${defVal})`
     })

package/bin/commands/generate/code.ts

@@ -2,7 +2,8 @@ import { $ } from 'bun'
 import { devNull } from 'os'
 import { Command, Option } from 'commander'
 import { resolve, relative, extname } from 'path'
-import { exists, readFile } from 'fs/promises'
+import { readFile } from 'fs/promises'
+import { existsSync } from 'fs'
 
 import { CWD, fmtList, fmtVal } from '../../util'
 import { applyPlan, planFromOapi, type GenerationPlan } from './code/openapi.parser'
@@ -114,10 +115,17 @@ export default (cmd: Command) => {
       const outDir = resolve(CWD, out)
 
       // Compute per-scope merge result.
-      const mergeResults: { scopeKey: string; content: string; added: RouteId[]; updated: RouteId[]; removed: RouteId[]; stale: RouteId[] }[] = []
+      const mergeResults: {
+        scopeKey: string
+        content: string
+        added: RouteId[]
+        updated: RouteId[]
+        removed: RouteId[]
+        stale: RouteId[]
+      }[] = []
       for (const scope of plan.scopes) {
         const routePath = resolve(outDir, `${scope.routeFile}.${target}`)
-        const existing = (await exists(routePath)) ? await readFile(routePath, 'utf-8') : null
+        const existing = existsSync(routePath) ? await readFile(routePath, 'utf-8') : null
         const r = mergeRouteFile(existing, scope, mergeOpts)
         mergeResults.push({ scopeKey: scope.scopeKey, ...r })
       }

package/bin/res/client.runtime.ts

@@ -1,4 +1,5 @@
 // Inlined into the generated client — no exports
+import type { BodyInit } from 'bun'
 
 type GalbeClientConfig = {
   server?: { url?: string }
@@ -120,9 +121,7 @@ class GalbeRequest<T, E = any> {
     return this.#getMain().then(onfulfilled, onrejected)
   }
 
-  catch<R = never>(
-    onrejected?: ((reason: any) => R | PromiseLike<R>) | null
-  ): Promise<T | R> {
+  catch<R = never>(onrejected?: ((reason: any) => R | PromiseLike<R>) | null): Promise<T | R> {
     return this.#getMain().then(undefined, onrejected)
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "galbe",
-  "version": "0.15.0",
+  "version": "0.15.2",
   "description": "Fast, lightweight and highly customizable JavaScript web framework based on Bun",
   "author": "Pierre Caillaud M (https://github.com/pierre-cm)",
   "type": "module",
@@ -35,11 +35,10 @@
   "scripts": {
     "test": "bun test",
     "typecheck": "tsc --noEmit --emitDeclarationOnly false",
-    "postinstall": "bun run ./scripts/postinstall.ts",
     "release": "release-it"
   },
   "devDependencies": {
-    "@types/bun": "^1.2.22",
+    "@types/bun": "latest",
     "openapi-types": "^12.1.3",
     "release-it": "^17.1.1"
   },

package/src/index.ts

@@ -35,7 +35,7 @@ const overloadDiscriminer = <
   P extends Partial<STParams<Path>>,
   Q extends STQuery,
   B extends STBody,
-  R extends STResponse
+  R extends STResponse,
 >(
   galbe: Galbe,
   method: M,
@@ -69,7 +69,7 @@ const galbeMethod = <
   P extends Partial<STParams<Path>>,
   Q extends STQuery,
   B extends STBody,
-  R extends STResponse
+  R extends STResponse,
 >(
   _galbe: Galbe,
   method: M,
@@ -130,7 +130,7 @@ export class Galbe {
   stopCb: (() => void)[] = []
   errorCb: ErrorHandler[] = []
   listening: boolean = false
-  server?: Server
+  server?: Server<any>
   plugins: GalbePlugin[] = []
   constructor(config?: GalbeConfig) {
     this.config = config ?? {}
@@ -186,7 +186,7 @@ export class Galbe {
     H extends STHeaders,
     Q extends STQuery,
     B extends STBody,
-    R extends STResponse
+    R extends STResponse,
   >(
     path: Path,
     arg2:
@@ -205,7 +205,7 @@ export class Galbe {
     H extends STHeaders,
     Q extends STQuery,
     B extends STBody,
-    R extends STResponse
+    R extends STResponse,
   >(
     path: Path,
     arg2:
@@ -223,7 +223,7 @@ export class Galbe {
     H extends STHeaders,
     Q extends STQuery,
     B extends STBody,
-    R extends STResponse
+    R extends STResponse,
   >(
     path: Path,
     arg2:
@@ -241,7 +241,7 @@ export class Galbe {
     H extends STHeaders,
     Q extends STQuery,
     B extends STBody,
-    R extends STResponse
+    R extends STResponse,
   >(
     path: Path,
     arg2:
@@ -259,7 +259,7 @@ export class Galbe {
     H extends STHeaders,
     Q extends STQuery,
     B extends STBody,
-    R extends STResponse
+    R extends STResponse,
   >(
     path: Path,
     arg2:
@@ -277,7 +277,7 @@ export class Galbe {
     H extends STHeaders,
     Q extends STQuery,
     B extends STBody,
-    R extends STResponse
+    R extends STResponse,
   >(
     path: Path,
     arg2:
@@ -295,7 +295,7 @@ export class Galbe {
     H extends STHeaders,
     Q extends STQuery,
     B extends STBody,
-    R extends STResponse
+    R extends STResponse,
   >(
     path: Path,
     arg2:

package/src/types.ts

@@ -1,4 +1,4 @@
-import type { ServeOptions, SocketAddress, TLSOptions, TLSServeOptions } from 'bun'
+import type { Serve, SocketAddress, TLSOptions } from 'bun'
 import type {
   STAny,
   STArray,
@@ -140,7 +140,7 @@ export type GalbeConfig = {
   basePath?: string
   /** Enable or disable TLS support. */
   tls?: TLSOptions
-  server?: Exclude<ServeOptions, 'port'> | TLSServeOptions
+  server?: Exclude<Serve.Options<any>, 'port'> | TLSOptions
   /** A Glob Pattern or a list of Glob patterns defining the route files to be analyzed by the Automatic Route Analyzer. */
   routes?: boolean | string | string[]
   router?: { cacheEnabled: boolean }
@@ -343,7 +343,7 @@ export class RequestError extends Error {
     const message =
       typeof options.payload === 'string'
         ? options.payload
-        : HttpStatus[status as keyof typeof HttpStatus] ?? 'Request Error'
+        : (HttpStatus[status as keyof typeof HttpStatus] ?? 'Request Error')
     super(message)
     this.name = new.target?.name ?? 'RequestError'
     this.status = status

package/scripts/hooks/prepare-commit-msg

@@ -1,10 +0,0 @@
-#!/usr/bin/env bun
-
-const COMMIT_MSG = await Bun.file(Bun.argv[2]).text()
-const COMMIT_EMOJI = { feat: '✨', fix: '🔧', doc: '📚', chore: '🧹' }
-
-const newCommitMsg = COMMIT_MSG.replace(/^(feat|fix|doc|chore):(.*)/, (_, type, msg) => {
-  return `${COMMIT_EMOJI[type]} ${type}:${msg}`
-})
-
-await Bun.write(Bun.argv[2], newCommitMsg)

package/scripts/postinstall.ts

@@ -1,9 +0,0 @@
-import { $ } from 'bun'
-import { existsSync } from 'fs'
-
-if (existsSync('.git')) {
-  console.log('Setting up dev environment')
-  Bun.write('.git/hooks/prepare-commit-msg', Bun.file('scripts/hooks/prepare-commit-msg'))
-  await $`chmod +x .git/hooks/prepare-commit-msg`
-  console.log('done')
-}