chore: wip

Author: chrisbbreuer

app/Models/AccessToken.ts

@@ -1,10 +1,11 @@
+import { collect } from '@stacksjs/collections'
 import { faker } from '@stacksjs/faker'
 import type { Model } from '@stacksjs/types'
 import { schema } from '@stacksjs/validation'
 
 export default {
   name: 'AccessToken', // defaults to the sanitized file name
-  table: 'access_tokens', // defaults to the lowercase, plural name of the model
+  table: 'access_tokens', // defaults to the lowercase, plural name of the model name (or the name of the model file)
   primaryKey: 'id', // defaults to `id`
   autoIncrement: true, // defaults to true
 
@@ -41,10 +42,20 @@ export default {
     abilities: {
       validator: {
         rule: schema.enum(['read', 'write', 'admin', 'read|write', 'read|admin', 'write|admin', 'read|write|admin']),
-        message: '`abilities` must be string of either `read`, `write`, `admin`, `read|write`, `read|admin`, `write|admin`, or `read|write|admin`',
+        message:
+          '`abilities` must be string of either `read`, `write`, `admin`, `read|write`, `read|admin`, `write|admin`, or `read|write|admin`',
       },
 
-      factory: () => faker.random.arrayElement(['read', 'write', 'admin', 'read|write', 'read|admin', 'write|admin', 'read|write|admin']),
+      factory: () =>
+        collect([
+          'read',
+          'write',
+          'admin',
+          'read|write',
+          'read|admin',
+          'write|admin',
+          'read|write|admin',
+        ]).random(),
     },
   },
 } satisfies Model

app/Models/Post.ts

@@ -5,7 +5,7 @@ import User from './User'
 
 export default {
   name: 'Post', // defaults to the sanitized file name
-  table: 'posts', // defaults to the lowercase, plural name of the model
+  table: 'posts', // defaults to the lowercase, plural name of the model name (or the name of the model file)
   primaryKey: 'id', // defaults to `id`
   autoIncrement: true, // defaults to true
 

app/Models/Project.ts

@@ -1,10 +1,11 @@
 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
-  table: 'projects', // defaults to the lowercase, plural name of the model
+  table: 'projects', // defaults to the lowercase, plural name of the model name (or the name of the model file)
   primaryKey: 'id', // defaults to `id`
   autoIncrement: true, // defaults to true
 
@@ -32,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: {
@@ -50,7 +51,7 @@ export default {
         message: '`status` must be a string',
       },
 
-      factory: () => faker.random.arrayElement(['active', 'inactive']),
+      factory: () => collect(['active', 'inactive']).random(),
     },
   },
 } satisfies Model

app/Models/Subscriber.ts

@@ -4,7 +4,7 @@ import { schema } from '@stacksjs/validation'
 
 export default {
   name: 'Subscriber', // defaults to the sanitized file name
-  table: 'subscribers', // defaults to the lowercase, plural name of the model
+  table: 'subscribers', // defaults to the lowercase, plural name of the model name (or the name of the model file)
   primaryKey: 'id', // defaults to `id`
   autoIncrement: true, // defaults to true
 

app/Models/Team.ts

@@ -1,10 +1,11 @@
+import { collect } from '@stacksjs/collections'
 import { faker } from '@stacksjs/faker'
 import type { Model } from '@stacksjs/types'
 import { schema } from '@stacksjs/validation'
 
 export default {
   name: 'Team', // defaults to the sanitized file name
-  table: 'teams', // defaults to the lowercase, plural name of the model
+  table: 'teams', // defaults to the lowercase, plural name of the model name (or the name of the model file)
   primaryKey: 'id', // defaults to `id`
   autoIncrement: true, // defaults to true
 
@@ -61,7 +62,7 @@ export default {
         message: '`status` must be a string',
       },
 
-      factory: () => faker.random.arrayElement(['deployed', 'inactive']),
+      factory: () => collect(['deployed', 'inactive']).random(),
     },
 
     description: {
@@ -79,10 +80,7 @@ export default {
         message: '`path` must be a string',
       },
 
-      factory: () =>
-        faker.random.arrayElement([
-          `/Users/chrisbreuer/Code/${faker.lorem.words().toLowerCase().replace(/\s+/g, '-')}`,
-        ]),
+      factory: () => `/Users/chrisbreuer/Code/${faker.lorem.words().toLowerCase().replace(/\s+/g, '-')}`,
     },
 
     isPersonal: {

app/Models/User.ts

@@ -7,7 +7,7 @@ import { schema } from '@stacksjs/validation'
 
 export default {
   name: 'User', // defaults to the sanitized file name
-  table: 'users', // defaults to the lowercase, plural name of the model name
+  table: 'users', // defaults to the lowercase, plural name of the model name (or the name of the model file)
   primaryKey: 'id', // defaults to `id`
   autoIncrement: true, // defaults to true
 

database/migrations/1715868686184-create-posts-table.ts

@@ -2,8 +2,9 @@ import { log } from '@stacksjs/logging'
 import { path } from '@stacksjs/path'
 import { fs, glob } from '@stacksjs/storage'
 import { pascalCase } from '@stacksjs/strings'
-import { isString } from '@stacksjs/validation'
 import type { Model, RelationConfig } from '@stacksjs/types'
+import { isString } from '@stacksjs/validation'
+import { modelTableName } from '@stacksjs/orm'
 
 export interface FieldArrayElement {
   entity: string
@@ -128,7 +129,7 @@ async function writeOrmActions(apiRoute: string, model: Model): Promise<void> {
 
 async function writeApiRoutes(apiRoute: string, model: Model): Promise<string> {
   let routeString = ``
-  const tableName = model.table
+  const tableName = await modelTableName(model)
   const modelName = model.name
 
   if (apiRoute === 'index') routeString += `await route.get('${tableName}', 'Actions/${modelName}IndexOrmAction')\n\n`
@@ -152,7 +153,7 @@ async function initiateModelGeneration(): Promise<void> {
   await deleteExistingOrmActions()
   await deleteExistingModelNameTypes()
   await writeModelNames()
-  
+
   const modelFiles = glob.sync(path.userModelsPath('*.ts'))
 
   for (const modelFile of modelFiles) {
@@ -193,7 +194,7 @@ async function getRelations(model: Model): Promise<RelationConfig[]> {
         const modelRelationPath = path.userModelsPath(`${relationModel}.ts`)
 
         const modelRelation = (await import(modelRelationPath)).default
-        
+
         const formattedModelName = model.name?.toLowerCase()
 
         relationships.push({