chore: wip

Author: chrisbbreuer

routes/api.ts

@@ -18,20 +18,22 @@ await route.get('/welcome', () => {
   }
 })
 
-route.get('/hello/world', () => 'hello world, buddy') // stacksjs.org/api/hello/world
+await route.get('/hello/world', () => 'hello world, buddy') // stacksjs.org/api/hello/world
+await route.get('/buddy/versions', 'Actions/Buddy/VersionsAction')
+await route.get('/buddy/commands', 'Actions/Buddy/CommandsAction')
 
-// route.group('/buddy', () => { // you may group your routes in a few different ways
-//   route.get('/commands', 'Actions/Buddy/CommandsAction')
+// await route.group('/buddy', async () => { // you may group your routes in a few different ways
+//   await route.get('/commands', 'Actions/Buddy/CommandsAction')
 
 //   // nested groups are also supported
-//   route.group({ prefix: 'commands' }, () => {
-//     route.get('/example-two', import('Actions/Buddy/CommandsAction')) // or import the action directly
+//   await route.group({ prefix: 'commands' }, async () => {
+//     await route.get('/example-two', import('Actions/Buddy/CommandsAction')) // or import the action directly
 //   })
 
-//   route.get('/versions', '../app/Actions/Buddy/VersionsAction') // a relative path is accepted as well
+//   await route.get('/versions', '../app/Actions/Buddy/VersionsAction') // a relative path is accepted as well
 // })
 
-// route.action('/example') // the equivalent of route.get('/example', 'ExampleAction')
-// route.job('/example-two') // the equivalent of route.get('/example-two', 'ExampleTwoJob')
+// await route.action('/example') // the equivalent of route.get('/example', 'ExampleAction')
+// await route.job('/example-two') // the equivalent of route.get('/example-two', 'ExampleTwoJob')
 
-route.health() // adds an `/api/health` route
+await route.health() // adds an `/api/health` route

storage/framework/core/api/package.json

@@ -52,7 +52,6 @@
     "@stacksjs/utils": "workspace:*"
   },
   "dependencies": {
-    "@flareapp/flare-client": "^3.0.5",
     "@stacksjs/utils": "workspace:*",
     "ofetch": "^1.3.3"
   },

storage/framework/core/api/src/index.ts

@@ -1,5 +1,6 @@
 import { ofetch } from 'ofetch'
 import type { FetchOptions } from 'ofetch'
+
 interface Params {
   [key: string]: any // Replace 'any' with more specific types if possible
 }

storage/framework/core/router/src/router.ts

