galbe 0.9.0 → 0.10.0

package/bin/commands/build.ts

@@ -9,9 +9,16 @@ import { CWD, fmtVal, silentExec } from '../util'
 import { Galbe } from '../../src'
 import { defineRoutes, GalbeProxy } from '../../src/routes'
 import { BuildConfig } from 'bun'
+import { existsSync } from 'fs'
 
 const createBuildIndex = async (indexPath: string, g: Galbe, buildId: string) => {
   const buildPath = resolve(tmpdir(), buildId)
+  const indexDir = dirname(indexPath)
+
+  let configPath = ''
+  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 } }>()
   let errors: any[] = []
   // Create GalbeProxy here
@@ -30,6 +37,9 @@ const createBuildIndex = async (indexPath: string, g: Galbe, buildId: string) =>
 
   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 ? `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` +
@@ -92,10 +102,10 @@ export default (cmd: Command) => {
 
       const buildConfig: BuildConfig = {
         publicPath: `${outPath}/`,
-        ...Object.fromEntries(Object.entries(bunfig).filter(([k, v]) => v)),
+        sourcemap: 'external',
+        ...Object.fromEntries(Object.entries(bunfig).filter(([_, v]) => v)),
         entrypoints: [buildIndex],
         outdir: outPath,
-        sourcemap: 'external',
         target: 'bun',
       }
 

package/bin/commands/dev.ts

@@ -1,11 +1,13 @@
 import { $ } from 'bun'
 import { Command, Option } from 'commander'
-import { resolve } from 'path'
+import { resolve, dirname } from 'path'
 
-import { CWD, fmtInterval, fmtVal, instanciateRoutes, killPort, watchDir } from '../util'
+import { CWD, fmtInterval, fmtVal, instanciateRoutes, watchDir } from '../util'
 import { Galbe } from '../../src'
+import { softMerge } from '../../src/util'
+import { existsSync } from 'fs'
 
-const defaultPort = 3000
+const DEFAULT_PORT = 3000
 
 export default (cmd: Command) => {
   cmd
@@ -18,29 +20,29 @@ export default (cmd: Command) => {
           console.log(`error: port range must be between ${fmtInterval(1, 65535)}`)
           process.exit(1)
         })
-        .default(null, fmtVal(defaultPort))
+        .default(null, fmtVal(DEFAULT_PORT))
     )
-    .addOption(new Option('-w, --watch <dir>', 'watch file changes').default(false, fmtVal(false)))
+    .addOption(new Option('-w, --watch [dir]', 'watch file changes').default(false, fmtVal(false)))
     .addOption(new Option('-wi, --watchignore <regexp>', 'ignore file changes').default(false, fmtVal(false)))
     .addOption(new Option('-nc, --noclear', "don't clear on file changes").default(false, fmtVal(false)))
