chore: wip

chrisbbreuer · chrisbbreuer · commit 0113ef28f366 · 2024-01-09T17:17:24.000-08:00
chore: wip

chore: wip

chore: wip

chore: wip

chore: wip

chore: wip

chore: wip
diff --git a/bun.lockb b/bun.lockb
diff --git a/config/docs.ts b/config/docs.ts
@@ -1,3 +1,4 @@
+import { SocialLinkIcon } from '@stacksjs/types'
 import type { DocsConfig } from '@stacksjs/types'
 
 const nav = [
@@ -265,9 +266,9 @@ export default {
     },
 
     socialLinks: [
-      { icon: 'twitter', link: 'https://twitter.com/stacksjs' },
-      { icon: 'github', link: 'https://github.com/stacksjs/stacks' },
-      { icon: 'discord', link: 'https://discord.gg/stacksjs' },
+      { icon: SocialLinkIcon.Twitter, link: 'https://twitter.com/stacksjs' },
+      { icon: SocialLinkIcon.GitHub, link: 'https://github.com/stacksjs/stacks' },
+      { icon: SocialLinkIcon.Discord, link: 'https://discord.gg/stacksjs' },
     ],
 
     // algolia: services.algolia,
diff --git a/storage/framework/docs/.vitepress/config.ts b/storage/framework/docs/.vitepress/config.ts
@@ -2,6 +2,7 @@ import { defineConfig } from 'vitepress'
 import { alias } from '@stacksjs/alias'
 import { path as p } from '@stacksjs/path'
 import { server } from '@stacksjs/server'
+import { transformerTwoslash } from 'vitepress-plugin-twoslash'
 import userConfig from '../../../../config/docs'
 import { analyticsHead, faviconHead } from './head'
 
@@ -51,5 +52,11 @@ export default defineConfig({
     ...analyticsHead,
   ],
 
+  markdown: {
+    codeTransformers: [
+      transformerTwoslash(),
+    ],
+  },
+
   ...userConfig,
 })
diff --git a/storage/framework/docs/.vitepress/theme/index.ts b/storage/framework/docs/.vitepress/theme/index.ts
@@ -4,14 +4,18 @@ import type { Theme } from 'vitepress'
 import DefaultTheme from 'vitepress/theme'
 import '../../../../../resources/assets/styles/docs.css'
 
+// import TwoSlashFloatingVue from 'vitepress-plugin-twoslash/client'
+
 export default {
   extends: DefaultTheme,
+
   Layout: () => {
     return h(DefaultTheme.Layout, null, {
       // https://vitepress.dev/guide/extending-default-theme#layout-slots
     })
   },
-  // enhanceApp({ app, router, siteData }) {
-  //   // ...
+
+  // enhanceApp({ app }: EnhanceAppContext) {
+  //   app.use(TwoSlashFloatingVue)
   // },
 } satisfies Theme
diff --git a/storage/framework/ide/dictionary.txt b/storage/framework/ide/dictionary.txt
@@ -184,6 +184,7 @@ opensearch
 opensearchservice
 openweb
 openweblabs
+orta
 outdir
 outfile
 outro
@@ -259,6 +260,7 @@ treeshaking
 triggerable
 tsdoc
 tsup
+twoslash
 typecheck
 typesense
 unconfig
