chore: wip

Author: chrisbbreuer

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

@@ -177,13 +177,11 @@ export async function getRelations(model: Model, modelPath: string): Promise<Rel
           relationModel = relationInstance
         }
 
-        const modelRelationPath = path.userModelsPath(`${relationModel}.ts`)
+        const modelRelationPath = path.userModelsPath(relationModel)
         const modelRelation = (await import(modelRelationPath)).default
-
         const modelName = getModelName(model, modelPath)
         const formattedModelName = modelName.toLowerCase()
         const tableName = getTableName(model, modelPath)
-
         const modelRelationTable = getModelName(modelRelation, modelRelationPath)
 
         relationships.push({
@@ -207,17 +205,13 @@ export async function getRelations(model: Model, modelPath: string): Promise<Rel
 
 export async function fetchOtherModelRelations(model: Model, modelPath: string): Promise<RelationConfig[]> {
   const modelFiles = glob.sync(path.userModelsPath('*.ts'))
-
   const modelRelations = []
 
   for (let i = 0; i < modelFiles.length; i++) {
     const modelFileElement = modelFiles[i] as string
-
     const modelFile = (await import(modelFileElement)).default as Model
-
     const tableName = getTableName(model, modelPath)
     const modelName = getModelName(model, modelPath)
-
     const modelFileName = getTableName(modelFile, modelFileElement)
 
     if (tableName === modelFileName) continue

storage/framework/core/types/src/model.ts

@@ -65,15 +65,20 @@ type Base = {}
  * Model.
  */
 export interface ModelOptions extends Base {
+  /**
+   * The name of the model.
+   *
+   * @default string - The file name of the model.
+   */
   name: string // defaults to the file name of the model
-  table: string // defaults to the lowercase, plural name of the model name (or the name of the model file)
+  table?: string // defaults to the lowercase, plural name of the model name (or the name of the model file)
   primaryKey?: string // defaults to `id`
   autoIncrement?: boolean // defaults to true
   dashboard?: {
     highlight?: boolean | number // defaults to undefined
   }
 
-  traits: {
+  traits?: {
     useUuid?: boolean // defaults to false
     useTimestamps?: boolean | TimestampOptions // defaults to true
     timestampable?: boolean | TimestampOptions // useTimestamps alias
@@ -91,44 +96,44 @@ export interface ModelOptions extends Base {
     useActivityLog?: boolean | ActivityLogOption
   }
 
-  attributes: Attributes
+  attributes?: Attributes
 
   // relationships
-  hasOne:
+  hasOne?:
     | {
         model: ModelNames
         foreignKey?: string
         relationName?: string
       }[]
     | string[]
-  hasMany:
+  hasMany?:
     | {
         model: ModelNames // should be typed as ModelName
         foreignKey?: string
         relationName?: string
       }[]
     | ModelNames[]
-  belongsTo:
+  belongsTo?:
     | {
         model: ModelNames // should be typed as ModelName
         foreignKey?: string
         relationName?: string
       }[]
     | ModelNames[] // belongsTo: 'User'
-  belongsToMany: BelongsToManyType[] | ModelNames[]
-  hasOneThrough: {
+  belongsToMany?: BelongsToManyType[] | ModelNames[]
+  hasOneThrough?: {
     model: ModelNames
     through: ModelNames
     foreignKey?: string
     throughForeignKey?: string
     relationName?: string
   }[]
 
-  get: {
+  get?: {
     [key: string]: (value: any) => any
   }
 
-  set: {
+  set?: {
     [key: string]: (value: any) => any
   }
 }