streaper2/maaw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

typescript version and import type

Browse Source
This commit is contained in:
Michael Dausmann
2024-02-17 14:34:54 +11:00
parent 5d80955870
commit 0b7635ca1a
6 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.vscode/settings.json vendored
View File

@@ -2,5 +2,6 @@
"editor.defaultFormatter": "esbenp.prettier-vscode", "editor.defaultFormatter": "esbenp.prettier-vscode",
"[vue]": { "[vue]": {
"editor.defaultFormatter": "esbenp.prettier-vscode" "editor.defaultFormatter": "esbenp.prettier-vscode"
} },
"typescript.tsdk": "node_modules/typescript/lib"
} }

6
lib/services/account.service.ts
View File

@@ -2,11 +2,11 @@ import { ACCOUNT_ACCESS } from '~~/prisma/account-access-enum';
import prisma_client from '~~/prisma/prisma.client'; import prisma_client from '~~/prisma/prisma.client';
import { import {
accountWithMembers, accountWithMembers,
AccountWithMembers, type AccountWithMembers,
membershipWithAccount, membershipWithAccount,
MembershipWithAccount, type MembershipWithAccount,
membershipWithUser, membershipWithUser,
MembershipWithUser type MembershipWithUser
} from './service.types'; } from './service.types';
import generator from 'generate-password-ts'; import generator from 'generate-password-ts';
import { UtilService } from './util.service'; import { UtilService } from './util.service';

2
lib/services/auth.service.ts
View File

@@ -1,6 +1,6 @@
import { ACCOUNT_ACCESS } from '~~/prisma/account-access-enum'; import { ACCOUNT_ACCESS } from '~~/prisma/account-access-enum';
import prisma_client from '~~/prisma/prisma.client'; import prisma_client from '~~/prisma/prisma.client';
import { fullDBUser, FullDBUser } from './service.types'; import { fullDBUser, type FullDBUser } from './service.types';
import { UtilService } from './util.service'; import { UtilService } from './util.service';
import generator from 'generate-password-ts'; import generator from 'generate-password-ts';

4
server/middleware/authContext.ts
View File

@@ -2,8 +2,8 @@ import { defineEventHandler, parseCookies, setCookie, getCookie } from 'h3';
import { serverSupabaseUser } from '#supabase/server'; import { serverSupabaseUser } from '#supabase/server';
import { AuthService } from '~/lib/services/auth.service'; import { AuthService } from '~/lib/services/auth.service';
import { User } from '@supabase/supabase-js'; import type { User } from '@supabase/supabase-js';
import { FullDBUser } from '~~/lib/services/service.types'; import type { FullDBUser } from '~~/lib/services/service.types';
// Explicitly type our context by 'Merging' our custom types with the H3EventContext (https://stackoverflow.com/a/76349232/95242) // Explicitly type our context by 'Merging' our custom types with the H3EventContext (https://stackoverflow.com/a/76349232/95242)
declare module 'h3' { declare module 'h3' {

2
server/routes/create-checkout-session.post.ts
View File

@@ -1,7 +1,7 @@
import { ACCOUNT_ACCESS } from '~~/prisma/account-access-enum'; import { ACCOUNT_ACCESS } from '~~/prisma/account-access-enum';
import Stripe from 'stripe'; import Stripe from 'stripe';
import { AccountService } from '~~/lib/services/account.service'; import { AccountService } from '~~/lib/services/account.service';
import { AccountWithMembers } from '~~/lib/services/service.types'; import type { AccountWithMembers } from '~~/lib/services/service.types';
const config = useRuntimeConfig(); const config = useRuntimeConfig();
const stripe = new Stripe(config.stripeSecretKey, { apiVersion: '2022-11-15' }); const stripe = new Stripe(config.stripeSecretKey, { apiVersion: '2022-11-15' });

2
server/trpc/routers/account.router.ts
View File

@@ -9,7 +9,7 @@ import {
import { ACCOUNT_ACCESS } from '~~/prisma/account-access-enum'; import { ACCOUNT_ACCESS } from '~~/prisma/account-access-enum';
import { z } from 'zod'; import { z } from 'zod';
import { AccountService } from '~~/lib/services/account.service'; import { AccountService } from '~~/lib/services/account.service';
import { MembershipWithAccount } from '~~/lib/services/service.types'; import type { MembershipWithAccount } from '~~/lib/services/service.types';
/* /*
Note on proliferation of Bang syntax... adminProcedure throws if either the ctx.dbUser or the ctx.activeAccountId is not available but the compiler can't figure that out so bang quiesces the null warning Note on proliferation of Bang syntax... adminProcedure throws if either the ctx.dbUser or the ctx.activeAccountId is not available but the compiler can't figure that out so bang quiesces the null warning