chore: wip

Author: chrisbbreuer

.stacks/core/actions/src/generate/env-files.ts

@@ -1,5 +1,9 @@
+import { path as p } from '@stacksjs/path'
 import { storage } from '@stacksjs/storage'
-import { envKeys } from '~/storage/framework/stacks/env'
+import { enums, env as e } from '@stacksjs/env'
+import { envKeys, EnvKey } from '~/storage/framework/stacks/env'
+
+console.log('Generating env files...')
 
 // generate ./storage/framework/types/env.d.ts file from .env
 const envTypes = `
@@ -11,20 +15,30 @@ const envTypes = `
 declare module 'bun' {
   namespace env {
     ${envKeys.map((key) => {
-      const value = Bun.env[key]
+      console.log(`  - ${key}`)
+      const value = e[key]
+      console.log(`    - ${value}`)
       let type = 'string'
-      if (value === 'true' || value === 'false')
-        type = 'boolean'
-      else if (!Number.isNaN(Number(value)))
-        type = 'number'
+      if (typeof value === 'string') {
+        if (value.toLowerCase() === 'true' || value.toLowerCase() === 'false') {
+          type = 'boolean'
+        } else if (!isNaN(parseFloat(value)) && isFinite(Number(value))) {
+          type = 'number'
+        } else if (enums[key]) {
+          // @ts-ignore
+          type = enums[key].map(item => `'${item}'`).join(' | ')
+        }
+      }
 
       return `const ${key}: ${type}`
     }).join('\n    ')}
   }
 }
 `
 
-await storage.writeFile('framework/types/env.d.ts', envTypes)
+await storage.writeFile(p.projectStoragePath('framework/types/env.d.ts'), envTypes)
+
+console.log('  - ./storage/framework/stacks/env.ts')
 
 // generate ./storage/framework/stacks/env.ts file based on Bun.env
 const env = `
@@ -40,4 +54,6 @@ export const envKeys = [
 export type EnvKey = typeof envKeys[number]
 `
 
-await storage.writeFile('framework/stacks/env.ts', env)
+await storage.writeFile(p.projectStoragePath('framework/stacks/env.ts'), env)
+
+console.log('  - ./storage/framework/stacks/env.d.ts')

.stacks/core/env/src/index.ts

@@ -1,7 +1,20 @@
+interface EnumObject {
+  [key: string]: string[];
+}
+
+export const enums: EnumObject = {
+  APP_ENV: ['development', 'staging', 'production'],
+  DB_CONNECTION: ['mysql', 'sqlite', 'postgres', 'planetscale'],
+  MAIL_MAILER: ['smtp', 'mailgun', 'ses', 'postmark', 'sendmail', 'log'],
+  SEARCH_ENGINE_DRIVER: ['meilisearch', 'algolia', 'typesense'],
+  FRONTEND_APP_ENV: ['development', 'staging', 'production'],
+}
+
 const handler = {
   get: (target: typeof Bun.env, key: string) => {
     // @ts-ignore
     const value = target[key]
+    if (enums[key]?.includes(value)) return value
     if (value === 'true') return true
     if (value === 'false') return false
     if (!isNaN(Number(value))) return Number(value)

storage/framework/stacks/env.ts

@@ -1,4 +1,9 @@
-// auto-generated by Stacks
+
+// This file is auto-generated by Stacks. Do not edit this file manually.
+// If you want to change the environment variables, please edit the .env file.
+//
+// For more information, please visit: https://stacksjs.com/docs
+
 export const envKeys = [
   'APP_NAME',
   'APP_ENV',
@@ -27,7 +32,7 @@ export const envKeys = [
   'MEILISEARCH_HOST',
   'MEILISEARCH_KEY',
   'FRONTEND_APP_ENV',
-  'FRONTEND_APP_URL',
+  'FRONTEND_APP_URL'
 ] as const
 
 export type EnvKey = typeof envKeys[number]

storage/framework/types/env.d.ts

@@ -1,37 +1,37 @@
-// Stacks auto-generated
+
+// This file is auto-generated by Stacks. Do not edit this file manually.
+// If you want to change the environment variables, please edit the .env file.
+//
+// For more information, please visit: https://stacksjs.com/docs
+
 declare module 'bun' {
   namespace env {
     const APP_NAME: string
     const APP_ENV: 'development' | 'staging' | 'production'
     const APP_KEY: string
     const APP_URL: string
-    const DEBUG: boolean
-
+    const DEBUG: string
     const DB_CONNECTION: 'mysql' | 'sqlite' | 'postgres' | 'planetscale'
     const DB_HOST: string
-    const DB_PORT: number
+    const DB_PORT: string
     const DB_DATABASE: string
     const DB_USERNAME: string
     const DB_PASSWORD: string
-
     const AWS_ACCOUNT_ID: string
     const AWS_ACCESS_KEY_ID: string
     const AWS_SECRET_ACCESS_KEY: string
     const AWS_DEFAULT_REGION: string
-
     const MAIL_MAILER: 'smtp' | 'mailgun' | 'ses' | 'postmark' | 'sendmail' | 'log'
     const MAIL_HOST: string
-    const MAIL_PORT: number
+    const MAIL_PORT: string
     const MAIL_USERNAME: string
     const MAIL_PASSWORD: string
     const MAIL_ENCRYPTION: string
     const MAIL_FROM_NAME: string
     const MAIL_FROM_ADDRESS: string
-
     const SEARCH_ENGINE_DRIVER: 'meilisearch' | 'algolia' | 'typesense'
     const MEILISEARCH_HOST: string
     const MEILISEARCH_KEY: string
-
     const FRONTEND_APP_ENV: 'development' | 'staging' | 'production'
     const FRONTEND_APP_URL: string
   }