chore: wip

Author: chrisbbreuer

config/storage.ts

@@ -6,7 +6,55 @@ import type { StorageConfig } from '@stacksjs/types'
  * This configuration defines all of your storage options. Because Stacks is fully-typed,
  * you may hover any of the options below and the definitions will be provided. In case
  * you have any questions, feel free to reach out via Discord or GitHub Discussions.
+ *
+ * @see https://stacksjs.org/docs/storage
  */
 export default {
-  driver: 's3',
+  /**
+   * Storage driver to use
+   *
+   * Options: 'local', 'bun', 's3', 'memory'
+   * - 'local': Node.js fs-based storage (compatible, slower)
+   * - 'bun': Bun-native storage (fastest, recommended when using Bun)
+   * - 's3': AWS S3 or S3-compatible storage
+   * - 'memory': In-memory storage (for testing)
+   */
+  driver: process.env.STORAGE_DRIVER || 'bun',
+
+  /**
+   * Root directory for local/bun drivers
+   *
+   * @default process.cwd()
+   */
+  root: process.env.STORAGE_ROOT || process.cwd(),
+
+  /**
+   * S3 Configuration (when driver is 's3')
+   */
+  s3: {
+    bucket: process.env.AWS_S3_BUCKET || '',
+    region: process.env.AWS_REGION || 'us-east-1',
+    prefix: process.env.AWS_S3_PREFIX || '',
+    credentials: process.env.AWS_ACCESS_KEY_ID && process.env.AWS_SECRET_ACCESS_KEY
+      ? {
+          accessKeyId: process.env.AWS_ACCESS_KEY_ID,
+          secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
+        }
+      : undefined,
+    // endpoint: 'https://s3-compatible-service.com', // For S3-compatible services
+  },
+
+  /**
+   * Public URL configuration
+   */
+  publicUrl: {
+    domain: process.env.STORAGE_PUBLIC_URL || process.env.APP_URL || 'http://localhost',
+  },
+
+  /**
+   * Default file visibility
+   *
+   * @default 'private'
+   */
+  defaultVisibility: 'private',
 } satisfies StorageConfig

storage/framework/config/ace-config.ts

@@ -7,7 +7,6 @@ import { path } from '@stacksjs/path'
 import { makeHash } from '@stacksjs/security'
 import { fs } from '@stacksjs/storage'
 import { snakeCase } from '@stacksjs/strings'