diff --git a/storage/framework/ide/vscode/package.json b/storage/framework/ide/vscode/package.json
@@ -10,7 +10,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/stacksjs/stacks.git",
-    "directory": "./stacks/vscode"
+    "directory": "./storage/framework/ide/vscode"
   },
   "bugs": {
     "url": "https://github.com/stacksjs/stacks/issues"
@@ -56,7 +56,8 @@
     "mikestead.dotenv",
     "pflannery.vscode-versionlens",
     "foxundermoon.shell-format",
-    "mylesmurphy.prettify-ts"
+    "mylesmurphy.prettify-ts",
+    "Orta.vscode-twoslash-queries"
   ],
   "devDependencies": {
     "@vscode/vsce": "^2.22.0"
diff --git a/storage/framework/stacks/src/actions/src/bump.ts b/storage/framework/stacks/src/actions/src/bump.ts
@@ -2,6 +2,6 @@ import { runCommand } from '@stacksjs/cli'
 import { path as p } from '@stacksjs/path'
 
 await runCommand(
-  'bunx bumpp ./stacks/package.json ./stacks/src/**/package.json ./ide/vscode/package.json --execute "buddy changelog --quiet" --all',
-  { cwd: p.frameworkStoragePath(), stdin: 'inherit' },
+  'bunx bumpp ./package.json ./src/**/package.json ../ide/vscode/package.json --execute "bud changelog --quiet" --all',
+  { cwd: p.frameworkStoragePath('stacks'), stdin: 'inherit' },
 )
diff --git a/storage/framework/stacks/src/actions/src/changelog.ts b/storage/framework/stacks/src/actions/src/changelog.ts
@@ -1,7 +1,11 @@
-import { runCommand } from '@stacksjs/cli'
+import { execSync, runCommand } from '@stacksjs/cli'
 import { projectPath } from '@stacksjs/path'
 
-await runCommand(`bunx changelogen --output CHANGELOG.md --from $(git describe --abbrev=0 --tags HEAD^) --to $(git describe)`, {
+const fromRevision = await execSync('git describe --abbrev=0 --tags HEAD^')
+// console.log('fromRevision', fromRevision)
+const toRevision = await execSync('git describe')
+// console.log('toRevision', toRevision)
+
+await runCommand(`bunx changelogen --output CHANGELOG.md --from ${fromRevision} --to ${toRevision}`, {
   cwd: projectPath(),
-  verbose: true,
 })
diff --git a/storage/framework/stacks/src/actions/src/lint/fix.ts b/storage/framework/stacks/src/actions/src/lint/fix.ts
@@ -1,5 +1,7 @@
-import { runCommands } from '@stacksjs/cli'
+import { log, runCommands } from '@stacksjs/cli'
 import { projectPath } from '@stacksjs/path'
 import { NpmScript } from '@stacksjs/enums'
 
+log.info('Ensuring code style...')
 await runCommands([NpmScript.LintFix], { cwd: projectPath() })
+log.success('Linted')
diff --git a/storage/framework/stacks/src/bud b/storage/framework/stacks/src/bud
@@ -0,0 +1,2 @@
+#!/usr/bin/env bun
+import('./buddy/src/cli')
diff --git a/storage/framework/stacks/src/bun-create/bud/package.json b/storage/framework/stacks/src/bun-create/bud/package.json
@@ -140,8 +140,13 @@
     "storage/framework/*"
   ],
   "bun-create": {
-    "preinstall": ["echo 'Installing...'", "git clone https://github.com/stacksjs/stacks.git ."],
-    "postinstall": ["echo 'Done!'"],
+    "preinstall": [
+      "echo 'Installing...'",
+      "git clone https://github.com/stacksjs/stacks.git ."
+    ],
+    "postinstall": [
+      "echo 'Done!'"
+    ],
     "start": "bun run echo 'Hello world!'"
   }
 }
diff --git a/storage/framework/stacks/src/bun-create/buddy/package.json b/storage/framework/stacks/src/bun-create/buddy/package.json
@@ -140,8 +140,13 @@
     "storage/framework/*"
   ],
   "bun-create": {
-    "preinstall": ["echo 'Installing...'", "git clone https://github.com/stacksjs/stacks.git ."],
-    "postinstall": ["echo 'Done!'"],
+    "preinstall": [
+      "echo 'Installing...'",
+      "git clone https://github.com/stacksjs/stacks.git ."
+    ],
+    "postinstall": [
+      "echo 'Done!'"
+    ],
     "start": "bun run echo 'Hello world!'"
   }
 }
diff --git a/storage/framework/stacks/src/bun-create/stack/package.json b/storage/framework/stacks/src/bun-create/stack/package.json
@@ -140,8 +140,13 @@
     "storage/framework/*"
   ],
   "bun-create": {
-    "preinstall": ["echo 'Installing...'", "git clone https://github.com/stacksjs/stacks.git ."],
-    "postinstall": ["echo 'Done!'"],
+    "preinstall": [
+      "echo 'Installing...'",
+      "git clone https://github.com/stacksjs/stacks.git ."
+    ],
+    "postinstall": [
+      "echo 'Done!'"
+    ],
     "start": "bun run echo 'Hello world!'"
   }
 }
