chore: wip

Author: chrisbbreuer

storage/framework/core/actions/build.ts

@@ -2,12 +2,16 @@ import dts from 'bun-plugin-dts-auto'
 
 await Bun.build({
   root: './src',
+  outdir: './dist',
+  format: 'esm',
+  target: 'bun',
 
   entrypoints: [
-    './src/index.ts',
     './src/build/component-libs.ts',
     './src/build/core.ts',
     './src/build/stacks.ts',
+    './src/database/seed.ts',
+    './src/deploy/index.ts',
     './src/dev/index.ts',
     './src/dev/components.ts',
     './src/dev/docs.ts',
@@ -31,31 +35,27 @@ await Bun.build({
     './src/upgrade/dependencies.ts',
     './src/upgrade/framework.ts',
     './src/upgrade/index.ts',
-    './src/index.ts',
     './src/add.ts',
     './src/build.ts',
     './src/bump.ts',
     './src/changelog.ts',
     './src/clean.ts',
     './src/commit.ts',
     './src/copy-types.ts',
-    './src/deploy/index.ts',
     './src/examples.ts',
     './src/fresh.ts',
+    './src/index.ts',
     './src/key-generate.ts',
     './src/make.ts',
     './src/prepublish.ts',
     './src/release.ts',
-    './src/database/seed.ts',
     './src/test.ts',
     './src/tinker.ts',
     './src/typecheck.ts',
     './src/types.ts',
     './src/upgrade.ts',
   ],
 
-  outdir: './dist',
-
   external: [
     '@stacksjs/path',
     '@stacksjs/cli',
@@ -64,21 +64,20 @@ await Bun.build({
     '@stacksjs/enums',
     '@stacksjs/storage',
     '@stacksjs/utils',
+    'markdown-it',
+    'vue-component-meta',
     '@stacksjs/strings',
     '@stacksjs/config',
     '@stacksjs/error-handling',
     '@stacksjs/env',
     '@stacksjs/security',
     '@stacksjs/database',
-    'markdown-it',
-    'vue-component-meta',
+    'bun',
   ],
 
   plugins: [
     dts({
       cwd: import.meta.dir,
     }),
   ],
-
-  target: 'bun',
 })

storage/framework/core/actions/src/deploy/index.ts

@@ -5,7 +5,7 @@ import { path as p } from '@stacksjs/path'
 import { storage } from '@stacksjs/storage'
 
 await runCommand('bun run build', {
-  cwd: p.frameworkPath(),
+  cwd: p.corePath(),
 })
 
 if (storage.hasFiles(p.projectPath('docs'))) {

storage/framework/core/actions/src/dev/index.ts

@@ -1,7 +1,7 @@
 import { log } from '@stacksjs/logging'
 import type { DevOptions } from '@stacksjs/types'
 import { Action } from '@stacksjs/enums'
-import { runAction } from '../helpers'
+import { runAction } from '../helpers/utils'
 
 export async function runDevServer(options: DevOptions) {
   log.info('Starting your Frontend Engine...')

storage/framework/core/actions/src/generate/index.ts

@@ -5,7 +5,7 @@ import type { GeneratorOptions } from '@stacksjs/types'
 import { runCommand } from '@stacksjs/cli'
 import { runNpmScript } from '@stacksjs/utils'
 import { frameworkPath, projectPath } from '@stacksjs/path'
-import { runAction } from '../helpers'
+import { runAction } from '../helpers/utils'
 
 // import { files } from '@stacksjs/storage'
 

storage/framework/core/actions/src/helpers/index.ts

@@ -1,10 +1,8 @@
-import * as storage from '@stacksjs/storage'
 import { buddyOptions, runCommand, runCommands } from '@stacksjs/cli'
+import { storage } from '@stacksjs/storage'
 import { log } from '@stacksjs/logging'
 import * as p from '@stacksjs/path'
-import type { ActionOptions, Subprocess } from '@stacksjs/types'
-import type { Result } from '@stacksjs/error-handling'
-import { err, handleError } from '@stacksjs/error-handling'
+import type { ActionOptions } from '@stacksjs/types'
 
 /**
  * Run an Action the Stacks way.
@@ -13,7 +11,7 @@ import { err, handleError } from '@stacksjs/error-handling'
  * @param options The options to pass to the command.
  * @returns The result of the command.
  */
-export async function runAction(action: string, options?: ActionOptions): Promise<Result<Subprocess, Error>> {
+export async function runAction(action: string, options?: ActionOptions) {
   const opts = buddyOptions()
   const path = p.relativeActionsPath(`src/${action}.ts`)
   const cmd = `bun --bun ${path} ${opts}`.trimEnd()
@@ -25,9 +23,6 @@ export async function runAction(action: string, options?: ActionOptions): Promis
   log.debug('runAction:', cmd)
   log.debug('action options:', optionsWithCwd)
 
-  if (!hasAction(action))
-    return err(handleError(`The specified action "${action}" does not exist`))
-
   return await runCommand(cmd, optionsWithCwd)
 }
 
@@ -63,8 +58,5 @@ export async function runActions(actions: string[], options?: ActionOptions) {
 }
 
 export function hasAction(action: string) {
-  if (storage.isFile(p.functionsPath(`actions/${action}.ts`)))
-    return true
-
   return storage.isFile(p.actionsPath(`${action}.ts`))
 }

storage/framework/core/actions/src/helpers/utils.ts

@@ -1,9 +1,8 @@
 export * from './action'
 export * from './dev'
 export * from './generate'
-export * from './helpers'
+export * from './helpers/utils'
 
-export { examples as runExample } from './examples'
 export { commit as runCommit } from './commit'
 export { add as runAdd } from './add'
 

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

@@ -1,6 +1,6 @@
 import process from 'node:process'
-import { log } from '@stacksjs/logging'
-import { CAC } from 'cac'
+import type { CAC } from '@stacksjs/cli'
+import { cli, log } from '@stacksjs/cli'
 import { ensureProjectIsInitialized } from '@stacksjs/utils'
 import { path as p } from '@stacksjs/path'
 import { fs } from '@stacksjs/storage'
@@ -20,21 +20,28 @@ process.on('unhandledRejection', (error: Error) => {
 })
 
 async function main() {
-  // const buddy = cli('buddy')
-  const buddy = new CAC('buddy')
+  const buddy = cli('buddy')
 
   // the following commands are not dependent on the project being initialized
   cmd.setup(buddy)
   cmd.key(buddy)
 
   // before running any commands, ensure the project is already initialized
-  await ensureProjectIsInitialized()
+  const isAppKeySet = await ensureProjectIsInitialized()
+  if (isAppKeySet) {
+    log.info('Project is initialized')
+  }
+  else {
+    log.warn('Your `APP_KEY` is not yet')
+    // TODO: add prompt to set the key
+    process.exit(1)
+  }
 
   cmd.build(buddy)
   cmd.changelog(buddy)
   cmd.clean(buddy)
   cmd.cloud(buddy)
-  // cmd.commit(buddy)
+  cmd.commit(buddy)
   cmd.configure(buddy)
   cmd.dev(buddy)
   cmd.domains(buddy)
@@ -48,15 +55,14 @@ async function main() {
   cmd.install(buddy)
   cmd.lint(buddy)
   cmd.list(buddy)
-  // cmd.make(buddy)
-  // cmd.migrate(buddy)
+  cmd.make(buddy)
+  cmd.migrate(buddy)
   cmd.release(buddy)
-  // cmd.seed(buddy)
+  cmd.seed(buddy)
   cmd.setup(buddy)
-  // cmd.example(buddy)
-  // cmd.test(buddy)
+  cmd.test(buddy)
   cmd.version(buddy)
-  // cmd.prepublish(buddy)
+  cmd.prepublish(buddy)
   cmd.upgrade(buddy)
 
   // dynamic imports

storage/framework/core/buddy/src/cli.ts

@@ -1,8 +1,8 @@
 import process from 'node:process'
 import type { CLI, KeyOptions } from '@stacksjs/types'
 import { intro, log, outro } from '@stacksjs/cli'
-import { Action } from '@stacksjs/enums'
 import { runAction } from '@stacksjs/actions'
+import { Action } from '@stacksjs/enums'
 
 export function key(buddy: CLI) {
   const descriptions = {

storage/framework/core/buddy/src/commands/key.ts

@@ -1,6 +1,7 @@
 import { path as p } from '@stacksjs/path'
 import { fs, glob } from '@stacksjs/storage'
-import { dim, log, runCommand } from '@stacksjs/cli'
+import { bold, dim, log, runCommand } from '@stacksjs/cli'
+
 // import { $ } from 'bun'
 
 const dirs = await glob(p.resolve('./', '*'), { onlyDirectories: true })
@@ -19,13 +20,13 @@ for (const dir of dirs) {
 
   // rm the dist folder before building
   // await $`rm -rf ${p.resolve(dir, 'dist')}`
-  const distPath = p.resolve(dir, 'dist');
+  const distPath = p.resolve(dir, 'dist')
 
   // Check if the dist folder exists
   if (await fs.exists(distPath)) {
     await runCommand('rm -rf dist', {
       cwd: dir, // Change this to 'dir' to correctly set the working directory
-    });
+    })
   }
 
   log.debug(`Cleaned dist folder`)
@@ -55,10 +56,10 @@ for (const dir of dirs) {
 
     const relativeFilePath = p.relative(dir, file).replace('dist/', '')
     // eslint-disable-next-line no-console
-    console.log(`${dim(`[${sizeStr}]`)} ${dim('dist/')}${relativeFilePath}`)
+    console.log(`${bold(dim(`[${sizeStr}]`))} ${dim('dist/')}${relativeFilePath}`)
   }
 
-  log.success(`${dim(`[${timeTaken}ms]`)} Built ${pkgName}`)
+  log.success(`${bold(dim(`[${timeTaken}ms]`))} Built ${pkgName}`)
 }
 
 const endTime = Date.now()