Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file modified .yarn/install-state.gz
Binary file not shown.
11 changes: 6 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@
"files": [
"dist"
],
"type": "module",
"scripts": {
"help": "node scripts/help.js",
"build": "tsc --project tsconfig.json",
"migration:generate": "node --env-file=../.env.development ./node_modules/typeorm/cli-ts-node-commonjs.js -d src/datasource.ts migration:generate",
"migration:run": "node --env-file=../.env.development ./node_modules/typeorm/cli-ts-node-commonjs.js -d src/datasource.ts migration:run",
"migration:revert": "node --env-file=../.env.development ./node_modules/typeorm/cli-ts-node-commonjs.js -d src/datasource.ts migration:revert",
"migration:show": "node --env-file=../.env.development ./node_modules/typeorm/cli-ts-node-commonjs.js -d src/datasource.ts migration:show",
"migration:generate": "node --env-file=../.env.development --import tsx ./node_modules/typeorm/cli.js -d src/datasource.ts migration:generate",
"migration:run": "node --env-file=../.env.development --import tsx ./node_modules/typeorm/cli.js -d src/datasource.ts migration:run",
"migration:revert": "node --env-file=../.env.development --import tsx ./node_modules/typeorm/cli.js -d src/datasource.ts migration:revert",
"migration:show": "node --env-file=../.env.development --import tsx ./node_modules/typeorm/cli.js -d src/datasource.ts migration:show",
"seed:run": "node --env-file=../.env.development ./node_modules/typeorm-extension/bin/cli.cjs seed:run -d dist/datasource.js"
},
"scriptsInfo": {
Expand All @@ -33,7 +34,7 @@
"devDependencies": {
"@types/node": "^25.6.0",
"pg": "^8.13.3",
"ts-node": "^10.9.2",
"tsx": "^4.23.12",
"typescript": "^5.9.3"
},
"peerDependencies": {
Expand Down
10 changes: 3 additions & 7 deletions scripts/help.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
const {
name,
version,
description,
scripts,
scriptsInfo,
} = require("../package.json");
import pkg from "../package.json" with { type: "json" };

const { name, version, description, scripts, scriptsInfo } = pkg;

const c = {
cyan: "\x1b[36m",
Expand Down
22 changes: 11 additions & 11 deletions src/datasource.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ import "reflect-metadata";
import type { DataSourceOptions } from "typeorm";
import { DataSource } from "typeorm";
import type { SeederOptions } from "typeorm-extension";
import { APIUser } from "./entities/APIUser.entity";
import { Guild } from "./entities/Guild.entity";
import { GuildReactionRoles } from "./entities/GuildReactionRoles.entity";
import { GuildSettings } from "./entities/GuildSettings.entity";
import { Tickets } from "./entities/Tickets.entity";
import { TicketType } from "./entities/TicketType.entity";
import { User } from "./entities/User.entity";
import { UserSettings } from "./entities/UserSettings.entity";
import { NamingStrategy } from "./naming-strategy";
import { APIUser } from "./entities/APIUser.entity.js";
import { Guild } from "./entities/Guild.entity.js";
import { GuildReactionRoles } from "./entities/GuildReactionRoles.entity.js";
import { GuildSettings } from "./entities/GuildSettings.entity.js";
import { Tickets } from "./entities/Tickets.entity.js";
import { TicketType } from "./entities/TicketType.entity.js";
import { User } from "./entities/User.entity.js";
import { UserSettings } from "./entities/UserSettings.entity.js";
import { NamingStrategy } from "./naming-strategy.js";

const isProduction = process.env.NODE_ENV === "production";

Expand All @@ -35,8 +35,8 @@ const options: DataSourceOptions & SeederOptions = {
UserSettings,
APIUser,
],
migrations: [`${__dirname}/migrations/*{.ts,.js}`],
seeds: [`${__dirname}/seeds/MainSeeder{.ts,.js}`],
migrations: [`${import.meta.dirname}/migrations/*{.ts,.js}`],
seeds: [`${import.meta.dirname}/seeds/MainSeeder{.ts,.js}`],
};

export const AppDataSource = new DataSource(options);
6 changes: 3 additions & 3 deletions src/entities/APIUser.entity.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Column, Entity, Index, JoinColumn, OneToOne, Unique } from "typeorm";
import { BaseUUIDEntity } from "./base/BaseUUIDEntity";
import { UseMixins, WithUserScope } from "./base/mixins";
import type { User } from "./User.entity";
import { BaseUUIDEntity } from "./base/BaseUUIDEntity.js";
import { UseMixins, WithUserScope } from "./base/mixins/index.js";
import type { User } from "./User.entity.js";

@Unique("uq_api_users_user_id", ["userId"])
@Index("idx_api_users_user_id", ["userId"])
Expand Down
8 changes: 4 additions & 4 deletions src/entities/Guild.entity.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Column, Entity, Index, OneToMany, OneToOne } from "typeorm";
import { BaseSnowflakeEntity } from "./base/BaseSnowflakeEntity";
import type { GuildReactionRoles } from "./GuildReactionRoles.entity";
import type { GuildSettings } from "./GuildSettings.entity";
import type { Tickets } from "./Tickets.entity";
import { BaseSnowflakeEntity } from "./base/BaseSnowflakeEntity.js";
import type { GuildReactionRoles } from "./GuildReactionRoles.entity.js";
import type { GuildSettings } from "./GuildSettings.entity.js";
import type { Tickets } from "./Tickets.entity.js";

