feat: add through relations#236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jlenon7 merged 2 commits into from
May 21, 2026
Merged

feat: add through relations #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21f9cad
feat: add through relations
jlenon7 May 21, 2026
4408a09
feat: add through relations
jlenon7 May 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "@athenna/database",
"version": "5.54.0",
"version": "5.55.0",
"description": "The Athenna database handler for SQL/NoSQL.",
"license": "MIT",
"author": "João Lenon <lenon@athenna.io>",
Expand Down
2 changes: 2 additions & 0 deletions src/constants/MetadataKeys.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,5 +10,7 @@
export const COLUMNS_KEY = 'database:columns:options'
export const HAS_ONE_KEY = 'database:hasOne:options'
export const HAS_MANY_KEY = 'database:hasMany:options'
export const HAS_ONE_THROUGH_KEY = 'database:hasOneThrough:options'
export const HAS_MANY_THROUGH_KEY = 'database:hasManyThrough:options'
export const BELONGS_TO_KEY = 'database:belongsTo:options'
export const BELONGS_TO_MANY_KEY = 'database:belongsToMany:options'
37 changes: 37 additions & 0 deletions src/helpers/Annotation.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,8 @@ import {
COLUMNS_KEY,
HAS_ONE_KEY,
HAS_MANY_KEY,
HAS_ONE_THROUGH_KEY,
HAS_MANY_THROUGH_KEY,
BELONGS_TO_KEY,
BELONGS_TO_MANY_KEY
} from '#src/constants/MetadataKeys'
Expand All@@ -19,6 +21,8 @@ import type {
ColumnOptions,
HasOneOptions,
HasManyOptions,
HasOneThroughOptions,
HasManyThroughOptions,
BelongsToOptions,
BelongsToManyOptions
} from '#src/types'
Expand All@@ -40,6 +44,8 @@ export class Annotation {
return [
...this.getHasOnesMeta(target),
...this.getHasManyMeta(target),
...this.getHasOneThroughMeta(target),
...this.getHasManyThroughMeta(target),
...this.getBelongsToMeta(target),
...this.getBelongsToManyMeta(target)
]
Expand DownExpand Up@@ -69,6 +75,37 @@ export class Annotation {
Reflect.defineMetadata(HAS_MANY_KEY, hasMany, target)
}

public static getHasOneThroughMeta(target: any): HasOneThroughOptions[] {
return Reflect.getMetadata(HAS_ONE_THROUGH_KEY, target) || []
}

public static defineHasOneThroughMeta(
target: any,
options: HasOneThroughOptions
) {
const hasOneThrough = Reflect.getMetadata(HAS_ONE_THROUGH_KEY, target) || []

hasOneThrough.push(options)

Reflect.defineMetadata(HAS_ONE_THROUGH_KEY, hasOneThrough, target)
}

public static getHasManyThroughMeta(target: any): HasManyThroughOptions[] {
return Reflect.getMetadata(HAS_MANY_THROUGH_KEY, target) || []
}

public static defineHasManyThroughMeta(
target: any,
options: HasManyThroughOptions
) {
const hasManyThrough =
Reflect.getMetadata(HAS_MANY_THROUGH_KEY, target) || []

hasManyThrough.push(options)

Reflect.defineMetadata(HAS_MANY_THROUGH_KEY, hasManyThrough, target)
}

public static getBelongsToMeta(target: any): BelongsToOptions[] {
return Reflect.getMetadata(BELONGS_TO_KEY, target) || []
}
Expand Down
2 changes: 2 additions & 0 deletions src/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,8 @@ export * from '#src/models/schemas/ModelSchema'
export * from '#src/models/annotations/Column'
export * from '#src/models/annotations/HasOne'
export * from '#src/models/annotations/HasMany'
export * from '#src/models/annotations/HasOneThrough'
export * from '#src/models/annotations/HasManyThrough'
export * from '#src/models/annotations/BelongsTo'
export * from '#src/models/annotations/BelongsToMany'

Expand Down
66 changes: 66 additions & 0 deletions src/models/annotations/HasManyThrough.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
/**
* @athenna/database
*
* (c) João Lenon <lenon@athenna.io>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

import 'reflect-metadata'

import { debug } from '#src/debug'
import { Annotation } from '#src/helpers/Annotation'
import { Is, Options } from '@athenna/common'
import type { BaseModel } from '#src/models/BaseModel'
import type { HasManyThroughOptions } from '#src/types/relations/HasManyThroughOptions'

/**
* Create has many through relation for model class.
*/
export function HasManyThrough<
T extends BaseModel = any,
R extends BaseModel = any,
H extends BaseModel = any
>(
model: (() => new () => R) | string,
through: (() => new () => H) | string,
options: Omit<
HasManyThroughOptions<T, R, H>,
'type' | 'model' | 'through' | 'property'
> = {}
) {
return (target: T, key: any) => {
const Target = target.constructor as typeof BaseModel

options = Options.create(options, {
isIncluded: false,
inverse: false
})

// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
options.type = 'hasManyThrough'
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
options.model = Is.String(model)
? () => ioc.safeUse(`App/Models/${model}`).constructor
: model
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
options.through = Is.String(through)
? () => ioc.safeUse(`App/Models/${through}`).constructor
: through
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
options.property = key

debug(
'registering hasManyThrough metadata for model %s: %o',
Target.name,
options
)

Annotation.defineHasManyThroughMeta(Target, options)
}
}
66 changes: 66 additions & 0 deletions src/models/annotations/HasOneThrough.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
/**
* @athenna/database
*
* (c) João Lenon <lenon@athenna.io>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

import 'reflect-metadata'

import { debug } from '#src/debug'
import { Annotation } from '#src/helpers/Annotation'
import { Is, Options } from '@athenna/common'
import type { BaseModel } from '#src/models/BaseModel'
import type { HasOneThroughOptions } from '#src/types/relations/HasOneThroughOptions'

/**
* Create has one through relation for model class.
*/
export function HasOneThrough<
T extends BaseModel = any,
R extends BaseModel = any,
H extends BaseModel = any
>(
model: (() => new () => R) | string,
through: (() => new () => H) | string,
options: Omit<
HasOneThroughOptions<T, R, H>,
'type' | 'model' | 'through' | 'property'
> = {}
) {
return (target: T, key: any) => {
const Target = target.constructor as typeof BaseModel

options = Options.create(options, {
isIncluded: false,
inverse: false
})

// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
options.type = 'hasOneThrough'
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
options.model = Is.String(model)
? () => ioc.safeUse(`App/Models/${model}`).constructor
: model
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
options.through = Is.String(through)
? () => ioc.safeUse(`App/Models/${through}`).constructor
: through
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
options.property = key

debug(
'registering hasOneThrough metadata for model %s: %o',
Target.name,
options
)

Annotation.defineHasOneThroughMeta(Target, options)
}
}
10 changes: 10 additions & 0 deletions src/models/builders/ModelQueryBuilder.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,8 @@ import { HasManyRelation } from '#src/models/relations/HasMany/HasManyRelation'
import { NullableValueException } from '#src/exceptions/NullableValueException'
import { BelongsToRelation } from '#src/models/relations/BelongsTo/BelongsToRelation'
import { BelongsToManyRelation } from '#src/models/relations/BelongsToMany/BelongsToManyRelation'
import { HasOneThroughRelation } from '#src/models/relations/HasOneThrough/HasOneThroughRelation'
import { HasManyThroughRelation } from '#src/models/relations/HasManyThrough/HasManyThroughRelation'

export class ModelQueryBuilder<
M extends BaseModel = any,
Expand DownExpand Up@@ -615,6 +617,10 @@ export class ModelQueryBuilder<
return HasOneRelation.whereHas(this.Model, query, snapshot)
case 'hasMany':
return HasManyRelation.whereHas(this.Model, query, snapshot)
case 'hasOneThrough':
return HasOneThroughRelation.whereHas(this.Model, query, snapshot)
case 'hasManyThrough':
return HasManyThroughRelation.whereHas(this.Model, query, snapshot)
case 'belongsTo':
return BelongsToRelation.whereHas(this.Model, query, snapshot)
case 'belongsToMany':
Expand DownExpand Up@@ -659,6 +665,10 @@ export class ModelQueryBuilder<
return HasOneRelation.whereHas(this.Model, query, snapshot)
case 'hasMany':
return HasManyRelation.whereHas(this.Model, query, snapshot)
case 'hasOneThrough':
return HasOneThroughRelation.whereHas(this.Model, query, snapshot)
case 'hasManyThrough':
return HasManyThroughRelation.whereHas(this.Model, query, snapshot)
case 'belongsTo':
return BelongsToRelation.whereHas(this.Model, query, snapshot)
case 'belongsToMany':
Expand Down
10 changes: 10 additions & 0 deletions src/models/factories/ModelGenerator.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@ import type { BaseModel } from '#src/models/BaseModel'
import { ModelSchema } from '#src/models/schemas/ModelSchema'
import { HasOneRelation } from '#src/models/relations/HasOne/HasOneRelation'
import { HasManyRelation } from '#src/models/relations/HasMany/HasManyRelation'
import { HasOneThroughRelation } from '#src/models/relations/HasOneThrough/HasOneThroughRelation'
import { HasManyThroughRelation } from '#src/models/relations/HasManyThrough/HasManyThroughRelation'
import { BelongsToRelation } from '#src/models/relations/BelongsTo/BelongsToRelation'
import { BelongsToManyRelation } from '#src/models/relations/BelongsToMany/BelongsToManyRelation'

Expand DownExpand Up@@ -105,6 +107,10 @@ export class ModelGenerator<M extends BaseModel = any> extends Macroable {
return HasOneRelation.load(model, relation)
case 'hasMany':
return HasManyRelation.load(model, relation)
case 'hasOneThrough':
return HasOneThroughRelation.load(model, relation)
case 'hasManyThrough':
return HasManyThroughRelation.load(model, relation)
case 'belongsTo':
return BelongsToRelation.load(model, relation)
case 'belongsToMany':
Expand DownExpand Up@@ -147,6 +153,10 @@ export class ModelGenerator<M extends BaseModel = any> extends Macroable {
return HasOneRelation.loadAll(models, relation)
case 'hasMany':
return HasManyRelation.loadAll(models, relation)
case 'hasOneThrough':
return HasOneThroughRelation.loadAll(models, relation)
case 'hasManyThrough':
return HasManyThroughRelation.loadAll(models, relation)
case 'belongsTo':
return BelongsToRelation.loadAll(models, relation)
case 'belongsToMany':
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
feat: add through relations#236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jlenon7
merged 2 commits into

from

May 21, 2026
 Merged


feat: add through relations
#236
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
21f9cad

feat: add through relations


jlenon7 May 21, 2026
4408a09

feat: add through relations


jlenon7 May 21, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
package-lock.json

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 1 addition & 1 deletion
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "name": "@athenna/database",
 "version": "5.54.0",
 "version": "5.55.0",
 "description": "The Athenna database handler for SQL/NoSQL.",
 "license": "MIT",
 "author": "João Lenon <lenon@athenna.io>",
Expand Down

2 changes: 2 additions & 0 deletions
src/constants/MetadataKeys.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,5 +10,7 @@
export const COLUMNS_KEY = 'database:columns:options'
export const HAS_ONE_KEY = 'database:hasOne:options'
export const HAS_MANY_KEY = 'database:hasMany:options'
export const HAS_ONE_THROUGH_KEY = 'database:hasOneThrough:options'
export const HAS_MANY_THROUGH_KEY = 'database:hasManyThrough:options'
export const BELONGS_TO_KEY = 'database:belongsTo:options'
export const BELONGS_TO_MANY_KEY = 'database:belongsToMany:options'

37 changes: 37 additions & 0 deletions
src/helpers/Annotation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,8 @@ import {
 COLUMNS_KEY,
 HAS_ONE_KEY,
 HAS_MANY_KEY,
 HAS_ONE_THROUGH_KEY,
 HAS_MANY_THROUGH_KEY,
 BELONGS_TO_KEY,
 BELONGS_TO_MANY_KEY
} from '#src/constants/MetadataKeys'
Expand All@@ -19,6 +21,8 @@ import type {
 ColumnOptions,
 HasOneOptions,
 HasManyOptions,
 HasOneThroughOptions,
 HasManyThroughOptions,
 BelongsToOptions,
 BelongsToManyOptions
} from '#src/types'
Expand All@@ -40,6 +44,8 @@ export class Annotation {
 return [
 ...this.getHasOnesMeta(target),
 ...this.getHasManyMeta(target),
 ...this.getHasOneThroughMeta(target),
 ...this.getHasManyThroughMeta(target),
 ...this.getBelongsToMeta(target),
 ...this.getBelongsToManyMeta(target)
 ]
Expand DownExpand Up@@ -69,6 +75,37 @@ export class Annotation {
 Reflect.defineMetadata(HAS_MANY_KEY, hasMany, target)
 }

 public static getHasOneThroughMeta(target: any): HasOneThroughOptions[] {
 return Reflect.getMetadata(HAS_ONE_THROUGH_KEY, target) || []
 }

 public static defineHasOneThroughMeta(
 target: any,
 options: HasOneThroughOptions
 ) {
 const hasOneThrough = Reflect.getMetadata(HAS_ONE_THROUGH_KEY, target) || []

 hasOneThrough.push(options)

 Reflect.defineMetadata(HAS_ONE_THROUGH_KEY, hasOneThrough, target)
 }

 public static getHasManyThroughMeta(target: any): HasManyThroughOptions[] {
 return Reflect.getMetadata(HAS_MANY_THROUGH_KEY, target) || []
 }

 public static defineHasManyThroughMeta(
 target: any,
 options: HasManyThroughOptions
 ) {
 const hasManyThrough =
 Reflect.getMetadata(HAS_MANY_THROUGH_KEY, target) || []

 hasManyThrough.push(options)

 Reflect.defineMetadata(HAS_MANY_THROUGH_KEY, hasManyThrough, target)
 }

 public static getBelongsToMeta(target: any): BelongsToOptions[] {
 return Reflect.getMetadata(BELONGS_TO_KEY, target) || []
 }
Expand Down

2 changes: 2 additions & 0 deletions
src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,8 @@ export * from '#src/models/schemas/ModelSchema'
export * from '#src/models/annotations/Column'
export * from '#src/models/annotations/HasOne'
export * from '#src/models/annotations/HasMany'
export * from '#src/models/annotations/HasOneThrough'
export * from '#src/models/annotations/HasManyThrough'
export * from '#src/models/annotations/BelongsTo'
export * from '#src/models/annotations/BelongsToMany'

Expand Down

66 changes: 66 additions & 0 deletions
src/models/annotations/HasManyThrough.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
/**
 * @athenna/database
 *
 * (c) João Lenon <lenon@athenna.io>
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
 */

import 'reflect-metadata'

import { debug } from '#src/debug'
import { Annotation } from '#src/helpers/Annotation'
import { Is, Options } from '@athenna/common'
import type { BaseModel } from '#src/models/BaseModel'
import type { HasManyThroughOptions } from '#src/types/relations/HasManyThroughOptions'

/**
 * Create has many through relation for model class.
 */
export function HasManyThrough<
 T extends BaseModel = any,
 R extends BaseModel = any,
 H extends BaseModel = any
>(
 model: (() => new () => R) | string,
 through: (() => new () => H) | string,
 options: Omit<
 HasManyThroughOptions<T, R, H>,
 'type' | 'model' | 'through' | 'property'
 > = {}
) {
 return (target: T, key: any) => {
 const Target = target.constructor as typeof BaseModel

 options = Options.create(options, {
 isIncluded: false,
 inverse: false
 })

 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.type = 'hasManyThrough'
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.model = Is.String(model)
 ? () => ioc.safeUse(`App/Models/${model}`).constructor
 : model
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.through = Is.String(through)
 ? () => ioc.safeUse(`App/Models/${through}`).constructor
 : through
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.property = key

 debug(
 'registering hasManyThrough metadata for model %s: %o',
 Target.name,
 options
 )

 Annotation.defineHasManyThroughMeta(Target, options)
 }
}

66 changes: 66 additions & 0 deletions
src/models/annotations/HasOneThrough.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
/**
 * @athenna/database
 *
 * (c) João Lenon <lenon@athenna.io>
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
 */

import 'reflect-metadata'

import { debug } from '#src/debug'
import { Annotation } from '#src/helpers/Annotation'
import { Is, Options } from '@athenna/common'
import type { BaseModel } from '#src/models/BaseModel'
import type { HasOneThroughOptions } from '#src/types/relations/HasOneThroughOptions'

/**
 * Create has one through relation for model class.
 */
export function HasOneThrough<
 T extends BaseModel = any,
 R extends BaseModel = any,
 H extends BaseModel = any
>(
 model: (() => new () => R) | string,
 through: (() => new () => H) | string,
 options: Omit<
 HasOneThroughOptions<T, R, H>,
 'type' | 'model' | 'through' | 'property'
 > = {}
) {
 return (target: T, key: any) => {
 const Target = target.constructor as typeof BaseModel

 options = Options.create(options, {
 isIncluded: false,
 inverse: false
 })

 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.type = 'hasOneThrough'
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.model = Is.String(model)
 ? () => ioc.safeUse(`App/Models/${model}`).constructor
 : model
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.through = Is.String(through)
 ? () => ioc.safeUse(`App/Models/${through}`).constructor
 : through
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.property = key

 debug(
 'registering hasOneThrough metadata for model %s: %o',
 Target.name,
 options
 )

 Annotation.defineHasOneThroughMeta(Target, options)
 }
}

10 changes: 10 additions & 0 deletions
src/models/builders/ModelQueryBuilder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,8 @@ import { HasManyRelation } from '#src/models/relations/HasMany/HasManyRelation'
import { NullableValueException } from '#src/exceptions/NullableValueException'
import { BelongsToRelation } from '#src/models/relations/BelongsTo/BelongsToRelation'
import { BelongsToManyRelation } from '#src/models/relations/BelongsToMany/BelongsToManyRelation'
import { HasOneThroughRelation } from '#src/models/relations/HasOneThrough/HasOneThroughRelation'
import { HasManyThroughRelation } from '#src/models/relations/HasManyThrough/HasManyThroughRelation'

export class ModelQueryBuilder<
 M extends BaseModel = any,
Expand DownExpand Up@@ -615,6 +617,10 @@ export class ModelQueryBuilder<
 return HasOneRelation.whereHas(this.Model, query, snapshot)
 case 'hasMany':
 return HasManyRelation.whereHas(this.Model, query, snapshot)
 case 'hasOneThrough':
 return HasOneThroughRelation.whereHas(this.Model, query, snapshot)
 case 'hasManyThrough':
 return HasManyThroughRelation.whereHas(this.Model, query, snapshot)
 case 'belongsTo':
 return BelongsToRelation.whereHas(this.Model, query, snapshot)
 case 'belongsToMany':
Expand DownExpand Up@@ -659,6 +665,10 @@ export class ModelQueryBuilder<
 return HasOneRelation.whereHas(this.Model, query, snapshot)
 case 'hasMany':
 return HasManyRelation.whereHas(this.Model, query, snapshot)
 case 'hasOneThrough':
 return HasOneThroughRelation.whereHas(this.Model, query, snapshot)
 case 'hasManyThrough':
 return HasManyThroughRelation.whereHas(this.Model, query, snapshot)
 case 'belongsTo':
 return BelongsToRelation.whereHas(this.Model, query, snapshot)
 case 'belongsToMany':
Expand Down

10 changes: 10 additions & 0 deletions
src/models/factories/ModelGenerator.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@ import type { BaseModel } from '#src/models/BaseModel'
import { ModelSchema } from '#src/models/schemas/ModelSchema'
import { HasOneRelation } from '#src/models/relations/HasOne/HasOneRelation'
import { HasManyRelation } from '#src/models/relations/HasMany/HasManyRelation'
import { HasOneThroughRelation } from '#src/models/relations/HasOneThrough/HasOneThroughRelation'
import { HasManyThroughRelation } from '#src/models/relations/HasManyThrough/HasManyThroughRelation'
import { BelongsToRelation } from '#src/models/relations/BelongsTo/BelongsToRelation'
import { BelongsToManyRelation } from '#src/models/relations/BelongsToMany/BelongsToManyRelation'

Expand DownExpand Up@@ -105,6 +107,10 @@ export class ModelGenerator<M extends BaseModel = any> extends Macroable {
 return HasOneRelation.load(model, relation)
 case 'hasMany':
 return HasManyRelation.load(model, relation)
 case 'hasOneThrough':
 return HasOneThroughRelation.load(model, relation)
 case 'hasManyThrough':
 return HasManyThroughRelation.load(model, relation)
 case 'belongsTo':
 return BelongsToRelation.load(model, relation)
 case 'belongsToMany':
Expand DownExpand Up@@ -147,6 +153,10 @@ export class ModelGenerator<M extends BaseModel = any> extends Macroable {
 return HasOneRelation.loadAll(models, relation)
 case 'hasMany':
 return HasManyRelation.loadAll(models, relation)
 case 'hasOneThrough':
 return HasOneThroughRelation.loadAll(models, relation)
 case 'hasManyThrough':
 return HasManyThroughRelation.loadAll(models, relation)
 case 'belongsTo':
 return BelongsToRelation.loadAll(models, relation)
 case 'belongsToMany':
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat: add through relations#236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jlenon7
merged 2 commits into

from

May 21, 2026
 Merged


feat: add through relations
#236
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
21f9cad

feat: add through relations


jlenon7 May 21, 2026
4408a09

feat: add through relations


jlenon7 May 21, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
package-lock.json

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 1 addition & 1 deletion
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "name": "@athenna/database",
 "version": "5.54.0",
 "version": "5.55.0",
 "description": "The Athenna database handler for SQL/NoSQL.",
 "license": "MIT",
 "author": "João Lenon <lenon@athenna.io>",
Expand Down

2 changes: 2 additions & 0 deletions
src/constants/MetadataKeys.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,5 +10,7 @@
export const COLUMNS_KEY = 'database:columns:options'
export const HAS_ONE_KEY = 'database:hasOne:options'
export const HAS_MANY_KEY = 'database:hasMany:options'
export const HAS_ONE_THROUGH_KEY = 'database:hasOneThrough:options'
export const HAS_MANY_THROUGH_KEY = 'database:hasManyThrough:options'
export const BELONGS_TO_KEY = 'database:belongsTo:options'
export const BELONGS_TO_MANY_KEY = 'database:belongsToMany:options'

37 changes: 37 additions & 0 deletions
src/helpers/Annotation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,8 @@ import {
 COLUMNS_KEY,
 HAS_ONE_KEY,
 HAS_MANY_KEY,
 HAS_ONE_THROUGH_KEY,
 HAS_MANY_THROUGH_KEY,
 BELONGS_TO_KEY,
 BELONGS_TO_MANY_KEY
} from '#src/constants/MetadataKeys'
Expand All@@ -19,6 +21,8 @@ import type {
 ColumnOptions,
 HasOneOptions,
 HasManyOptions,
 HasOneThroughOptions,
 HasManyThroughOptions,
 BelongsToOptions,
 BelongsToManyOptions
} from '#src/types'
Expand All@@ -40,6 +44,8 @@ export class Annotation {
 return [
 ...this.getHasOnesMeta(target),
 ...this.getHasManyMeta(target),
 ...this.getHasOneThroughMeta(target),
 ...this.getHasManyThroughMeta(target),
 ...this.getBelongsToMeta(target),
 ...this.getBelongsToManyMeta(target)
 ]
Expand DownExpand Up@@ -69,6 +75,37 @@ export class Annotation {
 Reflect.defineMetadata(HAS_MANY_KEY, hasMany, target)
 }

 public static getHasOneThroughMeta(target: any): HasOneThroughOptions[] {
 return Reflect.getMetadata(HAS_ONE_THROUGH_KEY, target) || []
 }

 public static defineHasOneThroughMeta(
 target: any,
 options: HasOneThroughOptions
 ) {
 const hasOneThrough = Reflect.getMetadata(HAS_ONE_THROUGH_KEY, target) || []

 hasOneThrough.push(options)

 Reflect.defineMetadata(HAS_ONE_THROUGH_KEY, hasOneThrough, target)
 }

 public static getHasManyThroughMeta(target: any): HasManyThroughOptions[] {
 return Reflect.getMetadata(HAS_MANY_THROUGH_KEY, target) || []
 }

 public static defineHasManyThroughMeta(
 target: any,
 options: HasManyThroughOptions
 ) {
 const hasManyThrough =
 Reflect.getMetadata(HAS_MANY_THROUGH_KEY, target) || []

 hasManyThrough.push(options)

 Reflect.defineMetadata(HAS_MANY_THROUGH_KEY, hasManyThrough, target)
 }

 public static getBelongsToMeta(target: any): BelongsToOptions[] {
 return Reflect.getMetadata(BELONGS_TO_KEY, target) || []
 }
Expand Down

2 changes: 2 additions & 0 deletions
src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,8 @@ export * from '#src/models/schemas/ModelSchema'
export * from '#src/models/annotations/Column'
export * from '#src/models/annotations/HasOne'
export * from '#src/models/annotations/HasMany'
export * from '#src/models/annotations/HasOneThrough'
export * from '#src/models/annotations/HasManyThrough'
export * from '#src/models/annotations/BelongsTo'
export * from '#src/models/annotations/BelongsToMany'

Expand Down

66 changes: 66 additions & 0 deletions
src/models/annotations/HasManyThrough.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
/**
 * @athenna/database
 *
 * (c) João Lenon <lenon@athenna.io>
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
 */

import 'reflect-metadata'

import { debug } from '#src/debug'
import { Annotation } from '#src/helpers/Annotation'
import { Is, Options } from '@athenna/common'
import type { BaseModel } from '#src/models/BaseModel'
import type { HasManyThroughOptions } from '#src/types/relations/HasManyThroughOptions'

/**
 * Create has many through relation for model class.
 */
export function HasManyThrough<
 T extends BaseModel = any,
 R extends BaseModel = any,
 H extends BaseModel = any
>(
 model: (() => new () => R) | string,
 through: (() => new () => H) | string,
 options: Omit<
 HasManyThroughOptions<T, R, H>,
 'type' | 'model' | 'through' | 'property'
 > = {}
) {
 return (target: T, key: any) => {
 const Target = target.constructor as typeof BaseModel

 options = Options.create(options, {
 isIncluded: false,
 inverse: false
 })

 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.type = 'hasManyThrough'
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.model = Is.String(model)
 ? () => ioc.safeUse(`App/Models/${model}`).constructor
 : model
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.through = Is.String(through)
 ? () => ioc.safeUse(`App/Models/${through}`).constructor
 : through
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.property = key

 debug(
 'registering hasManyThrough metadata for model %s: %o',
 Target.name,
 options
 )

 Annotation.defineHasManyThroughMeta(Target, options)
 }
}

66 changes: 66 additions & 0 deletions
src/models/annotations/HasOneThrough.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
/**
 * @athenna/database
 *
 * (c) João Lenon <lenon@athenna.io>
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
 */

import 'reflect-metadata'

import { debug } from '#src/debug'
import { Annotation } from '#src/helpers/Annotation'
import { Is, Options } from '@athenna/common'
import type { BaseModel } from '#src/models/BaseModel'
import type { HasOneThroughOptions } from '#src/types/relations/HasOneThroughOptions'

/**
 * Create has one through relation for model class.
 */
export function HasOneThrough<
 T extends BaseModel = any,
 R extends BaseModel = any,
 H extends BaseModel = any
>(
 model: (() => new () => R) | string,
 through: (() => new () => H) | string,
 options: Omit<
 HasOneThroughOptions<T, R, H>,
 'type' | 'model' | 'through' | 'property'
 > = {}
) {
 return (target: T, key: any) => {
 const Target = target.constructor as typeof BaseModel

 options = Options.create(options, {
 isIncluded: false,
 inverse: false
 })

 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.type = 'hasOneThrough'
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.model = Is.String(model)
 ? () => ioc.safeUse(`App/Models/${model}`).constructor
 : model
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.through = Is.String(through)
 ? () => ioc.safeUse(`App/Models/${through}`).constructor
 : through
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.property = key

 debug(
 'registering hasOneThrough metadata for model %s: %o',
 Target.name,
 options
 )

 Annotation.defineHasOneThroughMeta(Target, options)
 }
}

10 changes: 10 additions & 0 deletions
src/models/builders/ModelQueryBuilder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,8 @@ import { HasManyRelation } from '#src/models/relations/HasMany/HasManyRelation'
import { NullableValueException } from '#src/exceptions/NullableValueException'
import { BelongsToRelation } from '#src/models/relations/BelongsTo/BelongsToRelation'
import { BelongsToManyRelation } from '#src/models/relations/BelongsToMany/BelongsToManyRelation'
import { HasOneThroughRelation } from '#src/models/relations/HasOneThrough/HasOneThroughRelation'
import { HasManyThroughRelation } from '#src/models/relations/HasManyThrough/HasManyThroughRelation'

export class ModelQueryBuilder<
 M extends BaseModel = any,
Expand DownExpand Up@@ -615,6 +617,10 @@ export class ModelQueryBuilder<
 return HasOneRelation.whereHas(this.Model, query, snapshot)
 case 'hasMany':
 return HasManyRelation.whereHas(this.Model, query, snapshot)
 case 'hasOneThrough':
 return HasOneThroughRelation.whereHas(this.Model, query, snapshot)
 case 'hasManyThrough':
 return HasManyThroughRelation.whereHas(this.Model, query, snapshot)
 case 'belongsTo':
 return BelongsToRelation.whereHas(this.Model, query, snapshot)
 case 'belongsToMany':
Expand DownExpand Up@@ -659,6 +665,10 @@ export class ModelQueryBuilder<
 return HasOneRelation.whereHas(this.Model, query, snapshot)
 case 'hasMany':
 return HasManyRelation.whereHas(this.Model, query, snapshot)
 case 'hasOneThrough':
 return HasOneThroughRelation.whereHas(this.Model, query, snapshot)
 case 'hasManyThrough':
 return HasManyThroughRelation.whereHas(this.Model, query, snapshot)
 case 'belongsTo':
 return BelongsToRelation.whereHas(this.Model, query, snapshot)
 case 'belongsToMany':
Expand Down

10 changes: 10 additions & 0 deletions
src/models/factories/ModelGenerator.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@ import type { BaseModel } from '#src/models/BaseModel'
import { ModelSchema } from '#src/models/schemas/ModelSchema'
import { HasOneRelation } from '#src/models/relations/HasOne/HasOneRelation'
import { HasManyRelation } from '#src/models/relations/HasMany/HasManyRelation'
import { HasOneThroughRelation } from '#src/models/relations/HasOneThrough/HasOneThroughRelation'
import { HasManyThroughRelation } from '#src/models/relations/HasManyThrough/HasManyThroughRelation'
import { BelongsToRelation } from '#src/models/relations/BelongsTo/BelongsToRelation'
import { BelongsToManyRelation } from '#src/models/relations/BelongsToMany/BelongsToManyRelation'

Expand DownExpand Up@@ -105,6 +107,10 @@ export class ModelGenerator<M extends BaseModel = any> extends Macroable {
 return HasOneRelation.load(model, relation)
 case 'hasMany':
 return HasManyRelation.load(model, relation)
 case 'hasOneThrough':
 return HasOneThroughRelation.load(model, relation)
 case 'hasManyThrough':
 return HasManyThroughRelation.load(model, relation)
 case 'belongsTo':
 return BelongsToRelation.load(model, relation)
 case 'belongsToMany':
Expand DownExpand Up@@ -147,6 +153,10 @@ export class ModelGenerator<M extends BaseModel = any> extends Macroable {
 return HasOneRelation.loadAll(models, relation)
 case 'hasMany':
 return HasManyRelation.loadAll(models, relation)
 case 'hasOneThrough':
 return HasOneThroughRelation.loadAll(models, relation)
 case 'hasManyThrough':
 return HasManyThroughRelation.loadAll(models, relation)
 case 'belongsTo':
 return BelongsToRelation.loadAll(models, relation)
 case 'belongsToMany':
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat: add through relations#236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jlenon7
merged 2 commits into

from

May 21, 2026
 Merged


feat: add through relations
#236
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
21f9cad

feat: add through relations


jlenon7 May 21, 2026
4408a09

feat: add through relations


jlenon7 May 21, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
package-lock.json

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 1 addition & 1 deletion
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "name": "@athenna/database",
 "version": "5.54.0",
 "version": "5.55.0",
 "description": "The Athenna database handler for SQL/NoSQL.",
 "license": "MIT",
 "author": "João Lenon <lenon@athenna.io>",
Expand Down

2 changes: 2 additions & 0 deletions
src/constants/MetadataKeys.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,5 +10,7 @@
export const COLUMNS_KEY = 'database:columns:options'
export const HAS_ONE_KEY = 'database:hasOne:options'
export const HAS_MANY_KEY = 'database:hasMany:options'
export const HAS_ONE_THROUGH_KEY = 'database:hasOneThrough:options'
export const HAS_MANY_THROUGH_KEY = 'database:hasManyThrough:options'
export const BELONGS_TO_KEY = 'database:belongsTo:options'
export const BELONGS_TO_MANY_KEY = 'database:belongsToMany:options'

37 changes: 37 additions & 0 deletions
src/helpers/Annotation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,8 @@ import {
 COLUMNS_KEY,
 HAS_ONE_KEY,
 HAS_MANY_KEY,
 HAS_ONE_THROUGH_KEY,
 HAS_MANY_THROUGH_KEY,
 BELONGS_TO_KEY,
 BELONGS_TO_MANY_KEY
} from '#src/constants/MetadataKeys'
Expand All@@ -19,6 +21,8 @@ import type {
 ColumnOptions,
 HasOneOptions,
 HasManyOptions,
 HasOneThroughOptions,
 HasManyThroughOptions,
 BelongsToOptions,
 BelongsToManyOptions
} from '#src/types'
Expand All@@ -40,6 +44,8 @@ export class Annotation {
 return [
 ...this.getHasOnesMeta(target),
 ...this.getHasManyMeta(target),
 ...this.getHasOneThroughMeta(target),
 ...this.getHasManyThroughMeta(target),
 ...this.getBelongsToMeta(target),
 ...this.getBelongsToManyMeta(target)
 ]
Expand DownExpand Up@@ -69,6 +75,37 @@ export class Annotation {
 Reflect.defineMetadata(HAS_MANY_KEY, hasMany, target)
 }

 public static getHasOneThroughMeta(target: any): HasOneThroughOptions[] {
 return Reflect.getMetadata(HAS_ONE_THROUGH_KEY, target) || []
 }

 public static defineHasOneThroughMeta(
 target: any,
 options: HasOneThroughOptions
 ) {
 const hasOneThrough = Reflect.getMetadata(HAS_ONE_THROUGH_KEY, target) || []

 hasOneThrough.push(options)

 Reflect.defineMetadata(HAS_ONE_THROUGH_KEY, hasOneThrough, target)
 }

 public static getHasManyThroughMeta(target: any): HasManyThroughOptions[] {
 return Reflect.getMetadata(HAS_MANY_THROUGH_KEY, target) || []
 }

 public static defineHasManyThroughMeta(
 target: any,
 options: HasManyThroughOptions
 ) {
 const hasManyThrough =
 Reflect.getMetadata(HAS_MANY_THROUGH_KEY, target) || []

 hasManyThrough.push(options)

 Reflect.defineMetadata(HAS_MANY_THROUGH_KEY, hasManyThrough, target)
 }

 public static getBelongsToMeta(target: any): BelongsToOptions[] {
 return Reflect.getMetadata(BELONGS_TO_KEY, target) || []
 }
Expand Down

2 changes: 2 additions & 0 deletions
src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,8 @@ export * from '#src/models/schemas/ModelSchema'
export * from '#src/models/annotations/Column'
export * from '#src/models/annotations/HasOne'
export * from '#src/models/annotations/HasMany'
export * from '#src/models/annotations/HasOneThrough'
export * from '#src/models/annotations/HasManyThrough'
export * from '#src/models/annotations/BelongsTo'
export * from '#src/models/annotations/BelongsToMany'

Expand Down

66 changes: 66 additions & 0 deletions
src/models/annotations/HasManyThrough.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
/**
 * @athenna/database
 *
 * (c) João Lenon <lenon@athenna.io>
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
 */

import 'reflect-metadata'

import { debug } from '#src/debug'
import { Annotation } from '#src/helpers/Annotation'
import { Is, Options } from '@athenna/common'
import type { BaseModel } from '#src/models/BaseModel'
import type { HasManyThroughOptions } from '#src/types/relations/HasManyThroughOptions'

/**
 * Create has many through relation for model class.
 */
export function HasManyThrough<
 T extends BaseModel = any,
 R extends BaseModel = any,
 H extends BaseModel = any
>(
 model: (() => new () => R) | string,
 through: (() => new () => H) | string,
 options: Omit<
 HasManyThroughOptions<T, R, H>,
 'type' | 'model' | 'through' | 'property'
 > = {}
) {
 return (target: T, key: any) => {
 const Target = target.constructor as typeof BaseModel

 options = Options.create(options, {
 isIncluded: false,
 inverse: false
 })

 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.type = 'hasManyThrough'
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.model = Is.String(model)
 ? () => ioc.safeUse(`App/Models/${model}`).constructor
 : model
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.through = Is.String(through)
 ? () => ioc.safeUse(`App/Models/${through}`).constructor
 : through
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.property = key

 debug(
 'registering hasManyThrough metadata for model %s: %o',
 Target.name,
 options
 )

 Annotation.defineHasManyThroughMeta(Target, options)
 }
}

66 changes: 66 additions & 0 deletions
src/models/annotations/HasOneThrough.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
/**
 * @athenna/database
 *
 * (c) João Lenon <lenon@athenna.io>
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
 */

import 'reflect-metadata'

import { debug } from '#src/debug'
import { Annotation } from '#src/helpers/Annotation'
import { Is, Options } from '@athenna/common'
import type { BaseModel } from '#src/models/BaseModel'
import type { HasOneThroughOptions } from '#src/types/relations/HasOneThroughOptions'

/**
 * Create has one through relation for model class.
 */
export function HasOneThrough<
 T extends BaseModel = any,
 R extends BaseModel = any,
 H extends BaseModel = any
>(
 model: (() => new () => R) | string,
 through: (() => new () => H) | string,
 options: Omit<
 HasOneThroughOptions<T, R, H>,
 'type' | 'model' | 'through' | 'property'
 > = {}
) {
 return (target: T, key: any) => {
 const Target = target.constructor as typeof BaseModel

 options = Options.create(options, {
 isIncluded: false,
 inverse: false
 })

 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.type = 'hasOneThrough'
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.model = Is.String(model)
 ? () => ioc.safeUse(`App/Models/${model}`).constructor
 : model
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.through = Is.String(through)
 ? () => ioc.safeUse(`App/Models/${through}`).constructor
 : through
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.property = key

 debug(
 'registering hasOneThrough metadata for model %s: %o',
 Target.name,
 options
 )

 Annotation.defineHasOneThroughMeta(Target, options)
 }
}

10 changes: 10 additions & 0 deletions
src/models/builders/ModelQueryBuilder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,8 @@ import { HasManyRelation } from '#src/models/relations/HasMany/HasManyRelation'
import { NullableValueException } from '#src/exceptions/NullableValueException'
import { BelongsToRelation } from '#src/models/relations/BelongsTo/BelongsToRelation'
import { BelongsToManyRelation } from '#src/models/relations/BelongsToMany/BelongsToManyRelation'
import { HasOneThroughRelation } from '#src/models/relations/HasOneThrough/HasOneThroughRelation'
import { HasManyThroughRelation } from '#src/models/relations/HasManyThrough/HasManyThroughRelation'

export class ModelQueryBuilder<
 M extends BaseModel = any,
Expand DownExpand Up@@ -615,6 +617,10 @@ export class ModelQueryBuilder<
 return HasOneRelation.whereHas(this.Model, query, snapshot)
 case 'hasMany':
 return HasManyRelation.whereHas(this.Model, query, snapshot)
 case 'hasOneThrough':
 return HasOneThroughRelation.whereHas(this.Model, query, snapshot)
 case 'hasManyThrough':
 return HasManyThroughRelation.whereHas(this.Model, query, snapshot)
 case 'belongsTo':
 return BelongsToRelation.whereHas(this.Model, query, snapshot)
 case 'belongsToMany':
Expand DownExpand Up@@ -659,6 +665,10 @@ export class ModelQueryBuilder<
 return HasOneRelation.whereHas(this.Model, query, snapshot)
 case 'hasMany':
 return HasManyRelation.whereHas(this.Model, query, snapshot)
 case 'hasOneThrough':
 return HasOneThroughRelation.whereHas(this.Model, query, snapshot)
 case 'hasManyThrough':
 return HasManyThroughRelation.whereHas(this.Model, query, snapshot)
 case 'belongsTo':
 return BelongsToRelation.whereHas(this.Model, query, snapshot)
 case 'belongsToMany':
Expand Down

10 changes: 10 additions & 0 deletions
src/models/factories/ModelGenerator.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@ import type { BaseModel } from '#src/models/BaseModel'
import { ModelSchema } from '#src/models/schemas/ModelSchema'
import { HasOneRelation } from '#src/models/relations/HasOne/HasOneRelation'
import { HasManyRelation } from '#src/models/relations/HasMany/HasManyRelation'
import { HasOneThroughRelation } from '#src/models/relations/HasOneThrough/HasOneThroughRelation'
import { HasManyThroughRelation } from '#src/models/relations/HasManyThrough/HasManyThroughRelation'
import { BelongsToRelation } from '#src/models/relations/BelongsTo/BelongsToRelation'
import { BelongsToManyRelation } from '#src/models/relations/BelongsToMany/BelongsToManyRelation'

Expand DownExpand Up@@ -105,6 +107,10 @@ export class ModelGenerator<M extends BaseModel = any> extends Macroable {
 return HasOneRelation.load(model, relation)
 case 'hasMany':
 return HasManyRelation.load(model, relation)
 case 'hasOneThrough':
 return HasOneThroughRelation.load(model, relation)
 case 'hasManyThrough':
 return HasManyThroughRelation.load(model, relation)
 case 'belongsTo':
 return BelongsToRelation.load(model, relation)
 case 'belongsToMany':
Expand DownExpand Up@@ -147,6 +153,10 @@ export class ModelGenerator<M extends BaseModel = any> extends Macroable {
 return HasOneRelation.loadAll(models, relation)
 case 'hasMany':
 return HasManyRelation.loadAll(models, relation)
 case 'hasOneThrough':
 return HasOneThroughRelation.loadAll(models, relation)
 case 'hasManyThrough':
 return HasManyThroughRelation.loadAll(models, relation)
 case 'belongsTo':
 return BelongsToRelation.loadAll(models, relation)
 case 'belongsToMany':
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
feat: add through relations#236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jlenon7
merged 2 commits into

from

May 21, 2026
 Merged


feat: add through relations
#236
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
21f9cad

feat: add through relations


jlenon7 May 21, 2026
4408a09

feat: add through relations


jlenon7 May 21, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
package-lock.json

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 1 addition & 1 deletion
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "name": "@athenna/database",
 "version": "5.54.0",
 "version": "5.55.0",
 "description": "The Athenna database handler for SQL/NoSQL.",
 "license": "MIT",
 "author": "João Lenon <lenon@athenna.io>",
Expand Down

2 changes: 2 additions & 0 deletions
src/constants/MetadataKeys.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,5 +10,7 @@
export const COLUMNS_KEY = 'database:columns:options'
export const HAS_ONE_KEY = 'database:hasOne:options'
export const HAS_MANY_KEY = 'database:hasMany:options'
export const HAS_ONE_THROUGH_KEY = 'database:hasOneThrough:options'
export const HAS_MANY_THROUGH_KEY = 'database:hasManyThrough:options'
export const BELONGS_TO_KEY = 'database:belongsTo:options'
export const BELONGS_TO_MANY_KEY = 'database:belongsToMany:options'

37 changes: 37 additions & 0 deletions
src/helpers/Annotation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,8 @@ import {
 COLUMNS_KEY,
 HAS_ONE_KEY,
 HAS_MANY_KEY,
 HAS_ONE_THROUGH_KEY,
 HAS_MANY_THROUGH_KEY,
 BELONGS_TO_KEY,
 BELONGS_TO_MANY_KEY
} from '#src/constants/MetadataKeys'
Expand All@@ -19,6 +21,8 @@ import type {
 ColumnOptions,
 HasOneOptions,
 HasManyOptions,
 HasOneThroughOptions,
 HasManyThroughOptions,
 BelongsToOptions,
 BelongsToManyOptions
} from '#src/types'
Expand All@@ -40,6 +44,8 @@ export class Annotation {
 return [
 ...this.getHasOnesMeta(target),
 ...this.getHasManyMeta(target),
 ...this.getHasOneThroughMeta(target),
 ...this.getHasManyThroughMeta(target),
 ...this.getBelongsToMeta(target),
 ...this.getBelongsToManyMeta(target)
 ]
Expand DownExpand Up@@ -69,6 +75,37 @@ export class Annotation {
 Reflect.defineMetadata(HAS_MANY_KEY, hasMany, target)
 }

 public static getHasOneThroughMeta(target: any): HasOneThroughOptions[] {
 return Reflect.getMetadata(HAS_ONE_THROUGH_KEY, target) || []
 }

 public static defineHasOneThroughMeta(
 target: any,
 options: HasOneThroughOptions
 ) {
 const hasOneThrough = Reflect.getMetadata(HAS_ONE_THROUGH_KEY, target) || []

 hasOneThrough.push(options)

 Reflect.defineMetadata(HAS_ONE_THROUGH_KEY, hasOneThrough, target)
 }

 public static getHasManyThroughMeta(target: any): HasManyThroughOptions[] {
 return Reflect.getMetadata(HAS_MANY_THROUGH_KEY, target) || []
 }

 public static defineHasManyThroughMeta(
 target: any,
 options: HasManyThroughOptions
 ) {
 const hasManyThrough =
 Reflect.getMetadata(HAS_MANY_THROUGH_KEY, target) || []

 hasManyThrough.push(options)

 Reflect.defineMetadata(HAS_MANY_THROUGH_KEY, hasManyThrough, target)
 }

 public static getBelongsToMeta(target: any): BelongsToOptions[] {
 return Reflect.getMetadata(BELONGS_TO_KEY, target) || []
 }
Expand Down

2 changes: 2 additions & 0 deletions
src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,8 @@ export * from '#src/models/schemas/ModelSchema'
export * from '#src/models/annotations/Column'
export * from '#src/models/annotations/HasOne'
export * from '#src/models/annotations/HasMany'
export * from '#src/models/annotations/HasOneThrough'
export * from '#src/models/annotations/HasManyThrough'
export * from '#src/models/annotations/BelongsTo'
export * from '#src/models/annotations/BelongsToMany'

Expand Down

66 changes: 66 additions & 0 deletions
src/models/annotations/HasManyThrough.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
/**
 * @athenna/database
 *
 * (c) João Lenon <lenon@athenna.io>
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
 */

import 'reflect-metadata'

import { debug } from '#src/debug'
import { Annotation } from '#src/helpers/Annotation'
import { Is, Options } from '@athenna/common'
import type { BaseModel } from '#src/models/BaseModel'
import type { HasManyThroughOptions } from '#src/types/relations/HasManyThroughOptions'

/**
 * Create has many through relation for model class.
 */
export function HasManyThrough<
 T extends BaseModel = any,
 R extends BaseModel = any,
 H extends BaseModel = any
>(
 model: (() => new () => R) | string,
 through: (() => new () => H) | string,
 options: Omit<
 HasManyThroughOptions<T, R, H>,
 'type' | 'model' | 'through' | 'property'
 > = {}
) {
 return (target: T, key: any) => {
 const Target = target.constructor as typeof BaseModel

 options = Options.create(options, {
 isIncluded: false,
 inverse: false
 })

 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.type = 'hasManyThrough'
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.model = Is.String(model)
 ? () => ioc.safeUse(`App/Models/${model}`).constructor
 : model
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.through = Is.String(through)
 ? () => ioc.safeUse(`App/Models/${through}`).constructor
 : through
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.property = key

 debug(
 'registering hasManyThrough metadata for model %s: %o',
 Target.name,
 options
 )

 Annotation.defineHasManyThroughMeta(Target, options)
 }
}

66 changes: 66 additions & 0 deletions
src/models/annotations/HasOneThrough.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
/**
 * @athenna/database
 *
 * (c) João Lenon <lenon@athenna.io>
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
 */

import 'reflect-metadata'

import { debug } from '#src/debug'
import { Annotation } from '#src/helpers/Annotation'
import { Is, Options } from '@athenna/common'
import type { BaseModel } from '#src/models/BaseModel'
import type { HasOneThroughOptions } from '#src/types/relations/HasOneThroughOptions'

/**
 * Create has one through relation for model class.
 */
export function HasOneThrough<
 T extends BaseModel = any,
 R extends BaseModel = any,
 H extends BaseModel = any
>(
 model: (() => new () => R) | string,
 through: (() => new () => H) | string,
 options: Omit<
 HasOneThroughOptions<T, R, H>,
 'type' | 'model' | 'through' | 'property'
 > = {}
) {
 return (target: T, key: any) => {
 const Target = target.constructor as typeof BaseModel

 options = Options.create(options, {
 isIncluded: false,
 inverse: false
 })

 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.type = 'hasOneThrough'
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.model = Is.String(model)
 ? () => ioc.safeUse(`App/Models/${model}`).constructor
 : model
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.through = Is.String(through)
 ? () => ioc.safeUse(`App/Models/${through}`).constructor
 : through
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.property = key

 debug(
 'registering hasOneThrough metadata for model %s: %o',
 Target.name,
 options
 )

 Annotation.defineHasOneThroughMeta(Target, options)
 }
}

10 changes: 10 additions & 0 deletions
src/models/builders/ModelQueryBuilder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,8 @@ import { HasManyRelation } from '#src/models/relations/HasMany/HasManyRelation'
import { NullableValueException } from '#src/exceptions/NullableValueException'
import { BelongsToRelation } from '#src/models/relations/BelongsTo/BelongsToRelation'
import { BelongsToManyRelation } from '#src/models/relations/BelongsToMany/BelongsToManyRelation'
import { HasOneThroughRelation } from '#src/models/relations/HasOneThrough/HasOneThroughRelation'
import { HasManyThroughRelation } from '#src/models/relations/HasManyThrough/HasManyThroughRelation'

export class ModelQueryBuilder<
 M extends BaseModel = any,
Expand DownExpand Up@@ -615,6 +617,10 @@ export class ModelQueryBuilder<
 return HasOneRelation.whereHas(this.Model, query, snapshot)
 case 'hasMany':
 return HasManyRelation.whereHas(this.Model, query, snapshot)
 case 'hasOneThrough':
 return HasOneThroughRelation.whereHas(this.Model, query, snapshot)
 case 'hasManyThrough':
 return HasManyThroughRelation.whereHas(this.Model, query, snapshot)
 case 'belongsTo':
 return BelongsToRelation.whereHas(this.Model, query, snapshot)
 case 'belongsToMany':
Expand DownExpand Up@@ -659,6 +665,10 @@ export class ModelQueryBuilder<
 return HasOneRelation.whereHas(this.Model, query, snapshot)
 case 'hasMany':
 return HasManyRelation.whereHas(this.Model, query, snapshot)
 case 'hasOneThrough':
 return HasOneThroughRelation.whereHas(this.Model, query, snapshot)
 case 'hasManyThrough':
 return HasManyThroughRelation.whereHas(this.Model, query, snapshot)
 case 'belongsTo':
 return BelongsToRelation.whereHas(this.Model, query, snapshot)
 case 'belongsToMany':
Expand Down

10 changes: 10 additions & 0 deletions
src/models/factories/ModelGenerator.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@ import type { BaseModel } from '#src/models/BaseModel'
import { ModelSchema } from '#src/models/schemas/ModelSchema'
import { HasOneRelation } from '#src/models/relations/HasOne/HasOneRelation'
import { HasManyRelation } from '#src/models/relations/HasMany/HasManyRelation'
import { HasOneThroughRelation } from '#src/models/relations/HasOneThrough/HasOneThroughRelation'
import { HasManyThroughRelation } from '#src/models/relations/HasManyThrough/HasManyThroughRelation'
import { BelongsToRelation } from '#src/models/relations/BelongsTo/BelongsToRelation'
import { BelongsToManyRelation } from '#src/models/relations/BelongsToMany/BelongsToManyRelation'

Expand DownExpand Up@@ -105,6 +107,10 @@ export class ModelGenerator<M extends BaseModel = any> extends Macroable {
 return HasOneRelation.load(model, relation)
 case 'hasMany':
 return HasManyRelation.load(model, relation)
 case 'hasOneThrough':
 return HasOneThroughRelation.load(model, relation)
 case 'hasManyThrough':
 return HasManyThroughRelation.load(model, relation)
 case 'belongsTo':
 return BelongsToRelation.load(model, relation)
 case 'belongsToMany':
Expand DownExpand Up@@ -147,6 +153,10 @@ export class ModelGenerator<M extends BaseModel = any> extends Macroable {
 return HasOneRelation.loadAll(models, relation)
 case 'hasMany':
 return HasManyRelation.loadAll(models, relation)
 case 'hasOneThrough':
 return HasOneThroughRelation.loadAll(models, relation)
 case 'hasManyThrough':
 return HasManyThroughRelation.loadAll(models, relation)
 case 'belongsTo':
 return BelongsToRelation.loadAll(models, relation)
 case 'belongsToMany':
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat: add through relations#236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jlenon7
merged 2 commits into

from

May 21, 2026
 Merged


feat: add through relations
#236
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
21f9cad

feat: add through relations


jlenon7 May 21, 2026
4408a09

feat: add through relations


jlenon7 May 21, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
package-lock.json

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 1 addition & 1 deletion
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "name": "@athenna/database",
 "version": "5.54.0",
 "version": "5.55.0",
 "description": "The Athenna database handler for SQL/NoSQL.",
 "license": "MIT",
 "author": "João Lenon <lenon@athenna.io>",
Expand Down

2 changes: 2 additions & 0 deletions
src/constants/MetadataKeys.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,5 +10,7 @@
export const COLUMNS_KEY = 'database:columns:options'
export const HAS_ONE_KEY = 'database:hasOne:options'
export const HAS_MANY_KEY = 'database:hasMany:options'
export const HAS_ONE_THROUGH_KEY = 'database:hasOneThrough:options'
export const HAS_MANY_THROUGH_KEY = 'database:hasManyThrough:options'
export const BELONGS_TO_KEY = 'database:belongsTo:options'
export const BELONGS_TO_MANY_KEY = 'database:belongsToMany:options'

37 changes: 37 additions & 0 deletions
src/helpers/Annotation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,8 @@ import {
 COLUMNS_KEY,
 HAS_ONE_KEY,
 HAS_MANY_KEY,
 HAS_ONE_THROUGH_KEY,
 HAS_MANY_THROUGH_KEY,
 BELONGS_TO_KEY,
 BELONGS_TO_MANY_KEY
} from '#src/constants/MetadataKeys'
Expand All@@ -19,6 +21,8 @@ import type {
 ColumnOptions,
 HasOneOptions,
 HasManyOptions,
 HasOneThroughOptions,
 HasManyThroughOptions,
 BelongsToOptions,
 BelongsToManyOptions
} from '#src/types'
Expand All@@ -40,6 +44,8 @@ export class Annotation {
 return [
 ...this.getHasOnesMeta(target),
 ...this.getHasManyMeta(target),
 ...this.getHasOneThroughMeta(target),
 ...this.getHasManyThroughMeta(target),
 ...this.getBelongsToMeta(target),
 ...this.getBelongsToManyMeta(target)
 ]
Expand DownExpand Up@@ -69,6 +75,37 @@ export class Annotation {
 Reflect.defineMetadata(HAS_MANY_KEY, hasMany, target)
 }

 public static getHasOneThroughMeta(target: any): HasOneThroughOptions[] {
 return Reflect.getMetadata(HAS_ONE_THROUGH_KEY, target) || []
 }

 public static defineHasOneThroughMeta(
 target: any,
 options: HasOneThroughOptions
 ) {
 const hasOneThrough = Reflect.getMetadata(HAS_ONE_THROUGH_KEY, target) || []

 hasOneThrough.push(options)

 Reflect.defineMetadata(HAS_ONE_THROUGH_KEY, hasOneThrough, target)
 }

 public static getHasManyThroughMeta(target: any): HasManyThroughOptions[] {
 return Reflect.getMetadata(HAS_MANY_THROUGH_KEY, target) || []
 }

 public static defineHasManyThroughMeta(
 target: any,
 options: HasManyThroughOptions
 ) {
 const hasManyThrough =
 Reflect.getMetadata(HAS_MANY_THROUGH_KEY, target) || []

 hasManyThrough.push(options)

 Reflect.defineMetadata(HAS_MANY_THROUGH_KEY, hasManyThrough, target)
 }

 public static getBelongsToMeta(target: any): BelongsToOptions[] {
 return Reflect.getMetadata(BELONGS_TO_KEY, target) || []
 }
Expand Down

2 changes: 2 additions & 0 deletions
src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,8 @@ export * from '#src/models/schemas/ModelSchema'
export * from '#src/models/annotations/Column'
export * from '#src/models/annotations/HasOne'
export * from '#src/models/annotations/HasMany'
export * from '#src/models/annotations/HasOneThrough'
export * from '#src/models/annotations/HasManyThrough'
export * from '#src/models/annotations/BelongsTo'
export * from '#src/models/annotations/BelongsToMany'

Expand Down

66 changes: 66 additions & 0 deletions
src/models/annotations/HasManyThrough.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
/**
 * @athenna/database
 *
 * (c) João Lenon <lenon@athenna.io>
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
 */

import 'reflect-metadata'

import { debug } from '#src/debug'
import { Annotation } from '#src/helpers/Annotation'
import { Is, Options } from '@athenna/common'
import type { BaseModel } from '#src/models/BaseModel'
import type { HasManyThroughOptions } from '#src/types/relations/HasManyThroughOptions'

/**
 * Create has many through relation for model class.
 */
export function HasManyThrough<
 T extends BaseModel = any,
 R extends BaseModel = any,
 H extends BaseModel = any
>(
 model: (() => new () => R) | string,
 through: (() => new () => H) | string,
 options: Omit<
 HasManyThroughOptions<T, R, H>,
 'type' | 'model' | 'through' | 'property'
 > = {}
) {
 return (target: T, key: any) => {
 const Target = target.constructor as typeof BaseModel

 options = Options.create(options, {
 isIncluded: false,
 inverse: false
 })

 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.type = 'hasManyThrough'
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.model = Is.String(model)
 ? () => ioc.safeUse(`App/Models/${model}`).constructor
 : model
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.through = Is.String(through)
 ? () => ioc.safeUse(`App/Models/${through}`).constructor
 : through
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.property = key

 debug(
 'registering hasManyThrough metadata for model %s: %o',
 Target.name,
 options
 )

 Annotation.defineHasManyThroughMeta(Target, options)
 }
}

66 changes: 66 additions & 0 deletions
src/models/annotations/HasOneThrough.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
/**
 * @athenna/database
 *
 * (c) João Lenon <lenon@athenna.io>
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
 */

import 'reflect-metadata'

import { debug } from '#src/debug'
import { Annotation } from '#src/helpers/Annotation'
import { Is, Options } from '@athenna/common'
import type { BaseModel } from '#src/models/BaseModel'
import type { HasOneThroughOptions } from '#src/types/relations/HasOneThroughOptions'

/**
 * Create has one through relation for model class.
 */
export function HasOneThrough<
 T extends BaseModel = any,
 R extends BaseModel = any,
 H extends BaseModel = any
>(
 model: (() => new () => R) | string,
 through: (() => new () => H) | string,
 options: Omit<
 HasOneThroughOptions<T, R, H>,
 'type' | 'model' | 'through' | 'property'
 > = {}
) {
 return (target: T, key: any) => {
 const Target = target.constructor as typeof BaseModel

 options = Options.create(options, {
 isIncluded: false,
 inverse: false
 })

 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.type = 'hasOneThrough'
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.model = Is.String(model)
 ? () => ioc.safeUse(`App/Models/${model}`).constructor
 : model
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.through = Is.String(through)
 ? () => ioc.safeUse(`App/Models/${through}`).constructor
 : through
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.property = key

 debug(
 'registering hasOneThrough metadata for model %s: %o',
 Target.name,
 options
 )

 Annotation.defineHasOneThroughMeta(Target, options)
 }
}

10 changes: 10 additions & 0 deletions
src/models/builders/ModelQueryBuilder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,8 @@ import { HasManyRelation } from '#src/models/relations/HasMany/HasManyRelation'
import { NullableValueException } from '#src/exceptions/NullableValueException'
import { BelongsToRelation } from '#src/models/relations/BelongsTo/BelongsToRelation'
import { BelongsToManyRelation } from '#src/models/relations/BelongsToMany/BelongsToManyRelation'
import { HasOneThroughRelation } from '#src/models/relations/HasOneThrough/HasOneThroughRelation'
import { HasManyThroughRelation } from '#src/models/relations/HasManyThrough/HasManyThroughRelation'

export class ModelQueryBuilder<
 M extends BaseModel = any,
Expand DownExpand Up@@ -615,6 +617,10 @@ export class ModelQueryBuilder<
 return HasOneRelation.whereHas(this.Model, query, snapshot)
 case 'hasMany':
 return HasManyRelation.whereHas(this.Model, query, snapshot)
 case 'hasOneThrough':
 return HasOneThroughRelation.whereHas(this.Model, query, snapshot)
 case 'hasManyThrough':
 return HasManyThroughRelation.whereHas(this.Model, query, snapshot)
 case 'belongsTo':
 return BelongsToRelation.whereHas(this.Model, query, snapshot)
 case 'belongsToMany':
Expand DownExpand Up@@ -659,6 +665,10 @@ export class ModelQueryBuilder<
 return HasOneRelation.whereHas(this.Model, query, snapshot)
 case 'hasMany':
 return HasManyRelation.whereHas(this.Model, query, snapshot)
 case 'hasOneThrough':
 return HasOneThroughRelation.whereHas(this.Model, query, snapshot)
 case 'hasManyThrough':
 return HasManyThroughRelation.whereHas(this.Model, query, snapshot)
 case 'belongsTo':
 return BelongsToRelation.whereHas(this.Model, query, snapshot)
 case 'belongsToMany':
Expand Down

10 changes: 10 additions & 0 deletions
src/models/factories/ModelGenerator.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@ import type { BaseModel } from '#src/models/BaseModel'
import { ModelSchema } from '#src/models/schemas/ModelSchema'
import { HasOneRelation } from '#src/models/relations/HasOne/HasOneRelation'
import { HasManyRelation } from '#src/models/relations/HasMany/HasManyRelation'
import { HasOneThroughRelation } from '#src/models/relations/HasOneThrough/HasOneThroughRelation'
import { HasManyThroughRelation } from '#src/models/relations/HasManyThrough/HasManyThroughRelation'
import { BelongsToRelation } from '#src/models/relations/BelongsTo/BelongsToRelation'
import { BelongsToManyRelation } from '#src/models/relations/BelongsToMany/BelongsToManyRelation'

Expand DownExpand Up@@ -105,6 +107,10 @@ export class ModelGenerator<M extends BaseModel = any> extends Macroable {
 return HasOneRelation.load(model, relation)
 case 'hasMany':
 return HasManyRelation.load(model, relation)
 case 'hasOneThrough':
 return HasOneThroughRelation.load(model, relation)
 case 'hasManyThrough':
 return HasManyThroughRelation.load(model, relation)
 case 'belongsTo':
 return BelongsToRelation.load(model, relation)
 case 'belongsToMany':
Expand DownExpand Up@@ -147,6 +153,10 @@ export class ModelGenerator<M extends BaseModel = any> extends Macroable {
 return HasOneRelation.loadAll(models, relation)
 case 'hasMany':
 return HasManyRelation.loadAll(models, relation)
 case 'hasOneThrough':
 return HasOneThroughRelation.loadAll(models, relation)
 case 'hasManyThrough':
 return HasManyThroughRelation.loadAll(models, relation)
 case 'belongsTo':
 return BelongsToRelation.loadAll(models, relation)
 case 'belongsToMany':
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat: add through relations#236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jlenon7
merged 2 commits into

from

May 21, 2026
 Merged


feat: add through relations
#236
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
21f9cad

feat: add through relations


jlenon7 May 21, 2026
4408a09

feat: add through relations


jlenon7 May 21, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
package-lock.json

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 1 addition & 1 deletion
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "name": "@athenna/database",
 "version": "5.54.0",
 "version": "5.55.0",
 "description": "The Athenna database handler for SQL/NoSQL.",
 "license": "MIT",
 "author": "João Lenon <lenon@athenna.io>",
Expand Down

2 changes: 2 additions & 0 deletions
src/constants/MetadataKeys.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,5 +10,7 @@
export const COLUMNS_KEY = 'database:columns:options'
export const HAS_ONE_KEY = 'database:hasOne:options'
export const HAS_MANY_KEY = 'database:hasMany:options'
export const HAS_ONE_THROUGH_KEY = 'database:hasOneThrough:options'
export const HAS_MANY_THROUGH_KEY = 'database:hasManyThrough:options'
export const BELONGS_TO_KEY = 'database:belongsTo:options'
export const BELONGS_TO_MANY_KEY = 'database:belongsToMany:options'

37 changes: 37 additions & 0 deletions
src/helpers/Annotation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,8 @@ import {
 COLUMNS_KEY,
 HAS_ONE_KEY,
 HAS_MANY_KEY,
 HAS_ONE_THROUGH_KEY,
 HAS_MANY_THROUGH_KEY,
 BELONGS_TO_KEY,
 BELONGS_TO_MANY_KEY
} from '#src/constants/MetadataKeys'
Expand All@@ -19,6 +21,8 @@ import type {
 ColumnOptions,
 HasOneOptions,
 HasManyOptions,
 HasOneThroughOptions,
 HasManyThroughOptions,
 BelongsToOptions,
 BelongsToManyOptions
} from '#src/types'
Expand All@@ -40,6 +44,8 @@ export class Annotation {
 return [
 ...this.getHasOnesMeta(target),
 ...this.getHasManyMeta(target),
 ...this.getHasOneThroughMeta(target),
 ...this.getHasManyThroughMeta(target),
 ...this.getBelongsToMeta(target),
 ...this.getBelongsToManyMeta(target)
 ]
Expand DownExpand Up@@ -69,6 +75,37 @@ export class Annotation {
 Reflect.defineMetadata(HAS_MANY_KEY, hasMany, target)
 }

 public static getHasOneThroughMeta(target: any): HasOneThroughOptions[] {
 return Reflect.getMetadata(HAS_ONE_THROUGH_KEY, target) || []
 }

 public static defineHasOneThroughMeta(
 target: any,
 options: HasOneThroughOptions
 ) {
 const hasOneThrough = Reflect.getMetadata(HAS_ONE_THROUGH_KEY, target) || []

 hasOneThrough.push(options)

 Reflect.defineMetadata(HAS_ONE_THROUGH_KEY, hasOneThrough, target)
 }

 public static getHasManyThroughMeta(target: any): HasManyThroughOptions[] {
 return Reflect.getMetadata(HAS_MANY_THROUGH_KEY, target) || []
 }

 public static defineHasManyThroughMeta(
 target: any,
 options: HasManyThroughOptions
 ) {
 const hasManyThrough =
 Reflect.getMetadata(HAS_MANY_THROUGH_KEY, target) || []

 hasManyThrough.push(options)

 Reflect.defineMetadata(HAS_MANY_THROUGH_KEY, hasManyThrough, target)
 }

 public static getBelongsToMeta(target: any): BelongsToOptions[] {
 return Reflect.getMetadata(BELONGS_TO_KEY, target) || []
 }
Expand Down

2 changes: 2 additions & 0 deletions
src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,8 @@ export * from '#src/models/schemas/ModelSchema'
export * from '#src/models/annotations/Column'
export * from '#src/models/annotations/HasOne'
export * from '#src/models/annotations/HasMany'
export * from '#src/models/annotations/HasOneThrough'
export * from '#src/models/annotations/HasManyThrough'
export * from '#src/models/annotations/BelongsTo'
export * from '#src/models/annotations/BelongsToMany'

Expand Down

66 changes: 66 additions & 0 deletions
src/models/annotations/HasManyThrough.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
/**
 * @athenna/database
 *
 * (c) João Lenon <lenon@athenna.io>
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
 */

import 'reflect-metadata'

import { debug } from '#src/debug'
import { Annotation } from '#src/helpers/Annotation'
import { Is, Options } from '@athenna/common'
import type { BaseModel } from '#src/models/BaseModel'
import type { HasManyThroughOptions } from '#src/types/relations/HasManyThroughOptions'

/**
 * Create has many through relation for model class.
 */
export function HasManyThrough<
 T extends BaseModel = any,
 R extends BaseModel = any,
 H extends BaseModel = any
>(
 model: (() => new () => R) | string,
 through: (() => new () => H) | string,
 options: Omit<
 HasManyThroughOptions<T, R, H>,
 'type' | 'model' | 'through' | 'property'
 > = {}
) {
 return (target: T, key: any) => {
 const Target = target.constructor as typeof BaseModel

 options = Options.create(options, {
 isIncluded: false,
 inverse: false
 })

 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.type = 'hasManyThrough'
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.model = Is.String(model)
 ? () => ioc.safeUse(`App/Models/${model}`).constructor
 : model
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.through = Is.String(through)
 ? () => ioc.safeUse(`App/Models/${through}`).constructor
 : through
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.property = key

 debug(
 'registering hasManyThrough metadata for model %s: %o',
 Target.name,
 options
 )

 Annotation.defineHasManyThroughMeta(Target, options)
 }
}

66 changes: 66 additions & 0 deletions
src/models/annotations/HasOneThrough.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
/**
 * @athenna/database
 *
 * (c) João Lenon <lenon@athenna.io>
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
 */

import 'reflect-metadata'

import { debug } from '#src/debug'
import { Annotation } from '#src/helpers/Annotation'
import { Is, Options } from '@athenna/common'
import type { BaseModel } from '#src/models/BaseModel'
import type { HasOneThroughOptions } from '#src/types/relations/HasOneThroughOptions'

/**
 * Create has one through relation for model class.
 */
export function HasOneThrough<
 T extends BaseModel = any,
 R extends BaseModel = any,
 H extends BaseModel = any
>(
 model: (() => new () => R) | string,
 through: (() => new () => H) | string,
 options: Omit<
 HasOneThroughOptions<T, R, H>,
 'type' | 'model' | 'through' | 'property'
 > = {}
) {
 return (target: T, key: any) => {
 const Target = target.constructor as typeof BaseModel

 options = Options.create(options, {
 isIncluded: false,
 inverse: false
 })

 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.type = 'hasOneThrough'
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.model = Is.String(model)
 ? () => ioc.safeUse(`App/Models/${model}`).constructor
 : model
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.through = Is.String(through)
 ? () => ioc.safeUse(`App/Models/${through}`).constructor
 : through
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.property = key

 debug(
 'registering hasOneThrough metadata for model %s: %o',
 Target.name,
 options
 )

 Annotation.defineHasOneThroughMeta(Target, options)
 }
}

10 changes: 10 additions & 0 deletions
src/models/builders/ModelQueryBuilder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,8 @@ import { HasManyRelation } from '#src/models/relations/HasMany/HasManyRelation'
import { NullableValueException } from '#src/exceptions/NullableValueException'
import { BelongsToRelation } from '#src/models/relations/BelongsTo/BelongsToRelation'
import { BelongsToManyRelation } from '#src/models/relations/BelongsToMany/BelongsToManyRelation'
import { HasOneThroughRelation } from '#src/models/relations/HasOneThrough/HasOneThroughRelation'
import { HasManyThroughRelation } from '#src/models/relations/HasManyThrough/HasManyThroughRelation'

export class ModelQueryBuilder<
 M extends BaseModel = any,
Expand DownExpand Up@@ -615,6 +617,10 @@ export class ModelQueryBuilder<
 return HasOneRelation.whereHas(this.Model, query, snapshot)
 case 'hasMany':
 return HasManyRelation.whereHas(this.Model, query, snapshot)
 case 'hasOneThrough':
 return HasOneThroughRelation.whereHas(this.Model, query, snapshot)
 case 'hasManyThrough':
 return HasManyThroughRelation.whereHas(this.Model, query, snapshot)
 case 'belongsTo':
 return BelongsToRelation.whereHas(this.Model, query, snapshot)
 case 'belongsToMany':
Expand DownExpand Up@@ -659,6 +665,10 @@ export class ModelQueryBuilder<
 return HasOneRelation.whereHas(this.Model, query, snapshot)
 case 'hasMany':
 return HasManyRelation.whereHas(this.Model, query, snapshot)
 case 'hasOneThrough':
 return HasOneThroughRelation.whereHas(this.Model, query, snapshot)
 case 'hasManyThrough':
 return HasManyThroughRelation.whereHas(this.Model, query, snapshot)
 case 'belongsTo':
 return BelongsToRelation.whereHas(this.Model, query, snapshot)
 case 'belongsToMany':
Expand Down

10 changes: 10 additions & 0 deletions
src/models/factories/ModelGenerator.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@ import type { BaseModel } from '#src/models/BaseModel'
import { ModelSchema } from '#src/models/schemas/ModelSchema'
import { HasOneRelation } from '#src/models/relations/HasOne/HasOneRelation'
import { HasManyRelation } from '#src/models/relations/HasMany/HasManyRelation'
import { HasOneThroughRelation } from '#src/models/relations/HasOneThrough/HasOneThroughRelation'
import { HasManyThroughRelation } from '#src/models/relations/HasManyThrough/HasManyThroughRelation'
import { BelongsToRelation } from '#src/models/relations/BelongsTo/BelongsToRelation'
import { BelongsToManyRelation } from '#src/models/relations/BelongsToMany/BelongsToManyRelation'

Expand DownExpand Up@@ -105,6 +107,10 @@ export class ModelGenerator<M extends BaseModel = any> extends Macroable {
 return HasOneRelation.load(model, relation)
 case 'hasMany':
 return HasManyRelation.load(model, relation)
 case 'hasOneThrough':
 return HasOneThroughRelation.load(model, relation)
 case 'hasManyThrough':
 return HasManyThroughRelation.load(model, relation)
 case 'belongsTo':
 return BelongsToRelation.load(model, relation)
 case 'belongsToMany':
Expand DownExpand Up@@ -147,6 +153,10 @@ export class ModelGenerator<M extends BaseModel = any> extends Macroable {
 return HasOneRelation.loadAll(models, relation)
 case 'hasMany':
 return HasManyRelation.loadAll(models, relation)
 case 'hasOneThrough':
 return HasOneThroughRelation.loadAll(models, relation)
 case 'hasManyThrough':
 return HasManyThroughRelation.loadAll(models, relation)
 case 'belongsTo':
 return BelongsToRelation.loadAll(models, relation)
 case 'belongsToMany':
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
feat: add through relations#236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jlenon7
merged 2 commits into

from

May 21, 2026
 Merged


feat: add through relations
#236
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
21f9cad

feat: add through relations


jlenon7 May 21, 2026
4408a09

feat: add through relations


jlenon7 May 21, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
package-lock.json

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 1 addition & 1 deletion
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "name": "@athenna/database",
 "version": "5.54.0",
 "version": "5.55.0",
 "description": "The Athenna database handler for SQL/NoSQL.",
 "license": "MIT",
 "author": "João Lenon <lenon@athenna.io>",
Expand Down

2 changes: 2 additions & 0 deletions
src/constants/MetadataKeys.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,5 +10,7 @@
export const COLUMNS_KEY = 'database:columns:options'
export const HAS_ONE_KEY = 'database:hasOne:options'
export const HAS_MANY_KEY = 'database:hasMany:options'
export const HAS_ONE_THROUGH_KEY = 'database:hasOneThrough:options'
export const HAS_MANY_THROUGH_KEY = 'database:hasManyThrough:options'
export const BELONGS_TO_KEY = 'database:belongsTo:options'
export const BELONGS_TO_MANY_KEY = 'database:belongsToMany:options'

37 changes: 37 additions & 0 deletions
src/helpers/Annotation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,8 @@ import {
 COLUMNS_KEY,
 HAS_ONE_KEY,
 HAS_MANY_KEY,
 HAS_ONE_THROUGH_KEY,
 HAS_MANY_THROUGH_KEY,
 BELONGS_TO_KEY,
 BELONGS_TO_MANY_KEY
} from '#src/constants/MetadataKeys'
Expand All@@ -19,6 +21,8 @@ import type {
 ColumnOptions,
 HasOneOptions,
 HasManyOptions,
 HasOneThroughOptions,
 HasManyThroughOptions,
 BelongsToOptions,
 BelongsToManyOptions
} from '#src/types'
Expand All@@ -40,6 +44,8 @@ export class Annotation {
 return [
 ...this.getHasOnesMeta(target),
 ...this.getHasManyMeta(target),
 ...this.getHasOneThroughMeta(target),
 ...this.getHasManyThroughMeta(target),
 ...this.getBelongsToMeta(target),
 ...this.getBelongsToManyMeta(target)
 ]
Expand DownExpand Up@@ -69,6 +75,37 @@ export class Annotation {
 Reflect.defineMetadata(HAS_MANY_KEY, hasMany, target)
 }

 public static getHasOneThroughMeta(target: any): HasOneThroughOptions[] {
 return Reflect.getMetadata(HAS_ONE_THROUGH_KEY, target) || []
 }

 public static defineHasOneThroughMeta(
 target: any,
 options: HasOneThroughOptions
 ) {
 const hasOneThrough = Reflect.getMetadata(HAS_ONE_THROUGH_KEY, target) || []

 hasOneThrough.push(options)

 Reflect.defineMetadata(HAS_ONE_THROUGH_KEY, hasOneThrough, target)
 }

 public static getHasManyThroughMeta(target: any): HasManyThroughOptions[] {
 return Reflect.getMetadata(HAS_MANY_THROUGH_KEY, target) || []
 }

 public static defineHasManyThroughMeta(
 target: any,
 options: HasManyThroughOptions
 ) {
 const hasManyThrough =
 Reflect.getMetadata(HAS_MANY_THROUGH_KEY, target) || []

 hasManyThrough.push(options)

 Reflect.defineMetadata(HAS_MANY_THROUGH_KEY, hasManyThrough, target)
 }

 public static getBelongsToMeta(target: any): BelongsToOptions[] {
 return Reflect.getMetadata(BELONGS_TO_KEY, target) || []
 }
Expand Down

2 changes: 2 additions & 0 deletions
src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,8 @@ export * from '#src/models/schemas/ModelSchema'
export * from '#src/models/annotations/Column'
export * from '#src/models/annotations/HasOne'
export * from '#src/models/annotations/HasMany'
export * from '#src/models/annotations/HasOneThrough'
export * from '#src/models/annotations/HasManyThrough'
export * from '#src/models/annotations/BelongsTo'
export * from '#src/models/annotations/BelongsToMany'

Expand Down

66 changes: 66 additions & 0 deletions
src/models/annotations/HasManyThrough.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
/**
 * @athenna/database
 *
 * (c) João Lenon <lenon@athenna.io>
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
 */

import 'reflect-metadata'

import { debug } from '#src/debug'
import { Annotation } from '#src/helpers/Annotation'
import { Is, Options } from '@athenna/common'
import type { BaseModel } from '#src/models/BaseModel'
import type { HasManyThroughOptions } from '#src/types/relations/HasManyThroughOptions'

/**
 * Create has many through relation for model class.
 */
export function HasManyThrough<
 T extends BaseModel = any,
 R extends BaseModel = any,
 H extends BaseModel = any
>(
 model: (() => new () => R) | string,
 through: (() => new () => H) | string,
 options: Omit<
 HasManyThroughOptions<T, R, H>,
 'type' | 'model' | 'through' | 'property'
 > = {}
) {
 return (target: T, key: any) => {
 const Target = target.constructor as typeof BaseModel

 options = Options.create(options, {
 isIncluded: false,
 inverse: false
 })

 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.type = 'hasManyThrough'
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.model = Is.String(model)
 ? () => ioc.safeUse(`App/Models/${model}`).constructor
 : model
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.through = Is.String(through)
 ? () => ioc.safeUse(`App/Models/${through}`).constructor
 : through
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.property = key

 debug(
 'registering hasManyThrough metadata for model %s: %o',
 Target.name,
 options
 )

 Annotation.defineHasManyThroughMeta(Target, options)
 }
}

66 changes: 66 additions & 0 deletions
src/models/annotations/HasOneThrough.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
/**
 * @athenna/database
 *
 * (c) João Lenon <lenon@athenna.io>
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
 */

import 'reflect-metadata'

import { debug } from '#src/debug'
import { Annotation } from '#src/helpers/Annotation'
import { Is, Options } from '@athenna/common'
import type { BaseModel } from '#src/models/BaseModel'
import type { HasOneThroughOptions } from '#src/types/relations/HasOneThroughOptions'

/**
 * Create has one through relation for model class.
 */
export function HasOneThrough<
 T extends BaseModel = any,
 R extends BaseModel = any,
 H extends BaseModel = any
>(
 model: (() => new () => R) | string,
 through: (() => new () => H) | string,
 options: Omit<
 HasOneThroughOptions<T, R, H>,
 'type' | 'model' | 'through' | 'property'
 > = {}
) {
 return (target: T, key: any) => {
 const Target = target.constructor as typeof BaseModel

 options = Options.create(options, {
 isIncluded: false,
 inverse: false
 })

 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.type = 'hasOneThrough'
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.model = Is.String(model)
 ? () => ioc.safeUse(`App/Models/${model}`).constructor
 : model
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.through = Is.String(through)
 ? () => ioc.safeUse(`App/Models/${through}`).constructor
 : through
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 options.property = key

 debug(
 'registering hasOneThrough metadata for model %s: %o',
 Target.name,
 options
 )

 Annotation.defineHasOneThroughMeta(Target, options)
 }
}

10 changes: 10 additions & 0 deletions
src/models/builders/ModelQueryBuilder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,8 @@ import { HasManyRelation } from '#src/models/relations/HasMany/HasManyRelation'
import { NullableValueException } from '#src/exceptions/NullableValueException'
import { BelongsToRelation } from '#src/models/relations/BelongsTo/BelongsToRelation'
import { BelongsToManyRelation } from '#src/models/relations/BelongsToMany/BelongsToManyRelation'
import { HasOneThroughRelation } from '#src/models/relations/HasOneThrough/HasOneThroughRelation'
import { HasManyThroughRelation } from '#src/models/relations/HasManyThrough/HasManyThroughRelation'

export class ModelQueryBuilder<
 M extends BaseModel = any,
Expand DownExpand Up@@ -615,6 +617,10 @@ export class ModelQueryBuilder<
 return HasOneRelation.whereHas(this.Model, query, snapshot)
 case 'hasMany':
 return HasManyRelation.whereHas(this.Model, query, snapshot)
 case 'hasOneThrough':
 return HasOneThroughRelation.whereHas(this.Model, query, snapshot)
 case 'hasManyThrough':
 return HasManyThroughRelation.whereHas(this.Model, query, snapshot)
 case 'belongsTo':
 return BelongsToRelation.whereHas(this.Model, query, snapshot)
 case 'belongsToMany':
Expand DownExpand Up@@ -659,6 +665,10 @@ export class ModelQueryBuilder<
 return HasOneRelation.whereHas(this.Model, query, snapshot)
 case 'hasMany':
 return HasManyRelation.whereHas(this.Model, query, snapshot)
 case 'hasOneThrough':
 return HasOneThroughRelation.whereHas(this.Model, query, snapshot)
 case 'hasManyThrough':
 return HasManyThroughRelation.whereHas(this.Model, query, snapshot)
 case 'belongsTo':
 return BelongsToRelation.whereHas(this.Model, query, snapshot)
 case 'belongsToMany':
Expand Down

10 changes: 10 additions & 0 deletions
src/models/factories/ModelGenerator.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@ import type { BaseModel } from '#src/models/BaseModel'
import { ModelSchema } from '#src/models/schemas/ModelSchema'
import { HasOneRelation } from '#src/models/relations/HasOne/HasOneRelation'
import { HasManyRelation } from '#src/models/relations/HasMany/HasManyRelation'
import { HasOneThroughRelation } from '#src/models/relations/HasOneThrough/HasOneThroughRelation'
import { HasManyThroughRelation } from '#src/models/relations/HasManyThrough/HasManyThroughRelation'
import { BelongsToRelation } from '#src/models/relations/BelongsTo/BelongsToRelation'
import { BelongsToManyRelation } from '#src/models/relations/BelongsToMany/BelongsToManyRelation'

Expand DownExpand Up@@ -105,6 +107,10 @@ export class ModelGenerator<M extends BaseModel = any> extends Macroable {
 return HasOneRelation.load(model, relation)
 case 'hasMany':
 return HasManyRelation.load(model, relation)
 case 'hasOneThrough':
 return HasOneThroughRelation.load(model, relation)
 case 'hasManyThrough':
 return HasManyThroughRelation.load(model, relation)
 case 'belongsTo':
 return BelongsToRelation.load(model, relation)
 case 'belongsToMany':
Expand DownExpand Up@@ -147,6 +153,10 @@ export class ModelGenerator<M extends BaseModel = any> extends Macroable {
 return HasOneRelation.loadAll(models, relation)
 case 'hasMany':
 return HasManyRelation.loadAll(models, relation)
 case 'hasOneThrough':
 return HasOneThroughRelation.loadAll(models, relation)
 case 'hasManyThrough':
 return HasManyThroughRelation.loadAll(models, relation)
 case 'belongsTo':
 return BelongsToRelation.loadAll(models, relation)
 case 'belongsToMany':
Expand Down
Loading
Loading