chore: wip

Author: chrisbbreuer

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

@@ -8,6 +8,10 @@ export const config: StacksOptions = {
   ...overrides,
 }
 
+export function getConfig(): StacksOptions {
+  return config
+}
+
 export const ai: StacksOptions['ai'] = config.ai
 export const analytics: StacksOptions['analytics'] = config.analytics
 export const app: StacksOptions['app'] = config.app
@@ -37,13 +41,15 @@ export const ui: StacksOptions['ui'] = config.ui
 
 export * from './helpers'
 
-export function determineAppEnv(): string {
-  if (app.env === 'local')
-    return 'dev'
-  if (app.env === 'development')
+type AppEnv = 'dev' | 'stage' | 'prod' | string
+
+export function determineAppEnv(): AppEnv {
+  if (app.env === 'local' || app.env === 'development')
     return 'dev'
+
   if (app.env === 'staging')
     return 'stage'
+
   if (app.env === 'production')
     return 'prod'
 

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

@@ -1,9 +1,7 @@
 import type { StacksOptions } from '@stacksjs/types'
 import { commandsPath, userDatabasePath } from '@stacksjs/path'
 
-// import { userConfig as overrides } from './overrides'
-
-const config: StacksOptions = {
+const defaults: StacksOptions = {
   ai: {
     deploy: false,
     models: [
@@ -687,4 +685,4 @@ const config: StacksOptions = {
   },
 }
 
-export default config
+export default defaults

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

@@ -11,7 +11,6 @@ import type {
   Events,
   GitConfig,
   HashingConfig,
-  JobConfig,
   LibraryConfig,
   Model,
   NotificationConfig,
@@ -143,14 +142,6 @@ export function defineCli(config: CliConfig): CliConfig {
   return config
 }
 
-export function defineJob(config: JobConfig): JobConfig {
-  return config
-}
-
-export function defineCronJob(config: JobConfig): JobConfig {
-  return config
-}
-
 export function defineDatabase(config: DatabaseConfig): DatabaseConfig {
   return config
 }

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

@@ -1,3 +1,11 @@
+/**
+ * **Overrides**
+ *
+ * This file is what takes prepares the user config to be merged with
+ * the default config. For anyone that uses this, ensure you define
+ * the alias `~config/` in your tsconfig.json file.
+ */
+
 import type { StacksConfig } from '@stacksjs/types'
 import ai from '~/config/ai'
 import analytics from '~/config/analytics'

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

@@ -1,6 +1,6 @@
 import type { Database } from '@stacksjs/orm'
 import type { RawBuilder } from 'kysely'
-import { config } from '@stacksjs/config'
+import { getConfig } from '@stacksjs/config'
 import { log } from '@stacksjs/logging'
 import { projectPath } from '@stacksjs/path'
 import { Kysely, MysqlDialect, PostgresDialect, sql } from 'kysely'
@@ -11,15 +11,15 @@ import { Pool } from 'pg'
 
 // Simple functions with defensive defaults in case the imports failed
 function getEnv(): string {
-  return config?.app?.env || 'local'
+  return getConfig()?.app?.env || 'local'
 }
 
 function getDriver(): string {
-  return config?.database?.default || 'sqlite'
+  return getConfig()?.database?.default || 'sqlite'
 }
 
 function getDatabaseConfig() {
-  return config?.database || { connections: {} }
+  return getConfig()?.database || { connections: {} }
 }
 
 export function getDialect(): MysqlDialect | PostgresDialect | BunWorkerDialect {

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

@@ -259,7 +259,7 @@ interface SiteConfig {
   path: string
 }
 
-type InfrastuctureOptions = Partial<{
+type InfrastructureOptions = Partial<{
   type: 'serverless' // | 'server' coming soon
   driver: 'aws'
   api: ApiConfig
@@ -336,7 +336,7 @@ export interface CloudOptions {
     [site: string]: string | SiteConfig
   }
 
-  infrastructure: InfrastuctureOptions
+  infrastructure: InfrastructureOptions
 }
 
 export type CloudConfig = Partial<CloudOptions>

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

@@ -4,15 +4,13 @@ export {
   defineCdn,
   defineChat,
   defineCli,
-  defineCronJob,
   defineDatabase,
   defineDependencies,
   defineDns,
   defineEmail,
   defineEmailConfig,
   defineGit,
   defineHashing,
-  defineJob,
   defineLibrary,
   defineNotification,
   definePayment,

storage/framework/defaults/ide/dictionary.txt

@@ -353,6 +353,7 @@ unimport
 universalify
 unmanaged
 unocss
+unplugin
 Unprefix
 Unprefixed
 unstorage