@Index("idx_guilds_created_at", ["createdAt"])
@Entity("guilds")
Expand Down
6 changes: 3 additions & 3 deletions src/entities/GuildReactionRoles.entity.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Column, Entity, Index, JoinColumn, ManyToOne, Unique } from "typeorm";
import { BaseUUIDEntity } from "./base/BaseUUIDEntity";
import { UseMixins, WithGuildScope } from "./base/mixins";
import type { Guild } from "./Guild.entity";
import { BaseUUIDEntity } from "./base/BaseUUIDEntity.js";
import { UseMixins, WithGuildScope } from "./base/mixins/index.js";
import type { Guild } from "./Guild.entity.js";

@Unique("uq_guild_reaction_roles_composite", [
"guildId",
Expand Down
8 changes: 4 additions & 4 deletions src/entities/GuildSettings.entity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import {
OneToOne,
Unique,
} from "typeorm";
import { BaseUUIDEntity } from "./base/BaseUUIDEntity";
import { UseMixins, WithGuildScope } from "./base/mixins";
import type { Guild } from "./Guild.entity";
import type { TicketType } from "./TicketType.entity";
import { BaseUUIDEntity } from "./base/BaseUUIDEntity.js";
import { UseMixins, WithGuildScope } from "./base/mixins/index.js";
import type { Guild } from "./Guild.entity.js";
import type { TicketType } from "./TicketType.entity.js";

@Unique("uq_guild_settings_guild_id", ["guildId"])
@Index("idx_guild_settings_guild_id", ["guildId"])
Expand Down
6 changes: 3 additions & 3 deletions src/entities/TicketType.entity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import {
OneToMany,
Unique,
} from "typeorm";
import { BaseUUIDEntity } from "./base/BaseUUIDEntity";
import type { GuildSettings } from "./GuildSettings.entity";
import type { Tickets } from "./Tickets.entity";
import { BaseUUIDEntity } from "./base/BaseUUIDEntity.js";
import type { GuildSettings } from "./GuildSettings.entity.js";
import type { Tickets } from "./Tickets.entity.js";

@Unique("uq_ticket_types_name", ["name"])
@Index("idx_ticket_types_guild_settings_id", ["guildSettingsId"])
Expand Down
8 changes: 4 additions & 4 deletions src/entities/Tickets.entity.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
import { BaseUUIDEntity } from "./base/BaseUUIDEntity";
import type { Guild } from "./Guild.entity";
import type { TicketType } from "./TicketType.entity";
import type { User } from "./User.entity";
import { BaseUUIDEntity } from "./base/BaseUUIDEntity.js";
import type { Guild } from "./Guild.entity.js";
import type { TicketType } from "./TicketType.entity.js";
import type { User } from "./User.entity.js";

export enum GuildTicketsStatus {
OPEN = "OPEN",
Expand Down
8 changes: 4 additions & 4 deletions src/entities/User.entity.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Column, Entity, Index, OneToMany, OneToOne } from "typeorm";
import type { APIUser } from "./APIUser.entity";
import { BaseSnowflakeEntity } from "./base/BaseSnowflakeEntity";
import type { Tickets } from "./Tickets.entity";
import type { UserSettings } from "./UserSettings.entity";
import type { APIUser } from "./APIUser.entity.js";
import { BaseSnowflakeEntity } from "./base/BaseSnowflakeEntity.js";
import type { Tickets } from "./Tickets.entity.js";
import type { UserSettings } from "./UserSettings.entity.js";

@Index("idx_users_created_at", ["createdAt"])
@Entity("users")
Expand Down
6 changes: 3 additions & 3 deletions src/entities/UserSettings.entity.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Column, Entity, Index, JoinColumn, OneToOne, Unique } from "typeorm";
import { BaseUUIDEntity } from "./base/BaseUUIDEntity";
import { UseMixins, WithUserScope } from "./base/mixins";
import type { User } from "./User.entity";
import { BaseUUIDEntity } from "./base/BaseUUIDEntity.js";
import { UseMixins, WithUserScope } from "./base/mixins/index.js";
import type { User } from "./User.entity.js";

@Unique("uq_user_settings_user_id", ["userId"])
@Index("idx_user_settings_user_id", ["userId"])
Expand Down
2 changes: 1 addition & 1 deletion src/entities/base/BaseSnowflakeEntity.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { PrimaryColumn } from "typeorm";
import { UseMixins, WithTimestamps } from "./mixins";
import { UseMixins, WithTimestamps } from "./mixins/index.js";

export abstract class BaseSnowflakeEntity extends UseMixins([WithTimestamps]) {
@PrimaryColumn({ name: "id", type: "varchar" })
Expand Down
2 changes: 1 addition & 1 deletion src/entities/base/BaseUUIDEntity.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { PrimaryGeneratedColumn } from "typeorm";
import { UseMixins, WithTimestamps } from "./mixins";
import { UseMixins, WithTimestamps } from "./mixins/index.js";

export abstract class BaseUUIDEntity extends UseMixins([WithTimestamps]) {
@PrimaryGeneratedColumn("uuid", { name: "id" })
Expand Down
2 changes: 1 addition & 1 deletion src/entities/base/mixins/UseMixins.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// biome-ignore-all lint/suspicious/noExplicitAny: mixin pattern requires any to compose arbitrary constructors
import type { AbstractConstructor, ExtractAdded } from "./types";
import type { AbstractConstructor, ExtractAdded } from "./types.js";

abstract class BaseEmptyClass {}

Expand Down
2 changes: 1 addition & 1 deletion src/entities/base/mixins/WithExpiresAt.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/** biome-ignore-all lint/suspicious/noExplicitAny: Necessary for Mixins */
import { Column, Index } from "typeorm";
import type { AbstractConstructor, MixinReturn } from "./types";
import type { AbstractConstructor, MixinReturn } from "./types.js";

export function WithExpiresAt<TBase extends AbstractConstructor>(
Base: TBase,
Expand Down
2 changes: 1 addition & 1 deletion src/entities/base/mixins/WithGuildScope.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/** biome-ignore-all lint/suspicious/noExplicitAny: Necessary for Mixins */
import { Column } from "typeorm";
import type { AbstractConstructor, MixinReturn } from "./types";
import type { AbstractConstructor, MixinReturn } from "./types.js";

export function WithGuildScope<TBase extends AbstractConstructor>(
Base: TBase,
Expand Down
2 changes: 1 addition & 1 deletion src/entities/base/mixins/WithSoftDelete.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/** biome-ignore-all lint/suspicious/noExplicitAny: Necessary for Mixins */
import { DeleteDateColumn } from "typeorm";
import type { AbstractConstructor, MixinReturn } from "./types";
import type { AbstractConstructor, MixinReturn } from "./types.js";

export function WithSoftDelete<TBase extends AbstractConstructor>(
Base: TBase,
Expand Down
2 changes: 1 addition & 1 deletion src/entities/base/mixins/WithTimestamps.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/** biome-ignore-all lint/suspicious/noExplicitAny: Necessary for Mixins */
import { CreateDateColumn, UpdateDateColumn } from "typeorm";
import type { AbstractConstructor, MixinReturn } from "./types";
import type { AbstractConstructor, MixinReturn } from "./types.js";

export function WithTimestamps<TBase extends AbstractConstructor>(
Base: TBase,
Expand Down
2 changes: 1 addition & 1 deletion src/entities/base/mixins/WithUserScope.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/** biome-ignore-all lint/suspicious/noExplicitAny: Necessary for Mixins */
import { Column } from "typeorm";
import type { AbstractConstructor, MixinReturn } from "./types";
import type { AbstractConstructor, MixinReturn } from "./types.js";

export function WithUserScope<TBase extends AbstractConstructor>(
Base: TBase,
Expand Down
2 changes: 1 addition & 1 deletion src/entities/base/mixins/WithVersion.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/** biome-ignore-all lint/suspicious/noExplicitAny: Necessary for Mixins */
import { VersionColumn } from "typeorm";
import type { AbstractConstructor, MixinReturn } from "./types";
import type { AbstractConstructor, MixinReturn } from "./types.js";

export function WithVersion<TBase extends AbstractConstructor>(
Base: TBase,
Expand Down
16 changes: 8 additions & 8 deletions src/entities/base/mixins/index.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
export type { AbstractConstructor, Mixin } from "./types";
export { UseMixins } from "./UseMixins";
export { WithExpiresAt } from "./WithExpiresAt";
export { WithGuildScope } from "./WithGuildScope";
export { WithSoftDelete } from "./WithSoftDelete";
export { WithTimestamps } from "./WithTimestamps";
export { WithUserScope } from "./WithUserScope";
export { WithVersion } from "./WithVersion";
export type { AbstractConstructor, Mixin } from "./types.js";
export { UseMixins } from "./UseMixins.js";
export { WithExpiresAt } from "./WithExpiresAt.js";
export { WithGuildScope } from "./WithGuildScope.js";
export { WithSoftDelete } from "./WithSoftDelete.js";
export { WithTimestamps } from "./WithTimestamps.js";
export { WithUserScope } from "./WithUserScope.js";
export { WithVersion } from "./WithVersion.js";
16 changes: 8 additions & 8 deletions src/entities/index.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
export { APIUser } from "./APIUser.entity";
export { Guild } from "./Guild.entity";
export { GuildReactionRoles } from "./GuildReactionRoles.entity";
export { GuildSettings } from "./GuildSettings.entity";
export { GuildTicketsStatus, Tickets } from "./Tickets.entity";
export { TicketType } from "./TicketType.entity";
export { User } from "./User.entity";
export { UserSettings } from "./UserSettings.entity";
export { APIUser } from "./APIUser.entity.js";
export { Guild } from "./Guild.entity.js";
export { GuildReactionRoles } from "./GuildReactionRoles.entity.js";
export { GuildSettings } from "./GuildSettings.entity.js";
export { GuildTicketsStatus, Tickets } from "./Tickets.entity.js";
export { TicketType } from "./TicketType.entity.js";
export { User } from "./User.entity.js";
export { UserSettings } from "./UserSettings.entity.js";
12 changes: 6 additions & 6 deletions src/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
export { AppDataSource } from "./datasource";
export * from "./entities";
export { BaseSnowflakeEntity } from "./entities/base/BaseSnowflakeEntity";
export { BaseUUIDEntity } from "./entities/base/BaseUUIDEntity";
export { AppDataSource } from "./datasource.js";
export { BaseSnowflakeEntity } from "./entities/base/BaseSnowflakeEntity.js";
export { BaseUUIDEntity } from "./entities/base/BaseUUIDEntity.js";
export {
UseMixins,
WithExpiresAt,
Expand All @@ -10,5 +9,6 @@ export {
WithTimestamps,
WithUserScope,
WithVersion,
} from "./entities/base/mixins";
export { NamingStrategy } from "./naming-strategy";
} from "./entities/base/mixins/index.js";
export * from "./entities/index.js";
export { NamingStrategy } from "./naming-strategy.js";
3 changes: 2 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"compilerOptions": {
"target": "ES2022",
"module": "CommonJS",
"module": "nodenext",
"moduleResolution": "nodenext",
"lib": ["ES2022"],
"outDir": "./dist",
"rootDir": "./src",
Expand Down
Loading