update to newest deepkit version and fixed various issues

package.json

@@ -27,11 +27,11 @@
 	},
 	"homepage": "https://github.com/trianglecurling/thebroomstack#readme",
 	"dependencies": {
-		"@deepkit/app": "^1.0.1-alpha.44",
-		"@deepkit/framework": "^1.0.1-alpha.44",
-		"@deepkit/orm": "^1.0.1-alpha.44",
-		"@deepkit/orm-browser": "^1.0.1-alpha.44",
-		"@deepkit/sqlite": "^1.0.1-alpha.44",
+		"@deepkit/app": "^1.0.1-alpha.71",
+		"@deepkit/framework": "^1.0.1-alpha.71",
+		"@deepkit/orm": "^1.0.1-alpha.71",
+		"@deepkit/orm-browser": "^1.0.1-alpha.71",
+		"@deepkit/sqlite": "^1.0.1-alpha.71",
 		"@fluentui/react": "^8.20.0",
 		"@reach/router": "^1.3.4",
 		"@types/pluralize": "^0.0.29",
@@ -50,6 +50,7 @@
 		"webpack-hot-middleware": "^2.25.0"
 	},
 	"devDependencies": {
+		"@deepkit/type-compiler": "^1.0.1-alpha.71",
 		"@pmmmwh/react-refresh-webpack-plugin": "^0.4.3",
 		"@types/connect": "^3.4.34",
 		"@types/ejs": "^3.0.6",

src/app.ts

@@ -1,14 +1,13 @@
 require("dotenv").config();
-import "reflect-metadata";
-import { Application, KernelModule } from "@deepkit/framework";
+import { App } from "@deepkit/app";
+import { FrameworkModule } from "@deepkit/framework";
 import { AppConfig } from "./appConfig";
 import { TheBroomstackDatabase } from "./dataModel/database";
-import { CrudModule } from "./modules/crud";
-import { MetaModule } from "./modules/meta";
-import { FrontendModule } from "./modules/frontend";
+import { CrudModule } from "./modules/CrudModule";
+import { MetaModule } from "./modules/MetaModule";
+import { FrontendModule } from "./modules/FrontendModule";
 import path from "path";
 import { http } from "@deepkit/http";
-
 import * as Util from "./util";
 
 Object.values(Util.httpStatusCodes);
@@ -21,19 +20,19 @@ class AppController {
 	}
 }
 
