Skip to content

Commit b44c193

Browse files
committed
chore: Separate out utils package into sub-files
1 parent fe8b6b1 commit b44c193

File tree

90 files changed

+151
-158
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+151
-158
lines changed

apps/mail-bridge/postal-db/functions.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {
1616
getUniqueDKIMSelector,
1717
randomAlphaNumeric
1818
} from './generators';
19-
import { and, eq, sql } from 'drizzle-orm/sql';
19+
import { and, eq, sql } from 'drizzle-orm';
2020
import {
2121
lookupCNAME,
2222
lookupMX,
@@ -27,7 +27,7 @@ import {
2727
parseSpfIncludes,
2828
parseDmarc,
2929
buildDmarcRecord
30-
} from '@u22n/utils';
30+
} from '@u22n/utils/dns';
3131
import { env } from '../env';
3232

3333
export type CreateOrgInput = {

apps/mail-bridge/postal-routes/inbound.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import {
1919
typeIdValidator,
2020
validateTypeId,
2121
type TypeId
22-
} from '@u22n/utils';
22+
} from '@u22n/utils/typeid';
2323
import { Hono } from 'hono';
2424
import { z } from 'zod';
2525
import { db } from '@u22n/database';

apps/mail-bridge/trpc/routers/domainRouter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { z } from 'zod';
22
import { router, protectedProcedure } from '../trpc';
33
import { and, eq } from '@u22n/database/orm';
44
import { postalServers } from '@u22n/database/schema';
5-
import { typeIdValidator } from '@u22n/utils';
5+
import { typeIdValidator } from '@u22n/utils/typeid';
66
import { postalDB } from '../../postal-db';
77
import { httpEndpoints, organizations, servers } from '../../postal-db/schema';
88
import {

apps/mail-bridge/trpc/routers/orgRouter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { z } from 'zod';
22
import { router, protectedProcedure } from '../trpc';
33
import { eq } from '@u22n/database/orm';
4-
import { typeIdGenerator, typeIdValidator } from '@u22n/utils';
4+
import { typeIdGenerator, typeIdValidator } from '@u22n/utils/typeid';
55
import {
66
addMailServer,
77
createOrg,

apps/mail-bridge/trpc/routers/sendMailRouter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {
1515
orgs,
1616
convoParticipants
1717
} from '@u22n/database/schema';
18-
import { typeIdValidator } from '@u22n/utils';
18+
import { typeIdValidator } from '@u22n/utils/typeid';
1919
import { and, eq, inArray } from '@u22n/database/orm';
2020
import { tiptapHtml, tiptapVue3 } from '@u22n/tiptap';
2121
import { tipTapExtensions } from '@u22n/tiptap/extensions';

apps/mail-bridge/utils/contactParsing.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
contacts,
88
emailIdentities
99
} from '@u22n/database/schema';
10-
import { typeIdGenerator } from '@u22n/utils';
10+
import { typeIdGenerator } from '@u22n/utils/typeid';
1111

1212
export async function parseAddressIds(input: {
1313
addresses: EmailAddress[];

apps/mail-bridge/utils/realtime.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ import { db } from '@u22n/database';
22
import { eq, inArray } from '@u22n/database/orm';
33
import { convoEntries, convoParticipants, convos } from '@u22n/database/schema';
44
import RealtimeServer from '@u22n/realtime/server';
5-
6-
import type { TypeId } from '@u22n/utils';
5+
import type { TypeId } from '@u22n/utils/typeid';
76
import { env } from '../env';
87

98
export const realtime = new RealtimeServer({

apps/platform/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
"@u22n/utils": "workspace:^",
3030
"@unkey/ratelimit": "^0.1.3",
3131
"hono": "^4.3.8",
32-
"itty-time": "^1.0.6",
3332
"lucia": "^3.1.1",
3433
"oslo": "^1.1.3",
3534
"superjson": "^2.2.1",

apps/platform/storage.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { env } from './env';
2-
import { ms } from 'itty-time';
2+
import { ms } from '@u22n/utils/ms';
33
import redisDriver from 'unstorage/drivers/redis';
44
import { createStorage, type StorageValue } from 'unstorage';
55
import type { DatabaseSession } from 'lucia';

apps/platform/trpc/routers/authRouter/passkeyRouter.ts

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,9 @@ import type {
77
RegistrationResponseJSON,
88
AuthenticationResponseJSON
99
} from '@simplewebauthn/types';
10-
import {
11-
nanoIdToken,
12-
typeIdGenerator,
13-
typeIdValidator,
14-
zodSchemas
15-
} from '@u22n/utils';
10+
import { typeIdGenerator, typeIdValidator } from '@u22n/utils/typeid';
11+
import { nanoIdToken, zodSchemas } from '@u22n/utils/zodSchemas';
12+
import { ms } from '@u22n/utils/ms';
1613
import {
1714
verifyRegistrationResponse,
1815
generateRegistrationOptions,
@@ -23,7 +20,6 @@ import { createAuthenticator } from '@platform/utils/auth/passkeyUtils';
2320
import { validateUsername } from './signupRouter';
2421
import { createLuciaSessionCookie } from '@platform/utils/session';
2522
import { env } from '@platform/env';
26-
import { ms } from 'itty-time';
2723
import { getCookie, setCookie } from 'hono/cookie';
2824

2925
export const passkeyRouter = router({

apps/platform/trpc/routers/authRouter/passwordRouter.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,9 @@ import {
77
} from '@platform/trpc/trpc';
88
import { eq } from '@u22n/database/orm';
99
import { accounts } from '@u22n/database/schema';
10-
import {
11-
nanoIdToken,
12-
typeIdGenerator,
13-
zodSchemas,
14-
strongPasswordSchema
15-
} from '@u22n/utils';
10+
import { nanoIdToken, zodSchemas } from '@u22n/utils/zodSchemas';
11+
import { strongPasswordSchema } from '@u22n/utils/password';
12+
import { typeIdGenerator } from '@u22n/utils/typeid';
1613
import { TRPCError } from '@trpc/server';
1714
import { lucia } from '@platform/utils/auth';
1815
import { validateUsername } from './signupRouter';

apps/platform/trpc/routers/authRouter/recoveryRouter.ts

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,17 @@ import { Argon2id } from 'oslo/password';
33
import { router, publicRateLimitedProcedure } from '@platform/trpc/trpc';
44
import { eq } from '@u22n/database/orm';
55
import { accounts } from '@u22n/database/schema';
6-
import {
7-
nanoIdToken,
8-
strongPasswordSchema,
9-
typeIdValidator,
10-
zodSchemas
11-
} from '@u22n/utils';
6+
import { nanoIdToken, zodSchemas } from '@u22n/utils/zodSchemas';
7+
import { strongPasswordSchema } from '@u22n/utils/password';
8+
import { typeIdValidator } from '@u22n/utils/typeid';
9+
import { ms } from '@u22n/utils/ms';
1210
import { TRPCError } from '@trpc/server';
1311
import { createLuciaSessionCookie } from '@platform/utils/session';
1412
import { decodeHex, encodeHex } from 'oslo/encoding';
1513
import { TOTPController, createTOTPKeyURI } from 'oslo/otp';
1614
import { deleteCookie, getCookie, setCookie } from 'hono/cookie';
1715
import { env } from '@platform/env';
1816
import { storage } from '@platform/storage';
19-
import { ms } from 'itty-time';
2017

2118
export const recoveryRouter = router({
2219
/**

apps/platform/trpc/routers/authRouter/signupRouter.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ import type { DBType } from '@u22n/database';
44
import { eq } from '@u22n/database/orm';
55
import { accounts } from '@u22n/database/schema';
66
import { blockedUsernames, reservedUsernames } from '@platform/utils/signup';
7-
import { zodSchemas, calculatePasswordStrength } from '@u22n/utils';
7+
import { calculatePasswordStrength } from '@u22n/utils/password';
8+
import { zodSchemas } from '@u22n/utils/zodSchemas';
89

910
export async function validateUsername(
1011
db: DBType,

apps/platform/trpc/routers/authRouter/twoFactorRouter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { accounts } from '@u22n/database/schema';
99
import { decodeHex, encodeHex } from 'oslo/encoding';
1010
import { TOTPController, createTOTPKeyURI } from 'oslo/otp';
1111
import { TRPCError } from '@trpc/server';
12-
import { nanoIdToken, zodSchemas } from '@u22n/utils';
12+
import { nanoIdToken, zodSchemas } from '@u22n/utils/zodSchemas';
1313
import { Argon2id } from 'oslo/password';
1414
import { getCookie, setCookie } from 'hono/cookie';
1515
import { storage } from '@platform/storage';

apps/platform/trpc/routers/convoRouter/convoRouter.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@ import {
3131
convoEntryPrivateVisibilityParticipants,
3232
convoEntryRawHtmlEmails
3333
} from '@u22n/database/schema';
34-
import { typeIdValidator, type TypeId, typeIdGenerator } from '@u22n/utils';
34+
import {
35+
typeIdValidator,
36+
type TypeId,
37+
typeIdGenerator
38+
} from '@u22n/utils/typeid';
3539
import { TRPCError } from '@trpc/server';
3640
import { tipTapExtensions } from '@u22n/tiptap/extensions';
3741
import { tiptapCore, type tiptapVue3 } from '@u22n/tiptap';

apps/platform/trpc/routers/convoRouter/entryRouter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { z } from 'zod';
22
import { router, orgProcedure } from '@platform/trpc/trpc';
33
import { and, desc, eq, lt, or } from '@u22n/database/orm';
44
import { convos, convoEntries } from '@u22n/database/schema';
5-
import { typeIdValidator } from '@u22n/utils';
5+
import { typeIdValidator } from '@u22n/utils/typeid';
66
import { TRPCError } from '@trpc/server';
77

88
export const convoEntryRouter = router({

apps/platform/trpc/routers/orgRouter/mail/domainsRouter.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import {
66
postalServers,
77
orgPostalConfigs
88
} from '@u22n/database/schema';
9-
import { typeIdGenerator, typeIdValidator } from '@u22n/utils';
9+
import { typeIdGenerator, typeIdValidator } from '@u22n/utils/typeid';
10+
import { lookupNS } from '@u22n/utils/dns';
1011
import { TRPCError } from '@trpc/server';
1112
import { isAccountAdminOfOrg } from '@platform/utils/account';
1213
import { mailBridgeTrpcClient } from '@platform/utils/tRPCServerClients';
13-
import { lookupNS } from '@u22n/utils';
1414

1515
export const domainsRouter = router({
1616
createNewDomain: orgProcedure

apps/platform/trpc/routers/orgRouter/mail/emailIdentityExternalRouter.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ import {
1111
emailIdentitiesAuthorizedOrgMembers,
1212
emailIdentityExternal
1313
} from '@u22n/database/schema';
14-
import { nanoIdToken, typeIdGenerator, typeIdValidator } from '@u22n/utils';
14+
import { typeIdGenerator, typeIdValidator } from '@u22n/utils/typeid';
15+
import { nanoIdToken } from '@u22n/utils/zodSchemas';
1516
import { TRPCError } from '@trpc/server';
1617
import { env } from '@platform/env';
1718

apps/platform/trpc/routers/orgRouter/mail/emailIdentityRouter.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import {
2020
import {
2121
typeIdGenerator,
2222
typeIdValidator,
23-
type TypeId,
24-
nanoIdToken
25-
} from '@u22n/utils';
23+
type TypeId
24+
} from '@u22n/utils/typeid';
25+
import { nanoIdToken } from '@u22n/utils/zodSchemas';
2626
import { isAccountAdminOfOrg } from '@platform/utils/account';
2727
import { TRPCError } from '@trpc/server';
2828
import { emailIdentityExternalRouter } from './emailIdentityExternalRouter';

apps/platform/trpc/routers/orgRouter/orgCrudRouter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
orgMemberProfiles,
99
accounts
1010
} from '@u22n/database/schema';
11-
import { typeIdGenerator } from '@u22n/utils';
11+
import { typeIdGenerator } from '@u22n/utils/typeid';
1212
import { TRPCError } from '@trpc/server';
1313
import { blockedUsernames, reservedUsernames } from '@platform/utils/signup';
1414

apps/platform/trpc/routers/orgRouter/setup/profileRouter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { z } from 'zod';
22
import { router, orgProcedure } from '@platform/trpc/trpc';
33
import { eq } from '@u22n/database/orm';
44
import { orgs } from '@u22n/database/schema';
5-
import { typeIdValidator } from '@u22n/utils';
5+
import { typeIdValidator } from '@u22n/utils/typeid';
66
import { isAccountAdminOfOrg } from '@platform/utils/account';
77
import { TRPCError } from '@trpc/server';
88

apps/platform/trpc/routers/orgRouter/users/invitesRouter.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,8 @@ import {
1717
orgMemberProfiles,
1818
accounts
1919
} from '@u22n/database/schema';
20-
import {
21-
nanoIdToken,
22-
typeIdGenerator,
23-
typeIdValidator,
24-
zodSchemas
25-
} from '@u22n/utils';
20+
import { typeIdGenerator, typeIdValidator } from '@u22n/utils/typeid';
21+
import { nanoIdToken, zodSchemas } from '@u22n/utils/zodSchemas';
2622
import { refreshOrgShortCodeCache } from '@platform/utils/orgShortCode';
2723
import { isAccountAdminOfOrg } from '@platform/utils/account';
2824
import { TRPCError } from '@trpc/server';

apps/platform/trpc/routers/orgRouter/users/teamsHandler.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
teams,
99
orgMembers
1010
} from '@u22n/database/schema';
11-
import { typeIdGenerator, type TypeId } from '@u22n/utils';
11+
import { typeIdGenerator, type TypeId } from '@u22n/utils/typeid';
1212

1313
export async function addOrgMemberToTeamHandler({
1414
orgId,

apps/platform/trpc/routers/orgRouter/users/teamsRouter.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import { z } from 'zod';
22
import { router, orgProcedure } from '@platform/trpc/trpc';
33
import { eq, and } from '@u22n/database/orm';
44
import { teams } from '@u22n/database/schema';
5-
import { typeIdGenerator, typeIdValidator } from '@u22n/utils';
6-
import { uiColors } from '@u22n/utils';
5+
import { typeIdGenerator, typeIdValidator } from '@u22n/utils/typeid';
6+
import { uiColors } from '@u22n/utils/colors';
77
import { isAccountAdminOfOrg } from '../../../../utils/account';
88
import { TRPCError } from '@trpc/server';
99
import { addOrgMemberToTeamHandler } from './teamsHandler';

apps/platform/trpc/routers/userRouter/addressRouter.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ import {
1111
emailRoutingRulesDestinations
1212
} from '@u22n/database/schema';
1313
import { orgMembers } from '@u22n/database/schema';
14-
import { nanoIdToken, typeIdGenerator, typeIdValidator } from '@u22n/utils';
14+
import { typeIdGenerator, typeIdValidator } from '@u22n/utils/typeid';
15+
import { nanoIdToken } from '@u22n/utils/zodSchemas';
1516
import { env } from '@platform/env';
1617

1718
export const addressRouter = router({

apps/platform/trpc/routers/userRouter/profileRouter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { z } from 'zod';
22
import { router, accountProcedure } from '@platform/trpc/trpc';
33
import { and, eq } from '@u22n/database/orm';
44
import { orgMemberProfiles, orgs, orgMembers } from '@u22n/database/schema';
5-
import { typeIdValidator } from '@u22n/utils';
5+
import { typeIdValidator } from '@u22n/utils/typeid';
66
import { TRPCError } from '@trpc/server';
77

88
export const profileRouter = router({

apps/platform/trpc/routers/userRouter/securityRouter.ts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ import { z } from 'zod';
88
import { router, accountProcedure } from '@platform/trpc/trpc';
99
import { and, eq } from '@u22n/database/orm';
1010
import { accounts, authenticators, sessions } from '@u22n/database/schema';
11+
import { typeIdValidator } from '@u22n/utils/typeid';
12+
import { nanoIdToken, zodSchemas } from '@u22n/utils/zodSchemas';
1113
import {
12-
nanoIdToken,
13-
typeIdValidator,
14-
zodSchemas,
15-
calculatePasswordStrength,
16-
strongPasswordSchema
17-
} from '@u22n/utils';
14+
strongPasswordSchema,
15+
calculatePasswordStrength
16+
} from '@u22n/utils/password';
17+
import { datePlus } from '@u22n/utils/ms';
1818
import { TRPCError } from '@trpc/server';
1919
import { deleteCookie, getCookie, setCookie } from 'hono/cookie';
2020
import type {
@@ -28,7 +28,6 @@ import { TOTPController, createTOTPKeyURI } from 'oslo/otp';
2828
import { lucia } from '@platform/utils/auth';
2929
import { storage } from '@platform/storage';
3030
import { env } from '@platform/env';
31-
import { datePlus } from 'itty-time';
3231

3332
const authStorage = storage.auth;
3433

apps/platform/utils/auth.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
TimeSpan
66
} from 'lucia';
77
import { UnInboxDBAdapter } from './auth/adapter';
8-
import type { TypeId } from '@u22n/utils';
8+
import type { TypeId } from '@u22n/utils/typeid';
99
import { env } from '@platform/env';
1010

1111
const adapter = new UnInboxDBAdapter();

apps/platform/utils/auth/adapter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { db } from '@u22n/database';
33
import { eq, inArray, lte } from '@u22n/database/orm';
44
import { sessions, accounts } from '@u22n/database/schema';
55
import { storage } from '@platform/storage';
6-
import { typeIdGenerator } from '@u22n/utils';
6+
import { typeIdGenerator } from '@u22n/utils/typeid';
77

88
const sessionStorage = storage.session;
99

apps/platform/utils/auth/passkeyUtils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { db } from '@u22n/database';
33
import { accounts, authenticators } from '@u22n/database/schema';
44
import type { AuthenticatorTransportFuture } from '@simplewebauthn/types';
55
import { isoBase64URL } from '@simplewebauthn/server/helpers';
6-
import { typeIdGenerator } from '@u22n/utils';
6+
import { typeIdGenerator } from '@u22n/utils/typeid';
77

88
export type CredentialDeviceType = 'singleDevice' | 'multiDevice';
99
export interface Authenticator {

apps/platform/utils/realtime.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { db } from '@u22n/database';
22
import { eq, inArray } from '@u22n/database/orm';
33
import { convoEntries, convoParticipants, convos } from '@u22n/database/schema';
44
import RealtimeServer from '@u22n/realtime/server';
5-
import type { TypeId } from '@u22n/utils';
5+
import type { TypeId } from '@u22n/utils/typeid';
66
import { env } from '@platform/env';
77

88
export const realtime = new RealtimeServer({

apps/platform/utils/session.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { UAParser } from 'ua-parser-js';
22
import { lucia } from './auth';
3-
import type { TypeId } from '@u22n/utils';
3+
import type { TypeId } from '@u22n/utils/typeid';
44
import type { Context } from 'hono';
55
import { setCookie } from 'hono/cookie';
66
import { db } from '@u22n/database';

apps/storage/api/avatar.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import type { Ctx } from '../ctx';
33
import { checkSignedIn } from '../middlewares';
44
import { zValidator } from '@hono/zod-validator';
55
import { z } from 'zod';
6-
import { typeIdValidator, type TypeId } from '@u22n/utils';
6+
import { typeIdValidator, type TypeId } from '@u22n/utils/typeid';
77
import {
88
orgMemberProfiles,
99
orgMembers,

apps/storage/api/internalPresign.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { Hono } from 'hono';
22
import type { Ctx } from '../ctx';
33
import { checkAuthorizedService } from '../middlewares';
44
import { zValidator } from '@hono/zod-validator';
5-
import { typeIdGenerator } from '@u22n/utils';
5+
import { typeIdGenerator } from '@u22n/utils/typeid';
66
import { PutObjectCommand } from '@aws-sdk/client-s3';
77
import { env } from '../env';
88
import { getSignedUrl } from '@aws-sdk/s3-request-presigner';

0 commit comments

Comments
 (0)