@@ -141,6 +141,9 @@ export class Router implements RouterInterface {
   }
 
   public group(options: string | RouteGroupOptions, callback?: () => void): this {
+    if (typeof options === 'string')
+      options = options.startsWith('/') ? options.slice(1) : options
+
     let cb: () => void
 
     this.prepareGroupPrefix(options)
@@ -149,14 +152,13 @@ export class Router implements RouterInterface {
       cb = options
       options = {}
     }
-    else {
-      if (!callback)
-        throw new Error('Missing callback function for your route group.')
 
-      cb = callback
-    }
+    if (!callback)
+      throw new Error('Missing callback function for your route group.')
+
+    cb = callback
 
-    const { prefix = '', middleware = [] } = options as RouteGroupOptions
+    const { prefix, middleware = [] } = options as RouteGroupOptions
 
     // Save a reference to the original routes array
     const originalRoutes = this.routes

storage/framework/core/types/src/ui.ts

@@ -1,8 +1,10 @@
 import type { UserShortcuts } from 'unocss'
+import type { UserConfig } from '@unocss/core'
 
 export type Font = 'inter' | 'mona' | 'hubot'
 export type Icon = 'heroicons'
 export type WebFontsProviders = 'google' | 'bunny' | 'fontshare'
+export type Shortcuts = UserShortcuts
 
 export interface FontInfo {
   title: string
@@ -161,17 +163,21 @@ export interface UiOptions {
   icons: Icon | Icon[]
   // icons: Record<string, () => Promise<any>>
 
-  theme: {
-    colors: Record<string, string>
-    fontSize: Record<string, string>
-    spacing: Record<string, string>
-  }
+  theme: UserConfig['theme']
+  // plugins: UserConfig['plugins']
+  // corePlugins: UserConfig['corePlugins']
+  variants: UserConfig['variants']
+  layers: UserConfig['layers']
+  // darkMode: UserConfig['darkMode']
+  // extend: UserConfig['extend']
+  // screens: UserConfig['screens']
+  // spacing: UserConfig['spacing']
+  // backgroundColor: UserConfig['backgroundColor']
+  // backgroundImage: UserConfig['backgroundImage']
 }
 
 export type UiConfig = Partial<UiOptions>
 
-export type Shortcuts = UserShortcuts
-
 /**
  * **Style Reset — Preset**
  *

storage/framework/server/.dockerignore

@@ -13,3 +13,4 @@ helm-charts
 .editorconfig
 .idea
 coverage*
+core/*/cdk.out/

storage/framework/server/Dockerfile

@@ -14,8 +14,8 @@ RUN mkdir -p /temp/dev
 COPY package.json /temp/dev/
 COPY tsconfig.json /temp/dev/
 COPY core/ /temp/dev/core/
+
 RUN cd /temp/dev && bun install
-# RUN cd /temp/dev && bun install --frozen-lockfile
 
 # install with --production (exclude devDependencies)
 RUN mkdir -p /temp/prod
@@ -30,16 +30,7 @@ RUN cd /temp/prod && bun install
 # then copy all (non-ignored) project files into the image
 FROM base AS prerelease
 COPY --from=install /temp/dev/node_modules ./node_modules
-COPY ./Actions ./Actions
-COPY ./app ./app
-COPY ./config ./config
-COPY ./core ./core
-COPY ./docs ./docs
-COPY ./routes ./routes
-COPY ./storage ./storage
-COPY ./index.ts ./index.ts
-COPY ./package.json ./package.json
-COPY ./tsconfig.json ./tsconfig.json
+COPY . .
 
 # [optional] tests & build
 # ENV NODE_ENV=production
@@ -49,16 +40,15 @@ COPY ./tsconfig.json ./tsconfig.json
 # copy production dependencies and source code into final image
 FROM base AS release
 COPY --from=install /temp/prod/node_modules ./node_modules
-COPY --from=prerelease /usr/src/app/index.ts ./index.ts
-COPY --from=prerelease /usr/src/app/tsconfig.json ./tsconfig.json
-COPY --from=prerelease /usr/src/app/package.json ./package.json
-COPY --from=prerelease /usr/src/app/Actions ./Actions
 COPY --from=prerelease /usr/src/app/app ./app
 COPY --from=prerelease /usr/src/app/config ./config
 COPY --from=prerelease /usr/src/app/core ./core
 COPY --from=prerelease /usr/src/app/docs ./docs
 COPY --from=prerelease /usr/src/app/routes ./routes
 COPY --from=prerelease /usr/src/app/storage ./storage
+COPY --from=prerelease /usr/src/app/index.ts ./index.ts
+COPY --from=prerelease /usr/src/app/tsconfig.json ./tsconfig.json
+COPY --from=prerelease /usr/src/app/package.json ./package.json
 
 # run the app
 USER bun

storage/framework/server/build.ts

@@ -5,81 +5,60 @@ import { log, runCommand } from '@stacksjs/cli'
 import { app } from '@stacksjs/config'
 import { slug } from '@stacksjs/strings'
 
-// TODO: we cannot use Bun Shell scripts here yet because we need to use 1.0.8 for deployments, and Shell scripts were introduced after 1.0.8
-// this allows for a custom "server configuration" by the user
-if (hasFiles(projectPath('server'))) {
-  await runCommand(`rm -rf ../../../server/build.ts`, {
-    cwd: projectPath('server'),
-  })
-  await runCommand(`cp -r ../../../server .`, {
-    cwd: projectPath('server'),
+async function cleanAndCopy(sourcePath: string, targetPath: string) {
+  await runCommand(`rm -rf ${targetPath}`, {
+    cwd: frameworkPath('server'),
   })
 
-  log.info('Using custom server configuration')
-}
-else {
-  log.info('Using default server configuration')
+  await runCommand(`cp -r ${sourcePath} ${targetPath}`, {
+    cwd: frameworkPath('server'),
+  })
 }
 
-log.info('Building server...')
+async function useCustomOrDefaultServerConfig() {
+  if (hasFiles(projectPath('server'))) {
+    await runCommand(`rm -rf ../../../server/build.ts`, {
+      cwd: projectPath('server'),
+    })
+    await runCommand(`cp -r ../../../server .`, {
+      cwd: projectPath('server'),
+    })
 
-await runCommand(`rm -rf ${frameworkPath('server/core')}`, {
-  cwd: frameworkPath('server'),
-})
-await runCommand(`cp -r ${frameworkPath('core')} ${frameworkPath('server/core')}`, {
-  cwd: frameworkPath('server'),
-})
+    return log.info('Using custom server configuration')
+  }
 
-await runCommand(`rm -rf ${frameworkPath('server/config')}`, {
-  cwd: frameworkPath('server'),
-})
-await runCommand(`cp -r ${projectPath('config')} ${frameworkPath('server/config')}`, {
-  cwd: frameworkPath('server'),
-})
+  log.info('Using default server configuration')
+}
 
-await runCommand(`rm -rf ${frameworkPath('server/routes')}`, {
-  cwd: frameworkPath('server'),
-})
-await runCommand(`cp -r ${projectPath('routes')} ${frameworkPath('server/routes')}`, {
-  cwd: frameworkPath('server'),
-})
+async function buildServer() {
+  log.info('Building server...')
 
-await runCommand(`rm -rf ${frameworkPath('server/app')}`, {
-  cwd: frameworkPath('server'),
-})
-await runCommand(`cp -r ${projectPath('app')} ${frameworkPath('server/app')}`, {
-  cwd: frameworkPath('server'),
-})
+  await cleanAndCopy(frameworkPath('core'), frameworkPath('server/core'))
+  await cleanAndCopy(projectPath('config'), frameworkPath('server/config'))
+  await cleanAndCopy(projectPath('routes'), frameworkPath('server/routes'))
+  await cleanAndCopy(projectPath('app'), frameworkPath('server/app'))
+  await cleanAndCopy(projectPath('docs'), frameworkPath('server/docs'))
+  await cleanAndCopy(projectPath('storage'), frameworkPath('server/storage'))
 
-await runCommand(`rm -rf ${frameworkPath('server/docs')}`, {
-  cwd: frameworkPath('server'),
-})
-await runCommand(`cp -r ${projectPath('docs')} ${frameworkPath('server/docs')}`, {
-  cwd: frameworkPath('server'),
-})
+  if (!app.name) {
+    log.error('Please provide a name for your app in your config file')
+    process.exit(1)
+  }
 
-await runCommand(`rm -rf ${frameworkPath('server/Actions')}`, {
-  cwd: frameworkPath('server'),
-})
-await runCommand(`cp -r ${projectPath('app/Actions')} ${frameworkPath('server/Actions')}`, {
-  cwd: frameworkPath('server'),
-})
+  // TODO: also allow for a custom container name via a config option
+  await runCommand(`docker build --pull -t ${slug(app.name)} .`, {
+    cwd: frameworkPath('server'),
+  })
 
-await runCommand(`rm -rf ${frameworkPath('server/storage')}`, {
-  cwd: frameworkPath('server'),
-})
-await runCommand(`cp -r ${projectPath('storage')} ${frameworkPath('server/storage')}`, {
-  cwd: frameworkPath('server'),
-})
+  log.success('Server built')
+}
 
-if (!app.name) {
-  log.error('Please provide a name for your app in your config file')
-  process.exit(1)
+async function main() {
+  useCustomOrDefaultServerConfig()
+  await buildServer()
 }
 
-// TODO: also allow for a custom container name via a config option
-await runCommand(`docker build --pull -t ${slug(app.name)} .`, {
-  cwd: frameworkPath('server'),
+main().catch((error) => {
+  log.error(`Build failed: ${error}`)
+  process.exit(1)
 })
-
-log.success('Server built')

storage/framework/server/dev

@@ -7,7 +7,6 @@ SCRIPT_DIR=$(cd "$(dirname "$0")" && pwd)
 PROJECT_ROOT=$(cd "$SCRIPT_DIR/../../../" && pwd)
 
 # Construct the absolute paths
-ACTIONS_DIR="$PROJECT_ROOT/app/Actions"
 APP_DIR="$PROJECT_ROOT/app"
 CONFIG_DIR="$PROJECT_ROOT/config"
 DOCS_DIR="$PROJECT_ROOT/docs"
@@ -26,7 +25,6 @@ else # Local environment
 fi
 
 docker run -p 3000:3000 \
-  -v "$ACTIONS_DIR:/usr/src/app/Actions" \
   -v "$APP_DIR:/usr/src/app/app" \
   -v "$CONFIG_DIR:/usr/src/app/config" \
   -v "$DOCS_DIR:/usr/src/app/docs" \

storage/framework/server/tsconfig.json

@@ -11,11 +11,14 @@
     "module": "esnext",
     "moduleResolution": "bundler",
     "paths": {
-      "@stacksjs/*": ["./core/*/src"],
-      "stacks/*": ["./core/*/src"],
-      "buddy": ["./core/buddy/src/index.ts"],
-      "buddy/*": ["./core/buddy/src/*"],
-      "../../../env": ["./env.ts"]
+      "@stacksjs/*": ["./storage/framework/core/*/src"],
+      "stacks/*": ["./storage/framework/core/*/src"],
+      "buddy": ["./storage/framework/core/buddy/src/index.ts"],
+      "buddy/*": ["./storage/framework/core/buddy/src/*"],
+      "Actions/*": ["./app/Actions/*"],
+      "Jobs/*": ["./app/Jobs/*"],
+      "~/*": ["./*"],
+      "../../../env": ["./storage/framework/env.ts"]
     },
     "resolveJsonModule": true,
     "types": [