chore: update imports for module.gen.ts

NathanFlurry · NathanFlurry · commit e7c9c90a94c0 · 2024-05-18T17:01:02.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,9 @@
 # OpenGB
+.opengb/
 dist/
 gen/
 _gen/
+*.gen.ts
 
 # Created by https://www.toptal.com/developers/gitignore/api/deno,macos
 # Edit at https://www.toptal.com/developers/gitignore?templates=deno,macos
diff --git a/modules/auth/scripts/auth_email_passwordless.ts b/modules/auth/scripts/auth_email_passwordless.ts
@@ -1,5 +1,5 @@
-import { RuntimeError } from "../_gen/mod.ts";
-import { ScriptContext } from "../_gen/scripts/auth_email_passwordless.ts";
+import { RuntimeError } from "../module.gen.ts";
+import { ScriptContext } from "../module.gen.ts";
 import { Verification } from "../utils/types.ts";
 
 export interface Request {
diff --git a/modules/auth/scripts/verify_email_passwordless.ts b/modules/auth/scripts/verify_email_passwordless.ts
@@ -2,7 +2,7 @@ import { assertExists } from "https://deno.land/std@0.208.0/assert/mod.ts";
 import {
 	RuntimeError,
 	ScriptContext,
-} from "../_gen/scripts/verify_email_passwordless.ts";
+} from "../module.gen.ts";
 import { TokenWithSecret } from "../../tokens/utils/types.ts";
 
 export interface Request {
diff --git a/modules/auth/tests/e2e.ts b/modules/auth/tests/e2e.ts
@@ -1,4 +1,4 @@
-import { test, TestContext } from "../_gen/test.ts";
+import { test, TestContext } from "../module.gen.ts";
 import { assertEquals } from "https://deno.land/std@0.208.0/assert/mod.ts";
 import { faker } from "https://deno.land/x/deno_faker@v1.0.3/mod.ts";
 
diff --git a/modules/currency/scripts/deposit.ts b/modules/currency/scripts/deposit.ts
@@ -1,4 +1,4 @@
-import { RuntimeError, ScriptContext } from "../_gen/scripts/deposit.ts";
+import { RuntimeError, ScriptContext } from "../module.gen.ts";
 
 import { getBalance } from "../utils/get_balance.ts";
 import { setBalance } from "../utils/set_balance.ts";
diff --git a/modules/currency/scripts/get_balance.ts b/modules/currency/scripts/get_balance.ts
@@ -1,4 +1,4 @@
-import { ScriptContext } from "../_gen/scripts/get_balance.ts";
+import { ScriptContext } from "../module.gen.ts";
 
 import { getBalance } from "../utils/get_balance.ts";
 
diff --git a/modules/currency/scripts/get_balance_by_token.ts b/modules/currency/scripts/get_balance_by_token.ts
@@ -1,4 +1,4 @@
-import { ScriptContext } from "../_gen/scripts/get_balance_by_token.ts";
+import { ScriptContext } from "../module.gen.ts";
 
 export interface Request {
 	userToken: string;
diff --git a/modules/currency/scripts/set_balance.ts b/modules/currency/scripts/set_balance.ts
@@ -1,5 +1,5 @@
-import { RuntimeError } from "../_gen/scripts/set_balance.ts";
-import { ScriptContext } from "../_gen/scripts/set_balance.ts";
+import { RuntimeError } from "../module.gen.ts";
+import { ScriptContext } from "../module.gen.ts";
 
 import { setBalance } from "../utils/set_balance.ts";
 
diff --git a/modules/currency/scripts/withdraw.ts b/modules/currency/scripts/withdraw.ts
@@ -1,4 +1,4 @@
-import { RuntimeError, ScriptContext } from "../_gen/scripts/withdraw.ts";
+import { RuntimeError, ScriptContext } from "../module.gen.ts";
 
 import { getBalance } from "../utils/get_balance.ts";
 import { setBalance } from "../utils/set_balance.ts";
diff --git a/modules/currency/tests/e2e.ts b/modules/currency/tests/e2e.ts
@@ -1,4 +1,4 @@
-import { test, TestContext } from "../_gen/test.ts";
+import { test, TestContext } from "../module.gen.ts";
 import { assertEquals } from "https://deno.land/std@0.217.0/assert/mod.ts";
 import { faker } from "https://deno.land/x/deno_faker@v1.0.3/mod.ts";
 
diff --git a/modules/currency/tests/errors.ts b/modules/currency/tests/errors.ts
@@ -1,4 +1,4 @@
-import { RuntimeError, test, TestContext } from "../_gen/test.ts";
+import { RuntimeError, test, TestContext } from "../module.gen.ts";
 import {
 	assertEquals,
 	assertRejects,
diff --git a/modules/currency/utils/get_balance.ts b/modules/currency/utils/get_balance.ts
@@ -1,4 +1,4 @@
-import { prisma } from "../_gen/mod.ts";
+import { prisma } from "../module.gen.ts";
 
 type LimittedDB = Omit<
 	prisma.Prisma.DefaultPrismaClient,
diff --git a/modules/currency/utils/set_balance.ts b/modules/currency/utils/set_balance.ts
@@ -1,4 +1,4 @@
-import { prisma, RuntimeError } from "../_gen/mod.ts";
+import { prisma, RuntimeError } from "../module.gen.ts";
 
 type LimittedDB = Omit<
 	prisma.Prisma.DefaultPrismaClient,
diff --git a/modules/email/scripts/send_email.ts b/modules/email/scripts/send_email.ts
@@ -1,5 +1,5 @@
 import { assertExists } from "https://deno.land/std@0.208.0/assert/assert_exists.ts";
-import { RuntimeError, ScriptContext } from "../_gen/scripts/send_email.ts";
+import { RuntimeError, ScriptContext } from "../module.gen.ts";
 import { ProviderSendGrid } from "../config.ts";
 import { Email } from "../utils/types.ts";
 
diff --git a/modules/friends/scripts/accept_request.ts b/modules/friends/scripts/accept_request.ts
@@ -1,4 +1,4 @@
-import { RuntimeError, ScriptContext } from "../_gen/scripts/accept_request.ts";
+import { RuntimeError, ScriptContext } from "../module.gen.ts";
 
 export interface Request {
 	userToken: string;
diff --git a/modules/friends/scripts/decline_request.ts b/modules/friends/scripts/decline_request.ts
@@ -1,7 +1,7 @@
 import {
 	RuntimeError,
 	ScriptContext,
-} from "../_gen/scripts/decline_request.ts";
+} from "../module.gen.ts";
 
 export interface Request {
 	userToken: string;
diff --git a/modules/friends/scripts/list_friends.ts b/modules/friends/scripts/list_friends.ts
@@ -1,4 +1,4 @@
-import { ScriptContext } from "../_gen/scripts/list_friends.ts";
+import { ScriptContext } from "../module.gen.ts";
 import { Friend, friendFromRow } from "../utils/types.ts";
 
 export interface Request {
diff --git a/modules/friends/scripts/list_incoming_friend_requests.ts b/modules/friends/scripts/list_incoming_friend_requests.ts
@@ -1,4 +1,4 @@
-import { ScriptContext } from "../_gen/scripts/list_incoming_friend_requests.ts";
+import { ScriptContext } from "../module.gen.ts";
 import { FriendRequest, friendRequestFromRow } from "../utils/types.ts";
 
 export interface Request {
diff --git a/modules/friends/scripts/list_outgoing_friend_requests.ts b/modules/friends/scripts/list_outgoing_friend_requests.ts
@@ -1,4 +1,4 @@
-import { ScriptContext } from "../_gen/scripts/list_outgoing_friend_requests.ts";
+import { ScriptContext } from "../module.gen.ts";
 import { FriendRequest, friendRequestFromRow } from "../utils/types.ts";
 
 export interface Request {
diff --git a/modules/friends/scripts/remove_friend.ts b/modules/friends/scripts/remove_friend.ts
@@ -1,4 +1,4 @@
-import { RuntimeError, ScriptContext } from "../_gen/scripts/remove_friend.ts";
+import { RuntimeError, ScriptContext } from "../module.gen.ts";
 
 export interface Request {
 	userToken: string;
diff --git a/modules/friends/scripts/send_request.ts b/modules/friends/scripts/send_request.ts
@@ -1,4 +1,4 @@
-import { RuntimeError, ScriptContext } from "../_gen/scripts/send_request.ts";
+import { RuntimeError, ScriptContext } from "../module.gen.ts";
 import { FriendRequest, friendRequestFromRow } from "../utils/types.ts";
 
 export interface Request {
diff --git a/modules/friends/tests/e2e.ts b/modules/friends/tests/e2e.ts
@@ -1,4 +1,4 @@
-import { test, TestContext } from "../_gen/test.ts";
+import { test, TestContext } from "../module.gen.ts";
 import { assertEquals } from "https://deno.land/std@0.217.0/assert/mod.ts";
 import { faker } from "https://deno.land/x/deno_faker@v1.0.3/mod.ts";
 
diff --git a/modules/friends/utils/types.ts b/modules/friends/utils/types.ts
@@ -1,4 +1,4 @@
-import { prisma } from "../_gen/mod.ts";
+import { prisma } from "../module.gen.ts";
 
 export interface Friend {
 	userIdA: string;
diff --git a/modules/rate_limit/scripts/throttle.ts b/modules/rate_limit/scripts/throttle.ts
@@ -1,4 +1,4 @@
-import { RuntimeError, ScriptContext } from "../_gen/scripts/throttle.ts";
+import { RuntimeError, ScriptContext } from "../module.gen.ts";
 
 export interface Request {
 	/**
diff --git a/modules/rate_limit/scripts/throttle_public.ts b/modules/rate_limit/scripts/throttle_public.ts
@@ -1,4 +1,4 @@
-import { ScriptContext } from "../_gen/scripts/throttle_public.ts";
+import { ScriptContext } from "../module.gen.ts";
 
 export interface Request {
 	/**
diff --git a/modules/rate_limit/tests/e2e.ts b/modules/rate_limit/tests/e2e.ts
@@ -1,4 +1,4 @@
-import { RuntimeError, test, TestContext } from "../_gen/test.ts";
+import { RuntimeError, test, TestContext } from "../module.gen.ts";
 import {
 	assertEquals,
 	assertRejects,
diff --git a/modules/tokens/scripts/create.ts b/modules/tokens/scripts/create.ts
@@ -1,4 +1,4 @@
-import { ScriptContext } from "../_gen/scripts/create.ts";
+import { ScriptContext } from "../module.gen.ts";
 import { TokenWithSecret } from "../utils/types.ts";
 import { tokenFromRow } from "../utils/types.ts";
 
diff --git a/modules/tokens/scripts/extend.ts b/modules/tokens/scripts/extend.ts
@@ -1,4 +1,4 @@
-import { ScriptContext } from "../_gen/scripts/extend.ts";
+import { ScriptContext } from "../module.gen.ts";
 import { TokenWithSecret, tokenFromRow } from "../utils/types.ts";
 
 export interface Request {
diff --git a/modules/tokens/scripts/get.ts b/modules/tokens/scripts/get.ts
@@ -1,4 +1,4 @@
-import { ScriptContext } from "../_gen/scripts/get.ts";
+import { ScriptContext } from "../module.gen.ts";
 import { Token } from "../utils/types.ts";
 import { tokenFromRow } from "../utils/types.ts";
 
diff --git a/modules/tokens/scripts/get_by_token.ts b/modules/tokens/scripts/get_by_token.ts
@@ -1,4 +1,4 @@
-import { ScriptContext } from "../_gen/scripts/get_by_token.ts";
+import { ScriptContext } from "../module.gen.ts";
 import { Token, tokenFromRow } from "../utils/types.ts";
 
 export interface Request {
diff --git a/modules/tokens/scripts/revoke.ts b/modules/tokens/scripts/revoke.ts
@@ -1,4 +1,4 @@
-import { Prisma, ScriptContext } from "../_gen/scripts/revoke.ts";
+import { Prisma, ScriptContext } from "../module.gen.ts";
 
 export interface Request {
 	tokenIds: string[];
diff --git a/modules/tokens/scripts/validate.ts b/modules/tokens/scripts/validate.ts
@@ -1,4 +1,4 @@
-import { RuntimeError, ScriptContext } from "../_gen/scripts/validate.ts";
+import { RuntimeError, ScriptContext } from "../module.gen.ts";
 import { Token } from "../utils/types.ts";
 
 export interface Request {
diff --git a/modules/tokens/tests/e2e.ts b/modules/tokens/tests/e2e.ts
@@ -1,4 +1,4 @@
-import { test, TestContext } from "../_gen/test.ts";
+import { test, TestContext } from "../module.gen.ts";
 import {
 	assertEquals,
 	assertExists,
diff --git a/modules/tokens/tests/validate.ts b/modules/tokens/tests/validate.ts
@@ -1,4 +1,4 @@
-import { RuntimeError, test, TestContext } from "../_gen/test.ts";
+import { RuntimeError, test, TestContext } from "../module.gen.ts";
 import {
 	assertEquals,
 	assertRejects,
diff --git a/modules/tokens/utils/types.ts b/modules/tokens/utils/types.ts
@@ -1,4 +1,4 @@
-import { prisma } from "../_gen/mod.ts";
+import { prisma } from "../module.gen.ts";
 
 export interface Token {
 	id: string;
diff --git a/modules/uploads/scripts/complete.ts b/modules/uploads/scripts/complete.ts
@@ -1,4 +1,4 @@
-import { RuntimeError, ScriptContext } from "../_gen/scripts/complete.ts";
+import { RuntimeError, ScriptContext } from "../module.gen.ts";
 import {
 	completeMultipartUpload,
 	getMultipartUploadParts,
diff --git a/modules/uploads/scripts/delete.ts b/modules/uploads/scripts/delete.ts
@@ -1,4 +1,4 @@
-import { RuntimeError, ScriptContext } from "../_gen/scripts/delete.ts";
+import { RuntimeError, ScriptContext } from "../module.gen.ts";
 import { getKey } from "../utils/types.ts";
 import { deleteKeys } from "../utils/bucket.ts";
 import { getConfig } from "../utils/config_defaults.ts";
diff --git a/modules/uploads/scripts/get.ts b/modules/uploads/scripts/get.ts
@@ -1,4 +1,4 @@
-import { ScriptContext } from "../_gen/scripts/get.ts";
+import { ScriptContext } from "../module.gen.ts";
 import { getConfig } from "../utils/config_defaults.ts";
 import {
 	prismaToOutput,
diff --git a/modules/uploads/scripts/get_public_file_urls.ts b/modules/uploads/scripts/get_public_file_urls.ts
@@ -1,4 +1,4 @@
-import { ScriptContext } from "../_gen/scripts/get_public_file_urls.ts";
+import { ScriptContext } from "../module.gen.ts";
 import { getKey, UploadFile } from "../utils/types.ts";
 import { getPresignedGetUrl } from "../utils/bucket.ts";
 import { getConfig } from "../utils/config_defaults.ts";
diff --git a/modules/uploads/scripts/list_for_user.ts b/modules/uploads/scripts/list_for_user.ts
@@ -1,4 +1,4 @@
-import { ScriptContext } from "../_gen/scripts/list_for_user.ts";
+import { ScriptContext } from "../module.gen.ts";
 import { getConfig } from "../utils/config_defaults.ts";
 
 export interface Request {
diff --git a/modules/uploads/scripts/prepare.ts b/modules/uploads/scripts/prepare.ts
@@ -1,4 +1,4 @@
-import { RuntimeError, ScriptContext } from "../_gen/scripts/prepare.ts";
+import { RuntimeError, ScriptContext } from "../module.gen.ts";
 import { PresignedUpload, prismaToOutput, UploadFile } from "../utils/types.ts";
 import {
 	getPresignedMultipartUploadUrls,
diff --git a/modules/uploads/tests/e2e.ts b/modules/uploads/tests/e2e.ts
@@ -1,4 +1,4 @@
-import { test, TestContext } from "../_gen/test.ts";
+import { test, TestContext } from "../module.gen.ts";
 import {
 	assert,
 	assertEquals,
diff --git a/modules/uploads/tests/multipart.ts b/modules/uploads/tests/multipart.ts
@@ -1,4 +1,4 @@
-import { test, TestContext } from "../_gen/test.ts";
+import { test, TestContext } from "../module.gen.ts";
 import {
 	assert,
 	assertEquals,
diff --git a/modules/uploads/utils/config_defaults.ts b/modules/uploads/utils/config_defaults.ts
@@ -1,4 +1,4 @@
-import { RuntimeError } from "../_gen/mod.ts";
+import { RuntimeError } from "../module.gen.ts";
 import { Config } from "../config.ts";
 import { getS3EnvConfig } from "./env.ts";
 
diff --git a/modules/uploads/utils/data_size.ts b/modules/uploads/utils/data_size.ts
@@ -1,4 +1,4 @@
-import { RuntimeError } from "../_gen/mod.ts";
+import { RuntimeError } from "../module.gen.ts";
 
 type Units = "b" | "kb" | "mb" | "gb" | "tb" | "kib" | "mib" | "gib" | "tib";
 
diff --git a/modules/uploads/utils/types.ts b/modules/uploads/utils/types.ts
@@ -1,10 +1,26 @@
-import {
-	Files as PrismaFiles,
-	Upload as _PrismaUpload,
-} from "../_gen/prisma/default.d.ts";
+interface _PrismaUpload {
+	id: string;
+	userId: string | null;
+	bucket: string;
+	contentLength: bigint;
+	createdAt: Date;
+	updatedAt: Date;
+	completedAt: Date | null;
+	deletedAt: Date | null;
+	files: PrismaFile[];
+}
+
+
+interface PrismaFile {
+	multipartUploadId: string | null;
+	path: string;
+	mime: string | null;
+	contentLength: bigint;
+}
+
 
 interface PrismaUpload extends Omit<_PrismaUpload, "deletedAt"> {
-	files: PrismaFiles[];
+	files: PrismaFile[];
 }
 
 export interface Upload {
@@ -14,7 +30,7 @@ export interface Upload {
 	bucket: string;
 	contentLength: string;
 
-	files: UploadFile[];
+	files?: UploadFile[];
 
 	createdAt: string;
 	updatedAt: string;
@@ -74,7 +90,7 @@ export function prismaToOutput(
 export function prismaToOutputWithFiles(upload: PrismaUpload): Upload {
 	return {
 		...prismaToOutput(upload),
-		files: upload.files?.map((file) => ({
+		files: upload.files.map((file) => ({
 			path: file.path,
 			mime: file.mime,
 			contentLength: file.contentLength.toString(),
diff --git a/modules/users/scripts/authenticate_user.ts b/modules/users/scripts/authenticate_user.ts
@@ -1,5 +1,5 @@
-import { RuntimeError } from "../_gen/mod.ts";
-import { ScriptContext } from "../_gen/scripts/authenticate_user.ts";
+import { RuntimeError } from "../module.gen.ts";
+import { ScriptContext } from "../module.gen.ts";
 
 export interface Request {
 	userToken: string;
diff --git a/modules/users/scripts/create_user.ts b/modules/users/scripts/create_user.ts
@@ -1,4 +1,4 @@
-import { ScriptContext } from "../_gen/scripts/create_user.ts";
+import { ScriptContext } from "../module.gen.ts";
 import { User } from "../utils/types.ts";
 
 export interface Request {
diff --git a/modules/users/scripts/create_user_token.ts b/modules/users/scripts/create_user_token.ts
@@ -1,5 +1,5 @@
 import { TokenWithSecret } from "../../tokens/utils/types.ts";
-import { ScriptContext } from "../_gen/scripts/create_user_token.ts";
+import { ScriptContext } from "../module.gen.ts";
 
 export interface Request {
 	userId: string;
diff --git a/modules/users/scripts/get_user.ts b/modules/users/scripts/get_user.ts
@@ -1,4 +1,4 @@
-import { ScriptContext } from "../_gen/scripts/get_user.ts";
+import { ScriptContext } from "../module.gen.ts";
 import { User } from "../utils/types.ts";
 
 export interface Request {
diff --git a/modules/users/tests/e2e.ts b/modules/users/tests/e2e.ts
@@ -1,4 +1,4 @@
-import { test, TestContext } from "../_gen/test.ts";
+import { test, TestContext } from "../module.gen.ts";
 import { faker } from "https://deno.land/x/deno_faker@v1.0.3/mod.ts";
 import { assertEquals } from "https://deno.land/std@0.217.0/assert/assert_equals.ts";
 import { assertExists } from "https://deno.land/std@0.217.0/assert/assert_exists.ts";
diff --git a/tests/basic/deno.lock b/tests/basic/deno.lock

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { test, TestContext } from "../_gen/test.ts";`
	`1`	`+import { test, TestContext } from "../module.gen.ts";`
`2`	`2`	`import { assertEquals } from "https://deno.land/std@0.208.0/assert/mod.ts";`
`3`	`3`	`import { faker } from "https://deno.land/x/deno_faker@v1.0.3/mod.ts";`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { RuntimeError, ScriptContext } from "../_gen/scripts/deposit.ts";`
	`1`	`+import { RuntimeError, ScriptContext } from "../module.gen.ts";`
`2`	`2`
`3`	`3`	`import { getBalance } from "../utils/get_balance.ts";`
`4`	`4`	`import { setBalance } from "../utils/set_balance.ts";`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { ScriptContext } from "../_gen/scripts/get_balance.ts";`
	`1`	`+import { ScriptContext } from "../module.gen.ts";`
`2`	`2`
`3`	`3`	`import { getBalance } from "../utils/get_balance.ts";`
`4`	`4`