chore: wip

Author: chrisbbreuer

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

@@ -4,7 +4,6 @@ import { ok } from '@stacksjs/error-handling'
 import { modelTableName } from '@stacksjs/orm'
 import { path } from '@stacksjs/path'
 import { fs, glob } from '@stacksjs/storage'
-import { pluralize, snakeCase } from '@stacksjs/strings'
 import type { Attribute, Attributes, Model } from '@stacksjs/types'
 import { checkPivotMigration, fetchOtherModelRelations, getLastMigrationFields, hasTableBeenMigrated, mapFieldTypeToColumnType } from '.'
 

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

@@ -1,6 +1,19 @@
 import { generator, parser, traverse } from '@stacksjs/build'
 import { fs } from '@stacksjs/storage'
+import { plural, snakeCase } from '@stacksjs/strings'
 import type { Attributes } from '@stacksjs/types'
+import type { Model } from '@stacksjs/types'
+
+type ModelPath = string
+
+export async function modelTableName(model: Model | ModelPath): Promise<string> {
+  if (typeof model === 'string') {
+    const modelPath = model
+    model = (await import(model)).default as Model
+  }
+
+  return model.table ?? snakeCase(plural(model.name ?? modelPath.replace(/.*\/(.*)\.ts$/, '$1')))
+}
 
 export async function extractFieldsFromModel(filePath: string) {
   // Read the TypeScript file

storage/framework/database/models/AccessToken.ts

@@ -46,7 +46,16 @@ export default {
           '`abilities` must be string of either `read`, `write`, `admin`, `read|write`, `read|admin`, `write|admin`, or `read|write|admin`',
       },
 
-      factory: () => collect(['read', 'write', 'admin', 'read|write', 'read|admin', 'write|admin', 'read|write|admin']).random(),
+      factory: () =>
+        collect([
+          'read',
+          'write',
+          'admin',
+          'read|write',
+          'read|admin',
+          'write|admin',
+          'read|write|admin',
+        ]).random(),
     },
   },
 } satisfies Model

storage/framework/database/models/Project.ts

@@ -1,7 +1,7 @@
-import { collect } from '@stacksjs/collections'
 import { faker } from '@stacksjs/faker'
 import type { Model } from '@stacksjs/types'
 import { schema } from '@stacksjs/validation'
+import { collect } from '@stacksjs/collections'
 
 export default {
   name: 'Project', // defaults to the sanitized file name
@@ -33,7 +33,7 @@ export default {
         message: '`description` must be a string',
       },
 
-      factory: () => faker.lorem.sentence({ min: 10, max: 10 }),
+      factory: () => faker.lorem.sentence({ min: 10, max: 25 }),
     },
 
     url: {

storage/framework/orm/src/index.ts

@@ -1,3 +1 @@
 export * from './Subscriber.ts'
-
-export * from './utils'