chore: wip

Author: glennmichael123

storage/framework/core/database/src/drivers/index.ts

@@ -4,7 +4,7 @@ import { getTableName } from '@stacksjs/orm'
 import { path } from '@stacksjs/path'
 import { fs, globSync } from '@stacksjs/storage'
 import { plural, snakeCase } from '@stacksjs/strings'
-import type { Attributes, Model, VineType } from '@stacksjs/types'
+import type { Attribute, Attributes, Model, VineType } from '@stacksjs/types'
 export * from './mysql'
 export * from './postgres'
 export * from './sqlite'
@@ -33,15 +33,15 @@ export async function modelTableName(model: Model | string): Promise<string> {
   return model.table ?? snakeCase(plural(model?.name || ''))
 }
 
-export async function hasTableBeenMigrated(tableName: string) {
+export async function hasTableBeenMigrated(tableName: string): Promise<boolean> {
   log.debug(`hasTableBeenMigrated for table: ${tableName}`)
 
   const results = await getExecutedMigrations()
 
   return results.some((migration) => migration.name.includes(tableName))
 }
 
-export async function getExecutedMigrations() {
+export async function getExecutedMigrations(): Promise<{ name: string }[]> {
   try {
     return await db.selectFrom('migrations').select('name').execute()
   } catch (error) {
@@ -175,7 +175,7 @@ export function pluckChanges(array1: string[], array2: string[]): { added: strin
   return { added, removed }
 }
 
-export function arrangeColumns(attributes: Attributes | undefined) {
+export function arrangeColumns(attributes: Attributes | undefined): Attribute[] | string[] {
   if (!attributes) return []
 
   const entries = Object.entries(attributes)
@@ -186,7 +186,7 @@ export function arrangeColumns(attributes: Attributes | undefined) {
     return orderA - orderB
   })
 
-  return entries
+  return entries as Attribute[]
 }
 
 export function isArrayEqual(arr1: (number | undefined)[], arr2: (number | undefined)[]): boolean {

storage/framework/core/database/src/drivers/mysql.ts

@@ -1,10 +1,10 @@
 import { italic, log } from '@stacksjs/cli'
 import { db } from '@stacksjs/database'
-import { ok } from '@stacksjs/error-handling'
+import { type Ok, ok } from '@stacksjs/error-handling'
 import { getModelName, getTableName } from '@stacksjs/orm'
 import { fetchOtherModelRelations, getPivotTables } from '@stacksjs/orm'
 import { path } from '@stacksjs/path'
-import { fs, glob, globSync } from '@stacksjs/storage'
+import { fs, globSync } from '@stacksjs/storage'
 
 import { snakeCase } from '@stacksjs/strings'
 import type { Attribute, Attributes, Model } from '@stacksjs/types'
@@ -20,7 +20,7 @@ import {
   pluckChanges,
 } from '.'
 
-export async function resetMysqlDatabase() {
+export async function resetMysqlDatabase(): Promise<Ok<string, any>> {
   const tables = await fetchTables()
 
   for (const table of tables) await db.schema.dropTable(table).ifExists().execute()
@@ -62,7 +62,7 @@ export async function resetMysqlDatabase() {
   return ok('All tables dropped successfully!')
 }
 
-export async function generateMysqlMigration(modelPath: string) {
+export async function generateMysqlMigration(modelPath: string): Promise<void> {
   // check if any files are in the database folder
   // const files = await fs.readdir(path.userMigrationsPath())
 
@@ -123,7 +123,7 @@ export async function generateMysqlMigration(modelPath: string) {
   else await createTableMigration(modelPath)
 }
 
-async function createTableMigration(modelPath: string) {
+async function createTableMigration(modelPath: string): Promise<void> {
   log.debug('createTableMigration modelPath:', modelPath)
 
   const model = (await import(modelPath)).default as Model
@@ -197,7 +197,7 @@ async function createTableMigration(modelPath: string) {
   log.success(`Created migration: ${italic(migrationFileName)}`)
 }
 
-async function createPivotTableMigration(model: Model, modelPath: string) {
+async function createPivotTableMigration(model: Model, modelPath: string): Promise<void> {
   const pivotTables = await getPivotTables(model, modelPath)
 
   if (!pivotTables.length) return
@@ -228,7 +228,7 @@ async function createPivotTableMigration(model: Model, modelPath: string) {
   }
 }
 
-export async function createAlterTableMigration(modelPath: string) {
+export async function createAlterTableMigration(modelPath: string): Promise<void> {
   console.log('createAlterTableMigration')
 
   const model = (await import(modelPath)).default as Model

storage/framework/core/orm/src/drivers/dynamodb.ts

@@ -1,4 +1,3 @@
-import { generator, parser, traverse } from '@stacksjs/build'
 import { italic, log } from '@stacksjs/cli'
 import { path } from '@stacksjs/path'
 import { fs, globSync } from '@stacksjs/storage'
@@ -38,40 +37,6 @@ export function getTableName(model: Model, modelPath: string): string {
   return snakeCase(plural(getModelName(model, modelPath)))
 }
 
-export async function extractAttributesFromModel(filePath: string) {
-  // Read the TypeScript file
-  const content = fs.readFileSync(filePath, 'utf8')
-
-  // Parse the file content into an AST
-  const ast = parser.parse(content, {
-    sourceType: 'module',
-    plugins: ['typescript', 'classProperties', 'decorators-legacy'],
-  })
-
-  let fields: Attributes | undefined
-
-  // Traverse the AST to find the `fields` object
-  traverse(ast, {
-    ObjectExpression(path) {
-      // Look for the `fields` key in the object
-      const fieldsProperty = path.node.properties.find((property) => property.key?.name === 'attributes')
-
-      if (fieldsProperty?.value) {
-        // Convert the AST back to code (stringify)
-        const generated = generator(fieldsProperty.value, {}, content)
-        fields = generated.code
-        path.stop() // Stop traversing further once we found the fields
-      }
-    },
-  })
-
-  return fields
-}
-
-export function userModels() {
-  return import.meta.glob<{ default: Model }>(path.userModelsPath('*.ts'))
-}
-
 export function getPivotTableName(formattedModelName: string, modelRelationTable: string): string {
   // Create an array of the model names
   const models = [formattedModelName, modelRelationTable]

storage/framework/core/orm/src/drivers/mysql.ts

@@ -15,7 +15,7 @@ export class Middleware implements MiddlewareOptions {
 
 // const readdir = promisify(fs.readdir)
 
-async function importMiddlewares(directory: string) {
+async function importMiddlewares(directory: string): Promise<string[]> {
   // const middlewares = []
   // TODO: somehow this breaks ./buddy dev
   // const files = await readdir(directory)
@@ -30,6 +30,6 @@ async function importMiddlewares(directory: string) {
   return [directory] // fix this: return array of middlewares
 }
 
-export const middlewares = async () => {
+export const middlewares = async (): Promise<string[]> => {
   return await importMiddlewares(userMiddlewarePath())
 }

storage/framework/core/orm/src/drivers/postgres.ts

@@ -74,7 +74,7 @@ export class Request<T extends RequestData = RequestData> implements RequestInst
     return this.headers.get(headerParam)
   }
 
-  public getHeaders() {
+  public getHeaders(): any {
     return this.headers
   }
 
@@ -106,4 +106,4 @@ export class Request<T extends RequestData = RequestData> implements RequestInst
   }
 }
 
-export const request = new Request()
+export const request: Request = new Request()

storage/framework/core/orm/src/drivers/sqlite.ts

@@ -122,9 +122,10 @@ function extractDynamicSegments(routePattern: string, path: string): RouteParam
 
   const dynamicSegments: { [key: string]: string } = {}
   dynamicSegmentNames.forEach((name, index) => {
-    dynamicSegments[name] = dynamicSegmentValues[index]
+    if (name && dynamicSegmentValues[index] !== undefined) {
+      dynamicSegments[name] = dynamicSegmentValues[index] // Ensure value is defined
+    }
   })
-
   return dynamicSegments
 }
 
@@ -290,15 +291,15 @@ async function execute(foundRoute: Route, req: Request, { statusCode }: Options)
   })
 }
 
-function noCache(response: Response) {
+function noCache(response: Response): Response {
   response.headers.set('Cache-Control', 'no-store, no-cache, must-revalidate, proxy-revalidate')
   response.headers.set('Pragma', 'no-cache')
   response.headers.set('Expires', '0')
 
   return response
 }
 
-async function addRouteQuery(url: URL) {
+async function addRouteQuery(url: URL): Promise<void> {
   const modelFiles = globSync([path.userModelsPath('*.ts')], { absolute: true })
   for (const modelFile of modelFiles) {
     const model = (await import(modelFile)).default
@@ -315,7 +316,7 @@ async function addRouteQuery(url: URL) {
   RequestParam.addQuery(url)
 }
 
-async function addBody(params: any) {
+async function addBody(params: any): Promise<void> {
   const modelFiles = globSync([path.userModelsPath('*.ts')], { absolute: true })
 
   for (const modelFile of modelFiles) {