diff --git a/storage/framework/stacks/src/bun-create/stacks/package.json b/storage/framework/stacks/src/bun-create/stacks/package.json
@@ -140,8 +140,13 @@
     "storage/framework/*"
   ],
   "bun-create": {
-    "preinstall": ["echo 'Installing...'", "git clone https://github.com/stacksjs/stacks.git ."],
-    "postinstall": ["echo 'Done!'"],
+    "preinstall": [
+      "echo 'Installing...'",
+      "git clone https://github.com/stacksjs/stacks.git ."
+    ],
+    "postinstall": [
+      "echo 'Done!'"
+    ],
     "start": "bun run echo 'Hello world!'"
   }
 }
diff --git a/storage/framework/stacks/src/cli/src/exec.ts b/storage/framework/stacks/src/cli/src/exec.ts
@@ -1,6 +1,6 @@
 import process from 'node:process'
 import { type Result, err, handleError, ok } from '@stacksjs/error-handling'
-import type { CliOptions, StacksError, Subprocess, SyncSubprocess } from '@stacksjs/types'
+import type { CliOptions, StacksError, Subprocess } from '@stacksjs/types'
 import { ExitCode } from '@stacksjs/types'
 
 /**
@@ -60,23 +60,21 @@ export async function exec(command: string | string[], options?: CliOptions): Pr
  * @returns The result of the command.
  * @example
  * ```ts
- * const result = execSync('ls')
+ * const output = execSync('ls')
  *
- * if (result.isErr())
- *   console.error(result.error)
- * else
- *   console.log(result)
+ * console.log(output)
  * ```
  * @example
  * ```ts
- * const result = execSync('ls', { cwd: '/home' })
+ * const output = execSync('ls', { cwd: '/home' })
  * ```
  */
-export function execSync(command: string | string[], options?: CliOptions): Result<SyncSubprocess, Error> {
+export async function execSync(command: string | string[], options?: CliOptions): Promise<string> {
   const cmd = Array.isArray(command) ? command : command.split(' ')
   const proc = Bun.spawnSync(cmd, {
     ...options,
-    stdout: options?.stdout ?? 'inherit',
+    // stdin: 'inherit',
+    stdout: options?.stdout ?? 'pipe',
     stderr: options?.stderr ?? 'inherit',
     cwd: options?.cwd ?? import.meta.dir,
     // env: { ...Bun.env, ...options?.env },
@@ -87,8 +85,5 @@ export function execSync(command: string | string[], options?: CliOptions): Resu
     },
   })
 
-  if (proc.success)
-    return ok(proc)
-
-  return err(handleError(`Failed to execute command: ${cmd.join(' ')}`))
+  return proc.stdout.toString()
 }
diff --git a/storage/framework/stacks/src/cloud/src/server/Dockerfile b/storage/framework/stacks/src/cloud/src/server/Dockerfile
@@ -17,4 +17,4 @@ COPY --from=builder /tmp/index ${LAMBDA_TASK_ROOT}
 COPY --from=builder /tmp/bootstrap ${LAMBDA_RUNTIME_DIR}
 
 # Set our handler method
-CMD ["index.hello"]
+CMD ["index.fetch"]
diff --git a/storage/framework/stacks/src/cloud/src/server/index.ts b/storage/framework/stacks/src/cloud/src/server/index.ts
@@ -1,14 +1,39 @@
-const handler = {
-  async hello(_event: any) {
+import { serverResponse } from '@stacksjs/router'
+import type { Server } from 'bun'
+
+export default {
+  async fetch(request: Request, server: Server): Promise<Response | undefined> {
     // eslint-disable-next-line no-console
-    console.log('Hello from Bun!')
-    return new Response(
-      JSON.stringify({
-        body: {
-          handlerTs: Date.now(),
-        },
-      }),
-    )
+    console.log('Request', {
+      url: request.url,
+      method: request.method,
+      headers: request.headers.toJSON(),
+      body: request.body ? await request.text() : null,
+    })
+
+    if (server.upgrade(request)) {
+      // eslint-disable-next-line no-console
+      console.log('WebSocket upgraded')
+      return
+    }
+
+    return serverResponse(request)
+  },
+
+  websocket: {
+    // async open(ws: ServerWebSocket): Promise<void> {
+    //   // eslint-disable-next-line no-console
+    //   console.log('WebSocket opened')
+    // },
+
+    // async message(ws: ServerWebSocket, message: string): Promise<void> {
+    //   // eslint-disable-next-line no-console
+    //   console.log('WebSocket message', message)
+    // },
+
+    // async close(ws: ServerWebSocket, code: number, reason?: string): Promise<void> {
+    //   // eslint-disable-next-line no-console
+    //   console.log('WebSocket closed', { code, reason })
+    // },
   },
 }
-export { handler as default }
diff --git a/storage/framework/stacks/src/cloud/src/server/package.json b/storage/framework/stacks/src/cloud/src/server/package.json
@@ -5,6 +5,7 @@
     "@aws-sdk/client-dynamodb": "^3.485.0",
     "@aws-sdk/lib-dynamodb": "^3.485.0",
     "@smithy/smithy-client": "^2.2.1",
+    "@stacksjs/router": "latest",
     "aws4fetch": "^1.0.17"
   }
 }
