@rvoh/dream 0.40.2 → 0.40.4

package/dist/cjs/src/helpers/cli/generateFactoryContent.js

@@ -34,16 +34,16 @@ function generateFactoryContent({ fullyQualifiedModelName, columnsWithTypes, })
                 belongsToNames.push(associationName);
                 belongsToTypedNames.push(`${associationName}: ${associationModelName}`);
                 additionalImports.push(associationFactoryImportStatement);
-                associationCreationStatements.push(`attrs.${associationName} ??= await create${associationModelName}()`);
+                associationCreationStatements.push(`${associationName}: await create${associationModelName}(),`);
                 break;
             case 'string':
             case 'text':
             case 'citext':
-                stringAttributes.push(`attrs.${(0, camelize_js_1.default)(attributeName)} ??= \`${fullyQualifiedModelName} ${(0, camelize_js_1.default)(attributeName)} ${firstStringAttr ? '${++counter}' : '${counter}'}\``);
+                stringAttributes.push(`${(0, camelize_js_1.default)(attributeName)}: \`${fullyQualifiedModelName} ${(0, camelize_js_1.default)(attributeName)} ${firstStringAttr ? '${++counter}' : '${counter}'}\`,`);
                 firstStringAttr = false;
                 break;
             case 'enum':
-                stringAttributes.push(`attrs.${(0, camelize_js_1.default)(attributeName)} ??= '${(descriptors[descriptors.length - 1] || '<tbd>').split(',')[0]}'`);
+                stringAttributes.push(`${(0, camelize_js_1.default)(attributeName)}: '${(descriptors[descriptors.length - 1] || '<tbd>').split(',')[0]}',`);
                 break;
             default:
             // noop
@@ -56,7 +56,9 @@ import { ${(0, uniq_js_1.default)(dreamImports).join(', ')} } from '@rvoh/dream'
 import ${modelClassName} from '${relativePath}'${additionalImports.length ? '\n' + (0, uniq_js_1.default)(additionalImports).join('\n') : ''}
 ${stringAttributes.length ? '\nlet counter = 0\n' : ''}
 export default async function create${modelClassName}(attrs: UpdateableProperties<${modelClassName}> = {}) {
-  ${associationCreationStatements.length ? associationCreationStatements.join('\n  ') + '\n  ' : ''}${stringAttributes.length ? stringAttributes.join('\n  ') + '\n  ' : ''}return await ${modelClassName}.create(attrs)
+  return await ${modelClassName}.create({
+    ${associationCreationStatements.length ? associationCreationStatements.join('\n    ') + '\n    ' : ''}${stringAttributes.length ? stringAttributes.join('\n    ') + '\n    ' : ''}...attrs,
+  })
 }
 `;
 }

package/dist/cjs/src/types/associations/belongsTo.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/cjs/src/types/associations/hasMany.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/cjs/src/types/associations/hasOne.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/cjs/src/types/associations/shared.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/cjs/src/types/db.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/cjs/src/types/dream.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/cjs/src/types/lifecycle.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/cjs/src/types/logger.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/cjs/src/types/openapi.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/cjs/src/types/query.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/cjs/src/types/utils.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/cjs/src/types/validation.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/cjs/src/types/variadic.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/esm/src/helpers/cli/generateFactoryContent.js

@@ -31,16 +31,16 @@ export default function generateFactoryContent({ fullyQualifiedModelName, column
                 belongsToNames.push(associationName);
                 belongsToTypedNames.push(`${associationName}: ${associationModelName}`);
                 additionalImports.push(associationFactoryImportStatement);
-                associationCreationStatements.push(`attrs.${associationName} ??= await create${associationModelName}()`);
+                associationCreationStatements.push(`${associationName}: await create${associationModelName}(),`);
                 break;
             case 'string':
             case 'text':
             case 'citext':
-                stringAttributes.push(`attrs.${camelize(attributeName)} ??= \`${fullyQualifiedModelName} ${camelize(attributeName)} ${firstStringAttr ? '${++counter}' : '${counter}'}\``);
+                stringAttributes.push(`${camelize(attributeName)}: \`${fullyQualifiedModelName} ${camelize(attributeName)} ${firstStringAttr ? '${++counter}' : '${counter}'}\`,`);
                 firstStringAttr = false;
                 break;
             case 'enum':