-    .addOption(
-      new Option('-f, --force', 'kills any process running on defined port before strating the server').default(
-        false,
-        fmtVal(false)
-      )
-    )
     .action(async (index, props) => {
-      const { port, watch, watchignore, noclear, force } = props
-      let watch_dir = typeof watch === 'string' ? watch : CWD
-      const clear = !noclear
+      const { port, watch, watchignore, noclear } = props
       const indexPath = resolve(CWD, index)
+      const indexDir = dirname(indexPath)
+      let watch_dir = typeof watch === 'string' ? watch : watch ? indexDir : ''
+      const clear = !noclear
+      let galbeConfig = {}
       let g: Galbe
 
-      if (!Bun.env.BUN_ENV) Bun.env.BUN_ENV = 'development'
+      if (existsSync(`${indexDir}/galbe.config.ts`)) {
+        galbeConfig = (await import(`${indexDir}/galbe.config.ts`)).default
+      } else if (existsSync(`${indexDir}/galbe.config.js`)) {
+        galbeConfig = (await import(`${indexDir}/galbe.config.js`)).default
+      }
 
-      if (force) await killPort(port || 3000)
+      if (!Bun.env.BUN_ENV) Bun.env.BUN_ENV = 'development'
 
-      if (!!watch) {
+      if (!!watch_dir) {
         await watchDir(
           watch_dir,
           async () => {
@@ -55,8 +57,10 @@ export default (cmd: Command) => {
         )
       }
 
-      if (!!watch && clear) await $`clear`
+      if (!!watch_dir && clear) await $`clear`
       g = (await import(indexPath)).default
+      let conf = g.config
+      g.config = softMerge(galbeConfig, conf)
       await instanciateRoutes(g)
       await g.listen(port)
     })

package/bin/commands/generate/code/openapi.parser.ts

@@ -282,7 +282,7 @@ const parseEndpointDef = (method: string, path: string, def?: OpenAPIV3.Operatio
   )
 
   let body = ''
-  if(!['get', 'options', 'head'].includes(method)){
+  if(!['get', 'delete', 'options', 'head'].includes(method)){
     let _rb = def?.requestBody as OpenAPIV3.ReferenceObject
     if (_rb?.$ref) {
       body = unref(`  body: %ref:${_rb.$ref}%`, m => {

package/bin/commands/generate/spec.ts

@@ -1,9 +1,11 @@
 import { Command, Option } from 'commander'
 import { resolve, relative, extname } from 'path'
 import { dump as ymlDump, load as ymlLoad } from 'js-yaml'
-import { CWD, fmtList, instanciateRoutes, silentExec, softMerge } from '../../util'
+import { CWD, fmtList, instanciateRoutes, silentExec } from '../../util'
 import { Galbe } from '../../../src'
 import { OpenAPISerializer } from '../../../src/extras'
+import { softMerge } from '../../../src/util'
+import { OpenAPIV3 } from 'openapi-types'
 
 const specTargets = ['openapi:3.0:json', 'openapi:3.0:yaml']
 const parsePckgAuthoRgx = /^\s*([^<(]*)(?:<([^>]+)>)?\s*(?:\(([^)]*)\))?\s*$/
@@ -85,7 +87,7 @@ export default (cmd: Command) => {
             version: pckg?.version || '0.1.0'
           }
         }
-        openapiSpec = softMerge(openapiSpec, baseSpec)
+        openapiSpec = softMerge(openapiSpec, baseSpec) as OpenAPIV3.Document
         Bun.write(resolve(CWD, out), tFormat === 'json' ? JSON.stringify(openapiSpec, null, 2) : ymlDump(openapiSpec))
       }
 

package/bin/util.ts

@@ -1,8 +1,8 @@
 import { relative } from 'path'
 import { watch } from 'chokidar'
-import { Galbe, Route } from '../src'
+import { Galbe, type Route } from '../src'
 import { logRoute, walkRoutes } from '../src/util'
-import { GalbeProxy, RouteMeta, defineRoutes } from '../src/routes'
+import { GalbeProxy, type RouteMeta, defineRoutes } from '../src/routes'
 
 export { default as pckg } from '../package.json'
 
@@ -15,7 +15,7 @@ export const fmtVal = (v: any) => {
   if (typeof v === 'number') return `\x1b[36m${v}\x1b[0m`
   return v
 }
-export const fmtList = (l: any) => `[${l.map(v => fmtVal(v)).join(', ')}]`
+export const fmtList = (l: any) => `[${l.map((v:any) => fmtVal(v)).join(', ')}]`
 export const fmtInterval = (a: any, b: any) => `[${fmtVal(a)}-${fmtVal(b)}]`
 
 export const silentExec = async (fn: () => any) => {
@@ -95,16 +95,6 @@ export const instanciateRoutes = async (g: Galbe) => {
   console.log('\x1b[1;30m\x1b[32mdone\x1b[0m\n')
 }
 
-export const softMerge = (base, override) => {
-  for (const key in override) {
-    if (override[key] instanceof Object && !(override[key] instanceof Array)) {
-      if (!base[key]) Object.assign(base, { [key]: {} })
-      softMerge(base[key], override[key])
-    } else Object.assign(base, { [key]: override[key] })
-  }
-  return base
-}
-
 export const killPort = async (port: number) => {
   let getProcCmd: string[], killCmd: (port: string) => string[]