chore: wip

Author: chrisbbreuer

storage/framework/core/actions/src/orm/generate-model.ts

@@ -533,7 +533,7 @@ async function deleteExistingModelRequest(modelStringFile?: string) {
 }
 
 async function deleteExistingOrmRoute() {
-  const ormRoute = path.projectStoragePath('framework/orm/routes')
+  const ormRoute = path.storagePath('framework/orm/routes')
 
   if (fs.existsSync(ormRoute)) await Bun.$`rm ${ormRoute}`
 }

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

@@ -90,8 +90,8 @@ export const alias: Record<string, string> = {
   '@stacksjs/sms/*': p.smsPath('src/*'),
   '@stacksjs/scheduler': p.schedulerPath('src/index.ts'),
   '@stacksjs/scheduler/*': p.schedulerPath('src/*'),
-  '@stacksjs/storage': p.storagePath('src/index.ts'),
-  '@stacksjs/storage/*': p.storagePath('src/*'),
+  '@stacksjs/storage': p.coreStoragePath('src/index.ts'),
+  '@stacksjs/storage/*': p.coreStoragePath('src/*'),
   '@stacksjs/strings': p.stringsPath('src/index.ts'),
   '@stacksjs/strings/*': p.stringsPath('src/*'),
   '@stacksjs/testing/*': p.testingPath('*'),
@@ -187,8 +187,8 @@ export const alias: Record<string, string> = {
   'stacks/sms/*': p.smsPath('src/*'),
   'stacks/scheduler': p.schedulerPath('src/index.ts'),
   'stacks/scheduler/*': p.schedulerPath('src/*'),
-  'stacks/storage': p.storagePath('src/index.ts'),
-  'stacks/storage/*': p.storagePath('src/*'),
+  'stacks/storage': p.coreStoragePath('src/index.ts'),
+  'stacks/storage/*': p.coreStoragePath('src/*'),
   'stacks/strings': p.stringsPath('src/index.ts'),
   'stacks/strings/*': p.stringsPath('src/*'),
   'stacks/testing/*': p.testingPath('*'),

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

@@ -330,13 +330,13 @@ export function make(buddy: CLI) {
 
       log.info(`Creating SSL certificate...`)
       await runCommand(`tlsx ${domain}`, {
-        cwd: p.projectStoragePath('keys'),
+        cwd: p.storagePath('keys'),
       })
       log.success('Certificate created')
 
       log.info(`Installing SSL certificate...`)
       await runCommand(`tlsx -install`, {
-        cwd: p.projectStoragePath('keys'),
+        cwd: p.storagePath('keys'),
       })
       log.success('Certificate installed')
     })

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

@@ -13,8 +13,8 @@ export const frameworkDefaults = {
   base: '/docs/',
   cleanUrls: true,
   srcDir: p.projectPath('docs'),
-  outDir: p.projectStoragePath('framework/docs'),
-  cacheDir: p.projectStoragePath('framework/cache/docs'),
+  outDir: p.storagePath('framework/docs'),
+  cacheDir: p.storagePath('framework/cache/docs'),
   assetsDir: p.assetsPath(),
   // sitemap: {
   //   hostname: 'stacks.localhost',

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

@@ -13,18 +13,19 @@ export async function writeToLogFile(message: string) {
   const formattedMessage = `[${new Date().toISOString()}] ${message}\n`
 
   try {
-    const logFilePath = config.logging.logsPath ?? 'storage/logs/stacks.log'
+    const logFile = config.logging.logsPath ?? 'storage/logs/stacks.log'
 
     try {
       // Check if the file exists
-      await access(logFilePath)
+      await access(logFile)
     } catch {
       // File doesn't exist, create the directory
-      await mkdir(dirname(logFilePath), { recursive: true })
+      console.log('Creating log file directory...', logFile)
+      await mkdir(dirname(logFile), { recursive: true })
     }
 
     // Append the message to the log file
-    await appendFile(logFilePath, formattedMessage)
+    await appendFile(logFile, formattedMessage)
   } catch (error) {
     console.error('Failed to write to log file:', error)
   }

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

@@ -619,7 +619,7 @@ export function fakerPath(path?: string): string {
  * @returns The absolute or relative path to the specified file or directory within the framework directory.
  */
 export function frameworkPath(path?: string, options?: { relative?: boolean; cwd?: string }): string {
-  const absolutePath = projectStoragePath(`framework/${path || ''}`)
+  const absolutePath = storagePath(`framework/${path || ''}`)
 
   if (options?.relative) return relative(options.cwd || process.cwd(), absolutePath)
 
@@ -740,7 +740,7 @@ export function loggingPath(path?: string): string {
  * @returns The absolute path to the specified file or directory within the `logs` directory.
  */
 export function logsPath(path?: string): string {
-  return projectStoragePath(`logs/${path || ''}`)
+  return storagePath(`logs/${path || ''}`)
 }
 
 /**
@@ -908,7 +908,7 @@ export function projectConfigPath(path?: string): string {
  * @param path - The relative path to the file or directory within the storage directory.
  * @returns The absolute path to the specified file or directory within the storage directory.
  */
-export function projectStoragePath(path?: string): string {
+export function storagePath(path?: string): string {
   return projectPath(`storage/${path || ''}`)
 }
 
@@ -971,7 +971,7 @@ export function realtimePath(path?: string) {
  * @returns The absolute or relative path to the specified file or directory within the `resources` directory.
  */
 export function resourcesPath(path?: string, options?: { relative?: boolean }) {
-  const absolutePath = projectStoragePath(`resources/${path || ''}`)
+  const absolutePath = coreStoragePath(`resources/${path || ''}`)
 
   if (options?.relative) return relative(process.cwd(), absolutePath)
 
@@ -1080,7 +1080,7 @@ export function smsPath(path?: string) {
  * @param path - The relative path to the file or directory within the storage directory.
  * @returns The absolute path to the specified file or directory within the storage directory.
  */
-export function storagePath(path?: string) {
+export function coreStoragePath(path?: string) {
   return corePath(`storage/${path || ''}`)
 }
 
@@ -1338,7 +1338,7 @@ export const path = {
   paymentsPath,
   projectPath,
   findProjectPath,
-  projectStoragePath,
+  coreStoragePath,
   publicPath,
   pushPath,
   queryBuilderPath,

storage/framework/core/router/build2.ts

@@ -1,12 +1,12 @@
-import { projectStoragePath, routesPath } from '@stacksjs/path'
+import { storagePath, routesPath } from '@stacksjs/path'
 import { intro, outro } from '../build/src'
 
 const { startTime } = await intro({
   dir: import.meta.dir,
 })
 
 const result = await Bun.build({
-  entrypoints: [routesPath('api.ts'), projectStoragePath('framework/orm/routes.ts')],
+  entrypoints: [routesPath('api.ts'), storagePath('framework/orm/routes.ts')],
   outdir: './dist',
   format: 'esm',
   target: 'bun',

storage/framework/core/router/src/router.ts

@@ -275,7 +275,7 @@ export class Router implements RouterInterface {
 
     if (callbackPath.startsWith('../')) importPathFunction = p.routesPath
 
-    if (modulePath.includes('OrmAction')) importPathFunction = p.projectStoragePath
+    if (modulePath.includes('OrmAction')) importPathFunction = p.coreStoragePath
 
     // Remove trailing .ts if present
     modulePath = modulePath.endsWith('.ts') ? modulePath.slice(0, -3) : modulePath

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

@@ -17,15 +17,13 @@ export function extractModelFromAction(action: string): string {
 
   if (action.includes('IndexOrmAction')) {
     const match = action.match(/\/([A-Z][a-z]+)IndexOrmAction/)
-
     const modelString = match ? match[1] : ''
 
     model = modelString as string
   }
 
   if (action.includes('StoreOrmAction')) {
     const match = action.match(/\/([A-Z][a-z]+)StoreOrmAction/)
-
     const modelString = match ? match[1] : ''
 
     model = modelString as string
@@ -57,31 +55,24 @@ export function extractModelFromAction(action: string): string {
 
 export function extractDynamicAction(action: string): string | undefined {
   const regex = /Actions\/(.*?)Action/
-
   const match = action.match(regex)
 
   return match ? match[1] : ''
 }
 
 export async function extractModelRequest(action: string) {
   const extractedModel = extractModelFromAction(action)
-
   const lowerCaseModel = camelCase(extractedModel)
-
   const requestPath = path.frameworkPath(`requests/${extractedModel}Request.ts`)
-
   const requestInstance = await import(requestPath)
-
   const requestIndex = `${lowerCaseModel}Request`
 
   return requestInstance[requestIndex]
 }
 
 export async function findRequestInstance(requestInstance: string) {
-  const frameworkDirectory = path.projectStoragePath('framework/requests')
-
+  const frameworkDirectory = path.storagePath('framework/requests')
   const filePath = path.join(frameworkDirectory, `${requestInstance}.ts`)
-
   const pathExists = await existsSync(filePath)
 
   // Check if the directory exists
@@ -91,8 +82,7 @@ export async function findRequestInstance(requestInstance: string) {
     return requestInstance.request
   }
 
-  const defaultRequestPath = path.projectStoragePath('framework/core/router/src/request.ts')
-
+  const defaultRequestPath = path.storagePath('framework/core/router/src/request.ts')
   const fileExists = await existsSync(defaultRequestPath)
 
   if (fileExists) {

storage/framework/ide/dictionary.txt

@@ -294,6 +294,7 @@ templating
 termii
 terserrc
 textlint
+Thhmmss
 timestampable
 treeshaking
 triggerable