-                stringAttributes.push(`attrs.${camelize(attributeName)} ??= '${(descriptors[descriptors.length - 1] || '<tbd>').split(',')[0]}'`);
+                stringAttributes.push(`${camelize(attributeName)}: '${(descriptors[descriptors.length - 1] || '<tbd>').split(',')[0]}',`);
                 break;
             default:
             // noop
@@ -53,7 +53,9 @@ import { ${uniq(dreamImports).join(', ')} } from '@rvoh/dream'
 import ${modelClassName} from '${relativePath}'${additionalImports.length ? '\n' + uniq(additionalImports).join('\n') : ''}
 ${stringAttributes.length ? '\nlet counter = 0\n' : ''}
 export default async function create${modelClassName}(attrs: UpdateableProperties<${modelClassName}> = {}) {
-  ${associationCreationStatements.length ? associationCreationStatements.join('\n  ') + '\n  ' : ''}${stringAttributes.length ? stringAttributes.join('\n  ') + '\n  ' : ''}return await ${modelClassName}.create(attrs)
+  return await ${modelClassName}.create({
+    ${associationCreationStatements.length ? associationCreationStatements.join('\n    ') + '\n    ' : ''}${stringAttributes.length ? stringAttributes.join('\n    ') + '\n    ' : ''}...attrs,
+  })
 }
 `;
 }

package/dist/esm/src/types/associations/belongsTo.js

@@ -0,0 +1 @@
+export {};

package/dist/esm/src/types/associations/hasMany.js

@@ -0,0 +1 @@
+export {};

package/dist/esm/src/types/associations/hasOne.js

@@ -0,0 +1 @@
+export {};

package/dist/esm/src/types/associations/shared.js

@@ -0,0 +1 @@
+export {};

package/dist/esm/src/types/db.js

@@ -0,0 +1 @@
+export {};

package/dist/esm/src/types/dream.js

@@ -0,0 +1 @@
+export {};

package/dist/esm/src/types/lifecycle.js

@@ -0,0 +1 @@
+export {};

package/dist/esm/src/types/logger.js

@@ -0,0 +1 @@
+export {};

package/dist/esm/src/types/openapi.js

@@ -0,0 +1 @@
+export {};

package/dist/esm/src/types/query.js

@@ -0,0 +1 @@
+export {};

package/dist/esm/src/types/utils.js

@@ -0,0 +1 @@
+export {};

package/dist/esm/src/types/validation.js

@@ -0,0 +1 @@
+export {};

package/dist/esm/src/types/variadic.js

@@ -0,0 +1 @@
+export {};

package/dist/types/src/types/associations/belongsTo.d.ts

@@ -1,76 +1,31 @@
-import Dream from '../../Dream.ts'
-import { AssociationTableNames } from '../db.js'
-import {
-  DefaultScopeName,
-  DefaultScopeNameForTable,
-  DreamColumnNames,
-  GlobalModelNames,
-  TableColumnNames,
-  TableNameForGlobalModelName,
-} from '../dream.js'
-
-export interface BelongsToStatement<
-  BaseInstance extends Dream,
-  DB,
-  Schema,
-  TableName extends AssociationTableNames<DB, Schema> & keyof DB,
-> {
-  modelCB: () => typeof Dream | (typeof Dream)[]
-  globalAssociationNameOrNames: string[]
-  type: 'BelongsTo'
-  as: string
-  primaryKey: (associationInstance?: Dream) => keyof DB[TableName] & string
-  primaryKeyValue: (associationInstance: Dream | null) => any
-  primaryKeyOverride?: (keyof DB[TableName] & string) | null
-  foreignKey: () => DreamColumnNames<BaseInstance> & string
-  foreignKeyTypeField: () => DreamColumnNames<BaseInstance> & string
-  optional: boolean
-  distinct: null
-  polymorphic: boolean
-  withoutDefaultScopes?: DefaultScopeName<BaseInstance>[]
+import Dream from '../../Dream.js';
+import { AssociationTableNames } from '../db.js';
+import { DefaultScopeName, DefaultScopeNameForTable, DreamColumnNames, GlobalModelNames, TableColumnNames, TableNameForGlobalModelName } from '../dream.js';
+export interface BelongsToStatement<BaseInstance extends Dream, DB, Schema, TableName extends AssociationTableNames<DB, Schema> & keyof DB> {
+    modelCB: () => typeof Dream | (typeof Dream)[];
+    globalAssociationNameOrNames: string[];
+    type: 'BelongsTo';
+    as: string;
+    primaryKey: (associationInstance?: Dream) => keyof DB[TableName] & string;
+    primaryKeyValue: (associationInstance: Dream | null) => any;
+    primaryKeyOverride?: (keyof DB[TableName] & string) | null;
+    foreignKey: () => DreamColumnNames<BaseInstance> & string;
+    foreignKeyTypeField: () => DreamColumnNames<BaseInstance> & string;
+    optional: boolean;
+    distinct: null;
+    polymorphic: boolean;
+    withoutDefaultScopes?: DefaultScopeName<BaseInstance>[];
 }
-
-export interface NonPolymorphicBelongsToOptions<
-  BaseInstance extends Dream,
-  AssociationGlobalNameOrNames extends
-    | GlobalModelNames<BaseInstance>
-    | readonly GlobalModelNames<BaseInstance>[],
-  AssociationGlobalName = AssociationGlobalNameOrNames extends Readonly<any[]>
-    ? AssociationGlobalNameOrNames[0] & string
-    : AssociationGlobalNameOrNames & string,
-  AssociationTableName extends AssociationTableNames<BaseInstance['DB'], BaseInstance['schema']> &
-    keyof BaseInstance['DB'] = TableNameForGlobalModelName<
-    BaseInstance,
-    AssociationGlobalName & GlobalModelNames<BaseInstance>
-  > &
-    AssociationTableNames<BaseInstance['DB'], BaseInstance['schema']> &
-    keyof BaseInstance['DB'],
-> {
-  foreignKey?: DreamColumnNames<BaseInstance>
-  primaryKeyOverride?: TableColumnNames<BaseInstance['DB'], AssociationTableName> | null
-  optional?: boolean
-  withoutDefaultScopes?: DefaultScopeNameForTable<BaseInstance['schema'], AssociationTableName>[]
+export interface NonPolymorphicBelongsToOptions<BaseInstance extends Dream, AssociationGlobalNameOrNames extends GlobalModelNames<BaseInstance> | readonly GlobalModelNames<BaseInstance>[], AssociationGlobalName = AssociationGlobalNameOrNames extends Readonly<any[]> ? AssociationGlobalNameOrNames[0] & string : AssociationGlobalNameOrNames & string, AssociationTableName extends AssociationTableNames<BaseInstance['DB'], BaseInstance['schema']> & keyof BaseInstance['DB'] = TableNameForGlobalModelName<BaseInstance, AssociationGlobalName & GlobalModelNames<BaseInstance>> & AssociationTableNames<BaseInstance['DB'], BaseInstance['schema']> & keyof BaseInstance['DB']> {
+    foreignKey?: DreamColumnNames<BaseInstance>;
+    primaryKeyOverride?: TableColumnNames<BaseInstance['DB'], AssociationTableName> | null;
+    optional?: boolean;
+    withoutDefaultScopes?: DefaultScopeNameForTable<BaseInstance['schema'], AssociationTableName>[];
 }
-
-export interface PolymorphicBelongsToOptions<
-  BaseInstance extends Dream,
-  AssociationGlobalNameOrNames extends
-    | GlobalModelNames<BaseInstance>
-    | readonly GlobalModelNames<BaseInstance>[],
-  AssociationGlobalName = AssociationGlobalNameOrNames extends Readonly<any[]>
-    ? AssociationGlobalNameOrNames[0] & string
-    : AssociationGlobalNameOrNames & string,
-  AssociationTableName extends AssociationTableNames<BaseInstance['DB'], BaseInstance['schema']> &
-    keyof BaseInstance['DB'] = TableNameForGlobalModelName<
-    BaseInstance,
-    AssociationGlobalName & GlobalModelNames<BaseInstance>
-  > &
-    AssociationTableNames<BaseInstance['DB'], BaseInstance['schema']> &
-    keyof BaseInstance['DB'],
-> {
-  foreignKey: DreamColumnNames<BaseInstance>
-  primaryKeyOverride?: TableColumnNames<BaseInstance['DB'], AssociationTableName> | null
-  optional?: boolean
-  polymorphic: boolean
-  withoutDefaultScopes?: DefaultScopeNameForTable<BaseInstance['schema'], AssociationTableName>[]
+export interface PolymorphicBelongsToOptions<BaseInstance extends Dream, AssociationGlobalNameOrNames extends GlobalModelNames<BaseInstance> | readonly GlobalModelNames<BaseInstance>[], AssociationGlobalName = AssociationGlobalNameOrNames extends Readonly<any[]> ? AssociationGlobalNameOrNames[0] & string : AssociationGlobalNameOrNames & string, AssociationTableName extends AssociationTableNames<BaseInstance['DB'], BaseInstance['schema']> & keyof BaseInstance['DB'] = TableNameForGlobalModelName<BaseInstance, AssociationGlobalName & GlobalModelNames<BaseInstance>> & AssociationTableNames<BaseInstance['DB'], BaseInstance['schema']> & keyof BaseInstance['DB']> {
+    foreignKey: DreamColumnNames<BaseInstance>;
+    primaryKeyOverride?: TableColumnNames<BaseInstance['DB'], AssociationTableName> | null;
+    optional?: boolean;
+    polymorphic: boolean;
+    withoutDefaultScopes?: DefaultScopeNameForTable<BaseInstance['schema'], AssociationTableName>[];
 }

package/dist/types/src/types/associations/belongsTo.ts

@@ -0,0 +1,76 @@
+import Dream from '../../Dream.js'
+import { AssociationTableNames } from '../db.js'
+import {
+  DefaultScopeName,
+  DefaultScopeNameForTable,
+  DreamColumnNames,
+  GlobalModelNames,
+  TableColumnNames,
+  TableNameForGlobalModelName,
+} from '../dream.js'
+
+export interface BelongsToStatement<
+  BaseInstance extends Dream,
+  DB,
+  Schema,
+  TableName extends AssociationTableNames<DB, Schema> & keyof DB,
+> {
+  modelCB: () => typeof Dream | (typeof Dream)[]
+  globalAssociationNameOrNames: string[]
+  type: 'BelongsTo'
+  as: string
+  primaryKey: (associationInstance?: Dream) => keyof DB[TableName] & string
+  primaryKeyValue: (associationInstance: Dream | null) => any
+  primaryKeyOverride?: (keyof DB[TableName] & string) | null
+  foreignKey: () => DreamColumnNames<BaseInstance> & string
+  foreignKeyTypeField: () => DreamColumnNames<BaseInstance> & string
+  optional: boolean
+  distinct: null
+  polymorphic: boolean
+  withoutDefaultScopes?: DefaultScopeName<BaseInstance>[]
+}
+
+export interface NonPolymorphicBelongsToOptions<
+  BaseInstance extends Dream,
+  AssociationGlobalNameOrNames extends
+    | GlobalModelNames<BaseInstance>
+    | readonly GlobalModelNames<BaseInstance>[],
+  AssociationGlobalName = AssociationGlobalNameOrNames extends Readonly<any[]>
+    ? AssociationGlobalNameOrNames[0] & string
+    : AssociationGlobalNameOrNames & string,
+  AssociationTableName extends AssociationTableNames<BaseInstance['DB'], BaseInstance['schema']> &
+    keyof BaseInstance['DB'] = TableNameForGlobalModelName<
+    BaseInstance,
+    AssociationGlobalName & GlobalModelNames<BaseInstance>
+  > &
+    AssociationTableNames<BaseInstance['DB'], BaseInstance['schema']> &
+    keyof BaseInstance['DB'],
+> {
+  foreignKey?: DreamColumnNames<BaseInstance>
+  primaryKeyOverride?: TableColumnNames<BaseInstance['DB'], AssociationTableName> | null
+  optional?: boolean
+  withoutDefaultScopes?: DefaultScopeNameForTable<BaseInstance['schema'], AssociationTableName>[]
+}
+
+export interface PolymorphicBelongsToOptions<
+  BaseInstance extends Dream,
+  AssociationGlobalNameOrNames extends
+    | GlobalModelNames<BaseInstance>
+    | readonly GlobalModelNames<BaseInstance>[],
+  AssociationGlobalName = AssociationGlobalNameOrNames extends Readonly<any[]>
+    ? AssociationGlobalNameOrNames[0] & string
+    : AssociationGlobalNameOrNames & string,
+  AssociationTableName extends AssociationTableNames<BaseInstance['DB'], BaseInstance['schema']> &
+    keyof BaseInstance['DB'] = TableNameForGlobalModelName<
+    BaseInstance,
+    AssociationGlobalName & GlobalModelNames<BaseInstance>
+  > &
+    AssociationTableNames<BaseInstance['DB'], BaseInstance['schema']> &
+    keyof BaseInstance['DB'],
+> {
+  foreignKey: DreamColumnNames<BaseInstance>
+  primaryKeyOverride?: TableColumnNames<BaseInstance['DB'], AssociationTableName> | null
+  optional?: boolean
+  polymorphic: boolean
+  withoutDefaultScopes?: DefaultScopeNameForTable<BaseInstance['schema'], AssociationTableName>[]
+}

package/dist/types/src/types/associations/hasMany.d.ts

@@ -1,80 +1,16 @@
-import Dream from '../../Dream.ts'
-import { AssociationTableNames } from '../db.js'
-import {
-  GlobalModelNames,
-  GlobalModelNameTableMap,
-  TableColumnNames,
-  TableNameForGlobalModelName,
-} from '../dream.js'
-import {
-  HasOptions,
-  HasStatement,
-  HasThroughOptions,
-  OrderStatement,
-  PolymorphicHasOptions,
-} from './shared.js'
-
-export type HasManyStatement<
-  BaseInstance extends Dream,
-  DB,
-  Schema,
-  ForeignTableName extends AssociationTableNames<DB, Schema> & keyof DB,
-> = HasStatement<BaseInstance, DB, Schema, ForeignTableName, 'HasMany'> & {
-  distinct?: TableColumnNames<DB, ForeignTableName>
-  order?: OrderStatement<DB, Schema, ForeignTableName>
+import Dream from '../../Dream.js';
+import { AssociationTableNames } from '../db.js';
+import { GlobalModelNames, GlobalModelNameTableMap, TableColumnNames, TableNameForGlobalModelName } from '../dream.js';
+import { HasOptions, HasStatement, HasThroughOptions, OrderStatement, PolymorphicHasOptions } from './shared.js';
+export type HasManyStatement<BaseInstance extends Dream, DB, Schema, ForeignTableName extends AssociationTableNames<DB, Schema> & keyof DB> = HasStatement<BaseInstance, DB, Schema, ForeignTableName, 'HasMany'> & {
+    distinct?: TableColumnNames<DB, ForeignTableName>;
+    order?: OrderStatement<DB, Schema, ForeignTableName>;
+};
+interface HasManyOnlyOptions<BaseInstance extends Dream, AssociationGlobalNameOrNames extends GlobalModelNames<BaseInstance> | readonly GlobalModelNames<BaseInstance>[], AssociationGlobalName = AssociationGlobalNameOrNames extends any[] ? AssociationGlobalNameOrNames[0] & string : AssociationGlobalNameOrNames & string, AssociationTableName = TableNameForGlobalModelName<BaseInstance, AssociationGlobalName & GlobalModelNames<BaseInstance>>> {
+    distinct?: TableColumnNames<BaseInstance['DB'], AssociationTableName & AssociationTableNames<BaseInstance['DB'], BaseInstance['schema']> & keyof BaseInstance['DB']> | boolean;
+    order?: OrderStatement<BaseInstance['DB'], BaseInstance['schema'], AssociationTableName & AssociationTableNames<BaseInstance['DB'], BaseInstance['schema']> & keyof BaseInstance['DB']> | OrderStatement<BaseInstance['DB'], BaseInstance['schema'], AssociationTableName & AssociationTableNames<BaseInstance['DB'], BaseInstance['schema']> & keyof BaseInstance['DB']>[];
 }
-interface HasManyOnlyOptions<
-  BaseInstance extends Dream,
-  AssociationGlobalNameOrNames extends
-    | GlobalModelNames<BaseInstance>
-    | readonly GlobalModelNames<BaseInstance>[],
-  AssociationGlobalName = AssociationGlobalNameOrNames extends any[]
-    ? AssociationGlobalNameOrNames[0] & string
-    : AssociationGlobalNameOrNames & string,
-  AssociationTableName = TableNameForGlobalModelName<
-    BaseInstance,
-    AssociationGlobalName & GlobalModelNames<BaseInstance>
-  >,
-> {
-  distinct?:
-    | TableColumnNames<
-        BaseInstance['DB'],
-        AssociationTableName &
-          AssociationTableNames<BaseInstance['DB'], BaseInstance['schema']> &
-          keyof BaseInstance['DB']
-      >
-    | boolean
-
-  order?:
-    | OrderStatement<
-        BaseInstance['DB'],
-        BaseInstance['schema'],
-        AssociationTableName &
-          AssociationTableNames<BaseInstance['DB'], BaseInstance['schema']> &
-          keyof BaseInstance['DB']
-      >
-    | OrderStatement<
-        BaseInstance['DB'],
-        BaseInstance['schema'],
-        AssociationTableName &
-          AssociationTableNames<BaseInstance['DB'], BaseInstance['schema']> &
-          keyof BaseInstance['DB']
-      >[]
-}
-
-export type HasManyOptions<
-  BaseInstance extends Dream,
-  AssociationGlobalName extends keyof GlobalModelNameTableMap<BaseInstance>,
-> = HasOptions<BaseInstance, AssociationGlobalName> & HasManyOnlyOptions<BaseInstance, AssociationGlobalName>
-
-export type PolymorphicHasManyOptions<
-  BaseInstance extends Dream,
-  AssociationGlobalName extends keyof GlobalModelNameTableMap<BaseInstance>,
-> = PolymorphicHasOptions<BaseInstance, AssociationGlobalName> &
-  HasManyOnlyOptions<BaseInstance, AssociationGlobalName>
-
-export type HasManyThroughOptions<
-  BaseInstance extends Dream,
-  AssociationGlobalName extends keyof GlobalModelNameTableMap<BaseInstance>,
-> = HasThroughOptions<BaseInstance, AssociationGlobalName> &
-  HasManyOnlyOptions<BaseInstance, AssociationGlobalName>
+export type HasManyOptions<BaseInstance extends Dream, AssociationGlobalName extends keyof GlobalModelNameTableMap<BaseInstance>> = HasOptions<BaseInstance, AssociationGlobalName> & HasManyOnlyOptions<BaseInstance, AssociationGlobalName>;
+export type PolymorphicHasManyOptions<BaseInstance extends Dream, AssociationGlobalName extends keyof GlobalModelNameTableMap<BaseInstance>> = PolymorphicHasOptions<BaseInstance, AssociationGlobalName> & HasManyOnlyOptions<BaseInstance, AssociationGlobalName>;
+export type HasManyThroughOptions<BaseInstance extends Dream, AssociationGlobalName extends keyof GlobalModelNameTableMap<BaseInstance>> = HasThroughOptions<BaseInstance, AssociationGlobalName> & HasManyOnlyOptions<BaseInstance, AssociationGlobalName>;
+export {};

package/dist/types/src/types/associations/hasMany.ts

@@ -0,0 +1,80 @@
+import Dream from '../../Dream.js'
+import { AssociationTableNames } from '../db.js'
+import {
+  GlobalModelNames,
+  GlobalModelNameTableMap,
+  TableColumnNames,
+  TableNameForGlobalModelName,
+} from '../dream.js'
+import {
+  HasOptions,
+  HasStatement,
+  HasThroughOptions,
+  OrderStatement,
+  PolymorphicHasOptions,
+} from './shared.js'
+
+export type HasManyStatement<
+  BaseInstance extends Dream,
+  DB,
+  Schema,
+  ForeignTableName extends AssociationTableNames<DB, Schema> & keyof DB,
+> = HasStatement<BaseInstance, DB, Schema, ForeignTableName, 'HasMany'> & {
+  distinct?: TableColumnNames<DB, ForeignTableName>
+  order?: OrderStatement<DB, Schema, ForeignTableName>
+}
+interface HasManyOnlyOptions<
+  BaseInstance extends Dream,
+  AssociationGlobalNameOrNames extends
+    | GlobalModelNames<BaseInstance>
+    | readonly GlobalModelNames<BaseInstance>[],
+  AssociationGlobalName = AssociationGlobalNameOrNames extends any[]
+    ? AssociationGlobalNameOrNames[0] & string
+    : AssociationGlobalNameOrNames & string,
+  AssociationTableName = TableNameForGlobalModelName<
+    BaseInstance,
+    AssociationGlobalName & GlobalModelNames<BaseInstance>
+  >,
+> {
+  distinct?:
+    | TableColumnNames<
+        BaseInstance['DB'],
+        AssociationTableName &
+          AssociationTableNames<BaseInstance['DB'], BaseInstance['schema']> &
+          keyof BaseInstance['DB']
+      >
+    | boolean
+
+  order?:
+    | OrderStatement<
+        BaseInstance['DB'],
+        BaseInstance['schema'],
+        AssociationTableName &
+          AssociationTableNames<BaseInstance['DB'], BaseInstance['schema']> &
+          keyof BaseInstance['DB']
+      >
+    | OrderStatement<
+        BaseInstance['DB'],
+        BaseInstance['schema'],
+        AssociationTableName &
+          AssociationTableNames<BaseInstance['DB'], BaseInstance['schema']> &
+          keyof BaseInstance['DB']
+      >[]
+}
+
+export type HasManyOptions<
+  BaseInstance extends Dream,
+  AssociationGlobalName extends keyof GlobalModelNameTableMap<BaseInstance>,
+> = HasOptions<BaseInstance, AssociationGlobalName> & HasManyOnlyOptions<BaseInstance, AssociationGlobalName>
+
+export type PolymorphicHasManyOptions<
+  BaseInstance extends Dream,
+  AssociationGlobalName extends keyof GlobalModelNameTableMap<BaseInstance>,
+> = PolymorphicHasOptions<BaseInstance, AssociationGlobalName> &
+  HasManyOnlyOptions<BaseInstance, AssociationGlobalName>
+
+export type HasManyThroughOptions<
+  BaseInstance extends Dream,
+  AssociationGlobalName extends keyof GlobalModelNameTableMap<BaseInstance>,
+> = HasThroughOptions<BaseInstance, AssociationGlobalName> &
+  HasManyOnlyOptions<BaseInstance, AssociationGlobalName>

package/dist/types/src/types/associations/hasOne.d.ts

@@ -1,26 +1,8 @@
-import Dream from '../../Dream.ts'
-import { AssociationTableNames } from '../db.js'
-import { GlobalModelNameTableMap } from '../dream.js'
-import { HasOptions, HasStatement, HasThroughOptions, PolymorphicHasOptions } from './shared.js'
-
-export type HasOneStatement<
-  BaseInstance extends Dream,
-  DB,
-  Schema,
-  ForeignTableName extends AssociationTableNames<DB, Schema> & keyof DB,
-> = HasStatement<BaseInstance, DB, Schema, ForeignTableName, 'HasOne'>
-
-export type HasOneOptions<
-  BaseInstance extends Dream,
-  AssociationGlobalName extends keyof GlobalModelNameTableMap<BaseInstance>,
-> = HasOptions<BaseInstance, AssociationGlobalName>
-
-export type PolymorphicHasOneOptions<
-  BaseInstance extends Dream,
-  AssociationGlobalName extends keyof GlobalModelNameTableMap<BaseInstance>,
-> = PolymorphicHasOptions<BaseInstance, AssociationGlobalName>
-
-export type HasOneThroughOptions<
-  BaseInstance extends Dream,
-  AssociationGlobalName extends keyof GlobalModelNameTableMap<BaseInstance>,
-> = HasThroughOptions<BaseInstance, AssociationGlobalName>
+import Dream from '../../Dream.js';
+import { AssociationTableNames } from '../db.js';
+import { GlobalModelNameTableMap } from '../dream.js';
+import { HasOptions, HasStatement, HasThroughOptions, PolymorphicHasOptions } from './shared.js';
+export type HasOneStatement<BaseInstance extends Dream, DB, Schema, ForeignTableName extends AssociationTableNames<DB, Schema> & keyof DB> = HasStatement<BaseInstance, DB, Schema, ForeignTableName, 'HasOne'>;
+export type HasOneOptions<BaseInstance extends Dream, AssociationGlobalName extends keyof GlobalModelNameTableMap<BaseInstance>> = HasOptions<BaseInstance, AssociationGlobalName>;
+export type PolymorphicHasOneOptions<BaseInstance extends Dream, AssociationGlobalName extends keyof GlobalModelNameTableMap<BaseInstance>> = PolymorphicHasOptions<BaseInstance, AssociationGlobalName>;
+export type HasOneThroughOptions<BaseInstance extends Dream, AssociationGlobalName extends keyof GlobalModelNameTableMap<BaseInstance>> = HasThroughOptions<BaseInstance, AssociationGlobalName>;

package/dist/types/src/types/associations/hasOne.ts

@@ -0,0 +1,26 @@
+import Dream from '../../Dream.js'
+import { AssociationTableNames } from '../db.js'
+import { GlobalModelNameTableMap } from '../dream.js'
+import { HasOptions, HasStatement, HasThroughOptions, PolymorphicHasOptions } from './shared.js'
+
+export type HasOneStatement<
+  BaseInstance extends Dream,
+  DB,
+  Schema,
+  ForeignTableName extends AssociationTableNames<DB, Schema> & keyof DB,
+> = HasStatement<BaseInstance, DB, Schema, ForeignTableName, 'HasOne'>
+
+export type HasOneOptions<
+  BaseInstance extends Dream,
+  AssociationGlobalName extends keyof GlobalModelNameTableMap<BaseInstance>,
+> = HasOptions<BaseInstance, AssociationGlobalName>
+
+export type PolymorphicHasOneOptions<
+  BaseInstance extends Dream,
+  AssociationGlobalName extends keyof GlobalModelNameTableMap<BaseInstance>,
+> = PolymorphicHasOptions<BaseInstance, AssociationGlobalName>
+
+export type HasOneThroughOptions<
+  BaseInstance extends Dream,
+  AssociationGlobalName extends keyof GlobalModelNameTableMap<BaseInstance>,
+> = HasThroughOptions<BaseInstance, AssociationGlobalName>