-Application.create({
+new App({
 	config: AppConfig,
 	controllers: [AppController],
 	imports: [
-		KernelModule.configure({
+		new FrameworkModule({
 			migrateOnStartup: true,
 			debug: true,
 		}),
-		CrudModule,
-		MetaModule,
-		FrontendModule.forRoot(),
+		new CrudModule,
+		new MetaModule,
+		new FrontendModule(),
 	],
 	providers: [TheBroomstackDatabase],
 })
-	.loadConfigFromEnvFile(path.resolve(__dirname, "..", ".env"))
+	.loadConfigFromEnv({envFilePath: path.resolve(__dirname, "..", ".env")})
 	.run();

src/appConfig.ts

@@ -1,6 +1,3 @@
-import { AppModuleConfig } from "@deepkit/app";
-import { t } from "@deepkit/type";
-
-export const AppConfig = new AppModuleConfig({
-	dbPath: t.string.default("./database.sqlite"),
-});
+export class AppConfig {
+	dbPath: string = './database.sqlite';
+}

src/client/scripts/api/pageContext.ts

@@ -1,4 +1,4 @@
-import { IPageContext } from "../../../../@types/app/shared";
+import { IPageContext } from "../../../types/shared";
 
 export async function getPageContext(): Promise<IPageContext> {
 	const result = await fetch(window.location.href, { headers: { Accept: "application/json" } });

src/client/scripts/common/PageContext.tsx

@@ -1,9 +1,8 @@
 import { globalHistory } from "@reach/router";
 import React, { createContext, useContext, useEffect } from "react";
-import { IPageContext } from "../../../../@types/app/shared";
-import { useForceUpdate } from "../hooks/useForceUpdate";
 import { useQuery, useQueryClient } from "react-query";
 import { getPageContext } from "../api/pageContext";
+import { IPageContext } from "../../../types/shared";
 
 declare global {
 	interface Window {

src/client/scripts/crud/CrudAssociations.tsx

@@ -1,8 +1,8 @@
 import { DetailsList, mergeStyles, SelectionMode } from "@fluentui/react";
 import { useMemo } from "react";
-import { EntityData, PluralizationMap } from "../../../../@types/app/shared";
 import { Link } from "../common/Link";
 import { usePageData } from "../hooks/usePageData";
+import { EntityData, PluralizationMap } from "../../../types/shared";
 
 export const CrudAssociations: React.FC<{}> = () => {
     const entity = usePageData<EntityData>("entity");

src/client/scripts/crud/CrudIndex.tsx

@@ -1,9 +1,8 @@
-import { Router } from "@reach/router";
 import { RouteComponentProps } from "@reach/router";
-import { EntityData, PluralizationMap } from "../../../../@types/app/shared";
 import { usePageData } from "../hooks/usePageData";
 import { CrudAssociations } from "./CrudAssociations";
 import { CrudList } from "./CrudList";
+import { EntityData, PluralizationMap } from "../../../types/shared";
 
 export const CrudIndex: React.FC<RouteComponentProps> = () => {
 	const entity = usePageData<EntityData>("entity");

src/client/scripts/crud/CrudList.tsx

@@ -1,7 +1,7 @@
 import { DetailsList, DetailsListLayoutMode, IColumn, SelectionMode } from "@fluentui/react";
-import { EntityData, PluralizationMap } from "../../../../@types/app/shared";
 import { usePageData } from "../hooks/usePageData";
 import { Link } from "../common/Link";
+import { EntityData, PluralizationMap } from "../../../types/shared";
 
 export const CrudList: React.FC<{}> = () => {
 	const entity = usePageData<EntityData>("entity");

src/client/scripts/crud/ModelList.tsx

@@ -1,9 +1,9 @@
-import { Entities, PluralizationMap } from "../../../../@types/app/shared";
 import { usePageData } from "../hooks/usePageData";
 import { useNavigate } from "@reach/router";
 import { Nav, INavLinkGroup, INavLink } from "@fluentui/react/lib/Nav";
 import React from "react";
 import { useCallback } from "react";
+import { Entities, PluralizationMap } from "../../../types/shared";
 
 export const ModelList: React.FC<{}> = () => {
 	const entities = usePageData<Entities>("entities");

src/dataModel/Address.ts

@@ -1,13 +1,13 @@
-import { entity, t } from "@deepkit/type";
+import { AutoIncrement, entity, PrimaryKey } from "@deepkit/type";
 import { IDataObject } from "../types/data";
 
-@(entity.name("address").collectionName("addresses"))
+@(entity.name("address").collection("addresses"))
 export class Address implements IDataObject {
-	@t.primary.autoIncrement public id: number = 0;
-	@t public created: Date = new Date();
-	@t public modified?: Date;
+	public id: number & PrimaryKey & AutoIncrement = 0;
+	public created: Date = new Date();
+	public modified?: Date;
 
-	@t public line2?: string;
+	public line2?: string;
 
-	constructor(@t public line1: string, @t public city: string, @t public state: string, @t public zip: string) {}
+	constructor(public line1: string, public city: string, public state: string, public zip: string) {}
 }

src/dataModel/Club.ts

@@ -1,16 +1,15 @@
-import { entity, t } from "@deepkit/type";
+import { AutoIncrement, BackReference, entity, PrimaryKey } from "@deepkit/type";
 import { IDataObject } from "../types/data";
 import { Player } from "./Player";
 import { PlayerClub } from "./joinerObjects/PlayerClub";
 
-@(entity.name("club").collectionName("clubs"))
+@(entity.name("club").collection("clubs"))
 export class Club implements IDataObject {
-	@t.primary.autoIncrement public id: number = 0;
-	@t public created: Date = new Date();
-	@t public modified?: Date;
+	public id: number& PrimaryKey & AutoIncrement = 0;
+	public created: Date = new Date();
+	public modified?: Date;
 
-	@(t.array(() => Player).backReference({ via: () => PlayerClub }))
-	players?: Player[];
+	players?: Player[] & BackReference<{via: PlayerClub}>;
 
-	constructor(@t public name: string) {}
+	constructor(public name: string) {}
 }

src/dataModel/Division.ts

@@ -1,14 +1,14 @@
-import { entity, t } from "@deepkit/type";
+import { AutoIncrement, entity, PrimaryKey, Reference } from "@deepkit/type";
 import { IDataObject } from "../types/data";
 import { League } from "./League";
 
-@(entity.name("division").collectionName("divisions"))
+@(entity.name("division").collection("divisions"))
 export class Division implements IDataObject {
-	@t.primary.autoIncrement public id: number = 0;
-	@t public created: Date = new Date();
-	@t public modified?: Date;
+	public id: number& PrimaryKey & AutoIncrement = 0;
+	public created: Date = new Date();
+	public modified?: Date;
 
-	@(t.type(() => League).reference()) public league?: League;
+	public league?: League & Reference;
 
-	constructor(@t public name: string) {}
+	constructor(public name: string) {}
 }

src/dataModel/Draw.ts

@@ -1,19 +1,19 @@
-import { entity, t } from "@deepkit/type";
+import { AutoIncrement, BackReference, entity, PrimaryKey, Reference } from "@deepkit/type";
 import { IDataObject } from "../types/data";
 import { League } from "./League";
 import { Match } from "./Match";
 
-@(entity.name("draw").collectionName("draws"))
+@(entity.name("draw").collection("draws"))
 export class Draw implements IDataObject {
-	@t.primary.autoIncrement public id: number = 0;
-	@t public created: Date = new Date();
-	@t public modified?: Date;
+	public id: number& PrimaryKey & AutoIncrement = 0;
+	public created: Date = new Date();
+	public modified?: Date;
 
-	@(t.type(() => League).reference()) public league?: League;
+	public league?: League & Reference;
 
-	@(t.array(() => Match).backReference()) public matches?: Match[];
+	public matches?: Match[] & BackReference;
 
-	// @(t.type(() => Event).reference()) public event?: Event;
+	// public event?: Event & Reference;
 
-	constructor(@t public date: Date) {}
+	constructor(public date: Date) {}
 }

src/dataModel/DrawTime.ts

@@ -1,16 +1,15 @@
-import { entity, t } from "@deepkit/type";
+import { AutoIncrement, BackReference, entity, PrimaryKey } from "@deepkit/type";
 import { IDataObject } from "../types/data";
 import { User } from "./User";
 import { SpareCandidate } from "./joinerObjects/SpareCandidate";
 
-@(entity.name("drawTime").collectionName("drawTimes"))
+@(entity.name("drawTime").collection("drawTimes"))
 export class DrawTime implements IDataObject {
-	@t.primary.autoIncrement public id: number = 0;
-	@t public created: Date = new Date();
-	@t public modified?: Date;
+	public id: number & PrimaryKey & AutoIncrement = 0;
+	public created: Date = new Date();
+	public modified?: Date;
 
-	@(t.array(() => User).backReference({ via: () => SpareCandidate }))
-	availableSpares?: User[];
+	availableSpares?: User[] & BackReference<{via: SpareCandidate}>;
 
-	constructor(@t public time: string, @t public dayOfWeek: number) {}
+	constructor(public time: string, public dayOfWeek: number) {}
 }

src/dataModel/EmergencyContact.ts

@@ -1,14 +1,14 @@
-import { entity, t } from "@deepkit/type";
+import { AutoIncrement, BackReference, entity, PrimaryKey } from "@deepkit/type";
 import { User } from "./User";
 import { IDataObject } from "../types/data";
 
-@(entity.name("emergencyContact").collectionName("emergencyContacts"))
+@(entity.name("emergencyContact").collection("emergencyContacts"))
 export class EmergencyContact implements IDataObject {
-	@t.primary.autoIncrement public id: number = 0;
-	@t public created: Date = new Date();
-	@t public modified?: Date;
+	public id: number & PrimaryKey & AutoIncrement = 0;
+	public created: Date = new Date();
+	public modified?: Date;
 
-	@t.backReference() public user?: User;
+	public user?: User & BackReference;
 
-	constructor(@t public name: string, @t public phone: string, @t public relationship: string) {}
+	constructor(public name: string, public phone: string, public relationship: string) {}
 }

src/dataModel/Invoice.ts

@@ -1,21 +1,21 @@
-import { entity, t } from "@deepkit/type";
+import { AutoIncrement, entity, PrimaryKey, Reference } from "@deepkit/type";
 import { IDataObject } from "../types/data";
 import { User } from "./User";
 
-@(entity.name("invoice").collectionName("invoices"))
+@(entity.name("invoice").collection("invoices"))
 export class Invoice implements IDataObject {
-	@t.primary.autoIncrement public id: number = 0;
-	@t public created: Date = new Date();
-	@t public modified?: Date;
+	public id: number & PrimaryKey & AutoIncrement = 0;
+	public created: Date = new Date();
+	public modified?: Date;
 
-	@t public payPalInvoiceId?: string;
+	public payPalInvoiceId?: string;
 
-	@(t.type(() => User).reference()) public user?: User;
+	public user?: User & Reference;
 
 	constructor(
-		@t public invoiceNum: number,
-		@t public dueDate: Date,
-		@t public invoiceAmount: number,
-		@t public amountPaid: number
+		public invoiceNum: number,
+		public dueDate: Date,
+		public invoiceAmount: number,
+		public amountPaid: number
 	) {}
 }

src/dataModel/League.ts

@@ -1,4 +1,4 @@
-import { entity, t } from "@deepkit/type";
+import { AutoIncrement, BackReference, entity, PrimaryKey, Reference } from "@deepkit/type";
 import { IDataObject } from "../types/data";
 import { User } from "./User";
 import { Team } from "./Team";
@@ -10,30 +10,28 @@ import { LeagueFormat } from "./LeagueFormat";
 import { LeagueMembership } from "./joinerObjects/LeagueMembership";
 import { LeagueTeam } from "./joinerObjects/LeagueTeam";
 
-@(entity.name("league").collectionName("leagues"))
+@(entity.name("league").collection("leagues"))
 export class League implements IDataObject {
-	@t.primary.autoIncrement public id: number = 0;
-	@t public created: Date = new Date();
-	@t public modified?: Date;
+	public id: number & PrimaryKey & AutoIncrement = 0;
+	public created: Date = new Date();
+	public modified?: Date;
 
-	@t public singleLeagueCost?: number;
-	@t public additionalLeagueCost?: number;
+	public singleLeagueCost?: number;
+	public additionalLeagueCost?: number;
 
-	@(t.array(() => User).backReference({ via: () => LeagueMembership }))
-	Users?: User[];
+	Users?: User[] & BackReference<{via: LeagueMembership}>;
 
-	@(t.array(() => Team).backReference({ via: () => LeagueTeam }))
-	teams?: Team[];
+	teams?: Team[] & BackReference<{via: LeagueTeam}>;
 
-	@(t.type(() => LeagueFormat).reference()) public format?: LeagueFormat;
+	public format?: LeagueFormat & Reference;
 
-	@(t.array(() => Draw).backReference()) public draws?: Draw[];
+	public draws?: Draw[] & BackReference;
 
-	@(t.array(() => DrawTime).backReference()) public drawTimes?: DrawTime[];
+	public drawTimes?: DrawTime[] & BackReference;
 
-	@(t.array(() => Division).backReference()) public divisions?: Division[];
+	public divisions?: Division[] & BackReference;
 
-	@(t.type(() => Season).reference()) public season?: Season;
+	public season?: Season & Reference;
 
-	constructor(@t public name: string, @t public dayOfWeek: number, @t public teamCapacity: number) {}
+	constructor(public name: string, public dayOfWeek: number, public teamCapacity: number) {}
 }