-import { globSync } from 'tinyglobby'
 
 async function seedModel(name: string, modelPath: string, model: Model) {
   if (model?.traits?.useSeeder === false || model?.traits?.seedable === false) {

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

@@ -2,7 +2,6 @@ import { path } from '@stacksjs/path'
 import { fs } from '@stacksjs/storage'
 import { plural, snakeCase } from '@stacksjs/strings'
 import type { Model } from '@stacksjs/types'
-import { globSync } from 'tinyglobby'
 
 export function getModelName(model: Model, modelPath: string): string {
   if (model.name)
@@ -22,26 +21,26 @@ export function getTableName(model: Model, modelPath: string): string {
 
 function extractHiddenFields(model: Model): string[] {
   if (!model.attributes) return []
-  
-  return Object.keys(model.attributes).filter(key => 
+
+  return Object.keys(model.attributes).filter(key =>
     model.attributes?.[key]?.hidden === true
   ).map(field => snakeCase(field))
 }
 
 function extractFillableFields(model: Model): string[] {
   if (!model.attributes) return []
-  
-  const fillable = Object.keys(model.attributes).filter(key => 
+
+  const fillable = Object.keys(model.attributes).filter(key =>
     model.attributes?.[key]?.fillable === true
   ).map(field => snakeCase(field))
 
   // Add trait-specific fillable fields
   const additionalFields: string[] = []
-  
+
   if (model.traits?.useUuid) {
     additionalFields.push('uuid')
   }
-  
+
   if (model.traits?.useAuth) {
     const useAuth = model.traits.useAuth
     if (typeof useAuth === 'object' && useAuth.usePasskey) {
@@ -54,8 +53,8 @@ function extractFillableFields(model: Model): string[] {
 
 function extractGuardedFields(model: Model): string[] {
   if (!model.attributes) return []
-  
-  return Object.keys(model.attributes).filter(key => 
+
+  return Object.keys(model.attributes).filter(key =>
     model.attributes?.[key]?.guarded === true
   ).map(field => snakeCase(field))
 }
@@ -145,7 +144,7 @@ class ${modelName}Model {
   // Create a new record
   static async create(data: Record<string, any>) {
     const instance = new ${modelName}Model()
-    
+
     // Filter based on fillable and guarded
     const filteredData = Object.fromEntries(
       Object.entries(data).filter(([key]) =>
@@ -211,11 +210,11 @@ class ${modelName}Model {
   // Convert to JSON (excluding hidden fields)
   toJSON() {
     const json = { ...this.attributes }
-    
+
     for (const field of this.hidden) {
       delete json[field]
     }
-    
+
     return json
   }
 }
@@ -236,15 +235,15 @@ export async function generateOrmModels(): Promise<void> {
     const tableName = getTableName(model, userModelFile)
 
     const modelString = generateOrmModelString(modelName, tableName, model)
-    
+
     // Ensure the directory exists
     const ormModelsDir = path.storagePath('framework/core/db/src/orm/Models')
     await fs.promises.mkdir(ormModelsDir, { recursive: true })
 
     // Write the generated model file
     const outputPath = path.join(ormModelsDir, `${modelName}.ts`)
     await fs.promises.writeFile(outputPath, modelString, 'utf8')
-    
+
     console.log(`Generated ORM model: ${modelName} -> ${outputPath}`)
   }
 }
@@ -255,15 +254,15 @@ export async function generateOrmModel(modelPath: string): Promise<void> {
   const tableName = getTableName(model, modelPath)
 
   const modelString = generateOrmModelString(modelName, tableName, model)
-  
+
   // Ensure the directory exists
   const ormModelsDir = path.storagePath('framework/core/db/src/orm/Models')
   await fs.promises.mkdir(ormModelsDir, { recursive: true })
 
   // Write the generated model file
   const outputPath = path.join(ormModelsDir, `${modelName}.ts`)
   await fs.promises.writeFile(outputPath, modelString, 'utf8')
-  
+
   console.log(`Generated ORM model: ${modelName} -> ${outputPath}`)
 }
 

storage/framework/core/db/src/orm/generate.ts

@@ -35,8 +35,7 @@
     "prepublishOnly": "bun run build"
   },
   "dependencies": {
-    "@stacksjs/ts-validation": "^0.4.7",
-    "tinyglobby": "^0.2.15"
+    "@stacksjs/ts-validation": "^0.4.7"
   },
   "devDependencies": {
     "@stacksjs/build": "workspace:*",

storage/framework/core/orm/package.json

@@ -21,7 +21,6 @@ import { path } from '@stacksjs/path'
 import { fs } from '@stacksjs/storage'
 import { camelCase, kebabCase, pascalCase, plural, singular, slugify, snakeCase } from '@stacksjs/strings'
 import { isString } from '@stacksjs/validation'
-import { globSync } from 'tinyglobby'
 import { generateModelString } from './generate'
 import { generateTraitRequestTypes, generateTraitTableInterfaces, traitInterfaces } from './generated/table-traits'
 
@@ -612,7 +611,7 @@ export async function writeModelEvents(): Promise<void> {
   eventString += `
   ${observerImports} \n\n
 
-  export interface ModelEvents {\n 
+  export interface ModelEvents {\n
     ${observerString}
   }`
 
@@ -1757,7 +1756,7 @@ export interface ${formattedTableName}Table {
 
     if (relationType === 'belongsType' && !relationCount) {
       const relationName = camelCase(relation.relationName || formattedModelRelation)
-      modelTypeInterface += `  get ${snakeCase(relationName)}(): ${modelRelation}ModelType | undefined 
+      modelTypeInterface += `  get ${snakeCase(relationName)}(): ${modelRelation}ModelType | undefined
       `
     }
 

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

@@ -1,7 +1,6 @@
 import type { BroadcastInstance, ChannelType, RealtimeDriver } from '@stacksjs/types'
 import { config } from '@stacksjs/config'
 import { appPath } from '@stacksjs/path'
-import { globSync } from 'tinyglobby'
 import { RealtimeFactory } from './factory'
 
 export class Broadcast {

storage/framework/core/realtime/src/broadcast.ts

@@ -59,7 +59,6 @@
     "@stacksjs/strings": "workspace:*",
     "@stacksjs/types": "workspace:*",
     "@types/archiver": "^6.0.3",
-    "archiver": "^7.0.1",
-    "tinyglobby": "^0.2.15"
+    "archiver": "^7.0.1"
   }
 }

storage/framework/core/storage/package.json

@@ -1,7 +1,3 @@
-import { globSync as gs } from 'tinyglobby'
-
-export { glob } from 'tinyglobby'
-
 export interface GlobOptions {
   absolute?: boolean
   cwd?: string