chore: wip

Author: chrisbbreuer

storage/framework/core/cli/dts.ts

@@ -53,7 +53,7 @@ export interface DtsOptions {
    * it is relative to the current working directory.
    * @default 'dist'
    */
-  outdir?: ts.CompilerOptions['outDir']
+  outdir?: ts.CompilerOptions['outDir'] // sadly, the bundler uses `outdir` instead of `outDir` and to avoid confusion, we'll use `outdir` here
 
   /**
    * The files to include. If not provided, it will include all files in the
@@ -95,6 +95,8 @@ export async function generate(entryPoints: string | string[], options?: DtsOpti
       noEmit: false,
       outDir: options?.outdir ?? './dist',
       rootDir: p.resolve(cwd, root),
+      incremental: undefined,
+      composite: undefined,
     }
 
     console.log('Compiler Options:', JSON.stringify(compilerOptions, null, 2))

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

@@ -639,15 +639,16 @@ export const spinner = (): Spinner => {
   }
 
   const start = (msg = ''): void => {
-    let loop: ReturnType<typeof setInterval>
     isSpinnerActive = true
     unblock = block()
     _message = msg.replace(/\.+$/, '')
     process.stdout.write(`${color.gray(S_BAR)}\n`)
     let frameIndex = 0
     let dotsTimer = 0
+
     registerHooks()
-    loop = setInterval(() => {
+
+    setInterval(() => {
       const frame = color.magenta(frames[frameIndex])
       const loadingDots = '.'.repeat(Math.floor(dotsTimer)).slice(0, 3)
       process.stdout.write(cursor.move(-999, 0))

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

@@ -1,4 +1,5 @@
-import type { CliOptions } from '@stacksjs/types'
+import type { Result } from '@stacksjs/error-handling'
+import type { CliOptions, Readable, Subprocess, Writable } from '@stacksjs/types'
 import { runCommand } from './run'
 
 type CommandOptionTuple = [string, string, { default: boolean }]
@@ -37,11 +38,17 @@ export class Command {
 }
 
 export const command = {
-  run: async (command: string, options?: CliOptions): Promise<void> => {
+  run: async (
+    command: string,
+    options?: CliOptions,
+  ): Promise<Result<Subprocess<Writable, Readable, Readable>, Error>> => {
     return await runCommand(command, options)
   },
 
-  runSync: async (command: string, options?: CliOptions): Promise<void> => {
+  runSync: async (
+    command: string,
+    options?: CliOptions,
+  ): Promise<Result<Subprocess<Writable, Readable, Readable>, Error>> => {
     return await runCommand(command, options)
   },
 }

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

@@ -1,5 +1,5 @@
-import type { Result } from '@stacksjs/error-handling'
-import type { CliOptions, CommandError, Subprocess } from '@stacksjs/types'
+import type { Ok, Result } from '@stacksjs/error-handling'
+import type { CliOptions, CommandError, Readable, Subprocess, Writable } from '@stacksjs/types'
 import { ExitCode } from '@stacksjs/types'
 import { log } from './console'
 import { exec, execSync } from './exec'
@@ -90,7 +90,10 @@ export async function runCommandSync(command: string, options?: CliOptions): Pro
  * @param options The options to pass to the command.
  * @returns The result of the command.
  */
-export async function runCommands(commands: string[], options?: CliOptions): Promise<Subprocess[]> {
+export async function runCommands(
+  commands: string[],
+  options?: CliOptions,
+): Promise<Ok<Subprocess<Writable, Readable, Readable>, Error>[]> {
   const results = []
 
   for (const command of commands) {

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

@@ -1,4 +1,4 @@
-import { collect } from '@stacksjs/collections'
+import { type Collection, collect } from '@stacksjs/collections'
 
 export * as kolorist from 'kolorist'
 
@@ -63,7 +63,7 @@ export {
   stripColors,
 } from 'kolorist'
 
-export const quotes: string[] = collect([
+export const quotes: Collection<string> = collect([
   // could be queried from any API or database
   'The best way to get started is to quit talking and begin doing.',
   'The pessimist sees difficulty in every opportunity. The optimist sees opportunity in every difficulty.',

storage/framework/core/config/src/config.ts

@@ -8,33 +8,31 @@ export const config: StacksOptions = {
   ...overrides,
 }
 
-export const {
-  ai,
-  analytics,
-  app,
-  cache,
-  cloud,
-  cli,
-  database,
-  dns,
-  docs,
-  email,
-  errors,
-  git,
-  hashing,
-  library,
-  logging,
-  notification,
-  payment,
-  ports,
-  queue,
-  security,
-  searchEngine,
-  services,
-  storage,
-  team,
-  ui,
-}: StacksOptions = config
+export const ai: StacksOptions['ai'] = config.ai
+export const analytics: StacksOptions['analytics'] = config.analytics
+export const app: StacksOptions['app'] = config.app
+export const cache: StacksOptions['cache'] = config.cache
+export const cloud: StacksOptions['cloud'] = config.cloud
+export const cli: StacksOptions['cli'] = config.cli
+export const database: StacksOptions['database'] = config.database
+export const dns: StacksOptions['dns'] = config.dns
+export const docs: StacksOptions['docs'] = config.docs
+export const email: StacksOptions['email'] = config.email
+export const errors: StacksOptions['errors'] = config.errors
+export const git: StacksOptions['git'] = config.git
+export const hashing: StacksOptions['hashing'] = config.hashing
+export const library: StacksOptions['library'] = config.library
+export const logging: StacksOptions['logging'] = config.logging
+export const notification: StacksOptions['notification'] = config.notification
+export const payment: StacksOptions['payment'] = config.payment
+export const ports: StacksOptions['ports'] = config.ports
+export const queue: StacksOptions['queue'] = config.queue
+export const security: StacksOptions['security'] = config.security
+export const searchEngine: StacksOptions['searchEngine'] = config.searchEngine
+export const services: StacksOptions['services'] = config.services
+export const storage: StacksOptions['storage'] = config.storage
+export const team: StacksOptions['team'] = config.team
+export const ui: StacksOptions['ui'] = config.ui
 
 export { defaults, overrides }
 

storage/framework/core/config/src/overrides.ts

@@ -25,8 +25,7 @@ import team from '~/config/team'
 import ui from '~/config/ui'
 // import docs from '~/docs/config'
 
-// this "user config" will override the default config options
-export default {
+const config: StacksConfig = {
   ai,
   analytics,
   app,
@@ -52,4 +51,6 @@ export default {
   storage,
   team,
   ui,
-} satisfies StacksConfig
+}
+
+export default config