diff --git a/storage/framework/stacks/src/docs/package.json b/storage/framework/stacks/src/docs/package.json
@@ -59,7 +59,8 @@
     "@stacksjs/path": "workspace:*",
     "@stacksjs/server": "workspace:*",
     "@stacksjs/vite": "workspace:*",
-    "vitepress": "1.0.0-rc.36"
+    "vitepress": "1.0.0-rc.36",
+    "vitepress-plugin-twoslash": "^0.9.18"
   },
   "devDependencies": {
     "@stacksjs/development": "workspace:*"
diff --git a/storage/framework/stacks/src/docs/src/index.ts b/storage/framework/stacks/src/docs/src/index.ts
@@ -57,3 +57,5 @@ const config: UserConfig = {
 }
 
 export default defineConfig(config)
+
+export * from './plugins'
diff --git a/storage/framework/stacks/src/docs/src/plugins.ts b/storage/framework/stacks/src/docs/src/plugins.ts
@@ -0,0 +1,4 @@
+import TwoSlashFloatingVue from 'vitepress-plugin-twoslash/client'
+import { transformerTwoslash } from 'vitepress-plugin-twoslash'
+
+export { TwoSlashFloatingVue, transformerTwoslash }
diff --git a/storage/framework/stacks/src/types/src/docs.ts b/storage/framework/stacks/src/types/src/docs.ts
@@ -9,14 +9,14 @@ export interface SocialLink {
   ariaLabel?: string
 }
 
-export type SocialLinkIcon =
-  | 'discord'
-  | 'facebook'
-  | 'github'
-  | 'instagram'
-  | 'linkedin'
-  | 'mastodon'
-  | 'slack'
-  | 'twitter'
-  | 'youtube'
-  | { svg: string }
+export enum SocialLinkIcon {
+  Discord = 'discord',
+  Facebook = 'facebook',
+  GitHub = 'github',
+  Instagram = 'instagram',
+  LinkedIn = 'linkedin',
+  Mastodon = 'mastodon',
+  Slack = 'slack',
+  Twitter = 'twitter',
+  YouTube = 'youtube',
+}
diff --git a/storage/framework/stacks/tsconfig.json b/storage/framework/stacks/tsconfig.json
@@ -48,11 +48,12 @@
     ]
   },
   "include": [
-    "../../**/*.stx",
-    "../../*.stx",
-    "../../*.ts",
-    "../../*.d.ts",
-    "../../**/*.d.ts",
+    "../../../*.stx",
+    "../../../**/*.stx",
+    "../../../*.ts",
+    "../../../**/*.ts",
+    "../../../*.d.ts",
+    "../../../**/*.d.ts",
     "../docs/.vitepress/*",
     "../stack/**/*",
     "../views/desktop/**/*",
diff --git a/t.ts b/t.ts

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@ import { runCommand } from '@stacksjs/cli'`
`2`	`2`	`import { path as p } from '@stacksjs/path'`
`3`	`3`
`4`	`4`	`await runCommand(`
`5`		`- 'bunx bumpp ./stacks/package.json ./stacks/src/**/package.json ./ide/vscode/package.json --execute "buddy changelog --quiet" --all',`
`6`		`- { cwd: p.frameworkStoragePath(), stdin: 'inherit' },`
	`5`	`+ 'bunx bumpp ./package.json ./src/**/package.json ../ide/vscode/package.json --execute "bud changelog --quiet" --all',`
	`6`	`+ { cwd: p.frameworkStoragePath('stacks'), stdin: 'inherit' },`
`7`	`7`	`)`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+#!/usr/bin/env bun`
	`2`	`+import('./buddy/src/cli')`