@m5kdev/backend 0.4.0 → 0.6.0

package/dist/src/modules/tag/tag.repository.js

@@ -122,34 +122,35 @@ class TagRepository extends base_repository_1.BaseTableRepository {
         });
     }
     async listTaggings(input, tx) {
-        return this.throwableAsync(async () => {
-            const db = tx ?? this.orm;
-            const filters = [(0, drizzle_orm_1.eq)(this.schema.taggings.resourceType, input.resourceType)];
-            if (input.resourceIds?.length) {
-                filters.push((0, drizzle_orm_1.inArray)(this.schema.taggings.resourceId, input.resourceIds));
-            }
-            const rows = await db
-                .select()
-                .from(this.schema.taggings)
-                .where((0, drizzle_orm_1.and)(...filters));
-            return (0, neverthrow_1.ok)(rows);
-        });
+        const db = tx ?? this.orm;
+        const filters = [(0, drizzle_orm_1.eq)(this.schema.taggings.resourceType, input.resourceType)];
+        if (input.resourceIds?.length) {
+            filters.push((0, drizzle_orm_1.inArray)(this.schema.taggings.resourceId, input.resourceIds));
+        }
+        const rows = await this.throwableQuery(() => db
+            .select()
+            .from(this.schema.taggings)
+            .where((0, drizzle_orm_1.and)(...filters)));
+        if (rows.isErr())
+            return (0, neverthrow_1.err)(rows.error);
+        return (0, neverthrow_1.ok)(rows.value);
     }
     async list(input, tx) {
-        return this.throwableAsync(async () => {
-            const db = tx ?? this.orm;
-            const conditions = this.getConditionBuilder(this.table);
-            conditions.push((0, drizzle_orm_1.isNull)(this.table.deletedAt));
-            conditions.applyFilters(input);
-            if (input?.assignableTo) {
-                conditions.push(this.helpers.arrayContains(this.table.assignableTo, [input.assignableTo]));
-            }
-            const whereClause = conditions.join();
-            const rowsQuery = this.withSortingAndPagination(db.select().from(this.table).where(whereClause), input || {});
-            const countQuery = db.select({ count: (0, drizzle_orm_1.count)() }).from(this.table).where(whereClause);
-            const [rows, [totalResult]] = await Promise.all([rowsQuery, countQuery]);
-            return (0, neverthrow_1.ok)({ rows, total: totalResult?.count ?? 0 });
-        });
+        const db = tx ?? this.orm;
+        const conditions = this.getConditionBuilder(this.table);
+        conditions.push((0, drizzle_orm_1.isNull)(this.table.deletedAt));
+        conditions.applyFilters(input);
+        if (input?.assignableTo) {
+            conditions.push(this.helpers.arrayContains(this.table.assignableTo, [input.assignableTo]));
+        }
+        const whereClause = conditions.join();
+        const rowsQuery = this.withSortingAndPagination(db.select().from(this.table).where(whereClause), input || {});
+        const countQuery = db.select({ count: (0, drizzle_orm_1.count)() }).from(this.table).where(whereClause);
+        const countResult = await this.throwableQuery(() => Promise.all([rowsQuery, countQuery]));
+        if (countResult.isErr())
+            return (0, neverthrow_1.err)(countResult.error);
+        const [rows, [totalResult]] = countResult.value;
+        return (0, neverthrow_1.ok)({ rows, total: totalResult?.count ?? 0 });
     }
 }
 exports.TagRepository = TagRepository;

package/dist/src/modules/tag/tag.service.d.ts

@@ -1,8 +1,6 @@
-import type { TagCreateSchema, TagDeleteSchema, TagLinkSchema, TagListInputSchema, TagListOutputSchema, TagListSchema, TagSchema, TagUpdateSchema } from "@m5kdev/commons/modules/tag/tag.schema";
-import type { User } from "../auth/auth.lib";
+import type { TagDeleteSchema, TagLinkSchema, TagListInputSchema, TagListOutputSchema, TagListSchema, TagSchema } from "@m5kdev/commons/modules/tag/tag.schema";
 import type { ServerResultAsync } from "../base/base.dto";
 import { BaseService } from "../base/base.service";
-import type { TaggingSelectOutputResult, TagSelectOutputResult } from "./tag.dto";
 import type { TagRepository } from "./tag.repository";
 export declare class TagService extends BaseService<{
     tag: TagRepository;
@@ -18,20 +16,93 @@ export declare class TagService extends BaseService<{
         resourceType: string;
         resourceId: string;
     }[]>>;
-    create(data: TagCreateSchema, { user }: {
-        user: User;
-    }): Promise<TagSelectOutputResult>;
-    update(data: TagUpdateSchema, { user }: {
-        user: User;
-    }): Promise<TagSelectOutputResult>;
-    link(data: TagLinkSchema, { user }: {
-        user: User;
-    }): Promise<TaggingSelectOutputResult>;
+    readonly create: import("../base/base.procedure").ServiceProcedure<{
+        name: string;
+        color: string;
+        assignableTo: string[];
+        organizationId?: string | undefined;
+        teamId?: string | undefined;
+        resourceType?: string | undefined;
+        resourceId?: string | undefined;
+    }, {
+        user?: import("../auth/auth.lib").User | null;
+        session?: import("../auth/auth.lib").Session | null;
+    } & Record<string, unknown> & import("../auth/auth.lib").Context, {
+        id: string;
+        createdAt: Date;
+        updatedAt: Date | null;
+        deletedAt: Date | null;
+        userId: string;
+        organizationId: string | null;
+        teamId: string | null;
+        name: string;
+        color: string | null;
+        type: string | null;
+        isEnabled: boolean;
+        parentId: string | null;
+        assignableTo: string[];
+    }>;
+    readonly update: import("../base/base.procedure").ServiceProcedure<{
+        id: string;
+        name?: string | undefined;
+        color?: string | undefined;
+        assignableTo?: string[] | undefined;
+    }, {
+        user?: import("../auth/auth.lib").User | null;
+        session?: import("../auth/auth.lib").Session | null;
+    } & Record<string, unknown> & import("../auth/auth.lib").Context, {
+        id: string;
+        createdAt: Date;
+        updatedAt: Date | null;
+        deletedAt: Date | null;
+        userId: string;
+        organizationId: string | null;
+        teamId: string | null;
+        name: string;
+        color: string | null;
+        type: string | null;
+        isEnabled: boolean;
+        parentId: string | null;
+        assignableTo: string[];
+    }>;
+    readonly link: import("../base/base.procedure").ServiceProcedure<{
+        tagId: string;
+        resourceType: string;
+        resourceId: string;
+    }, {
+        user?: import("../auth/auth.lib").User | null;
+        session?: import("../auth/auth.lib").Session | null;
+    } & Record<string, unknown> & import("../auth/auth.lib").Context, {
+        id: string;
+        createdAt: Date;
+        tagId: string;
+        resourceType: string;
+        resourceId: string;
+    }>;
     linkBulk(data: TagLinkSchema[]): ServerResultAsync<TagSchema[]>;
     set(data: TagLinkSchema[]): ServerResultAsync<TagSchema[]>;
-    unlink(data: TagLinkSchema, { user }: {
-        user: User;
-    }): Promise<TagSelectOutputResult>;
+    readonly unlink: import("../base/base.procedure").ServiceProcedure<{
+        tagId: string;
+        resourceType: string;
+        resourceId: string;
+    }, {
+        user?: import("../auth/auth.lib").User | null;
+        session?: import("../auth/auth.lib").Session | null;
+    } & Record<string, unknown> & import("../auth/auth.lib").Context, {
+        id: string;
+        createdAt: Date;
+        updatedAt: Date | null;
+        deletedAt: Date | null;
+        userId: string;
+        organizationId: string | null;
+        teamId: string | null;
+        name: string;
+        color: string | null;
+        type: string | null;
+        isEnabled: boolean;
+        parentId: string | null;
+        assignableTo: string[];
+    }>;
     delete(data: TagDeleteSchema): ServerResultAsync<{
         id: string;
     }>;

package/dist/src/modules/tag/tag.service.js

@@ -9,24 +9,32 @@ class TagService extends base_service_1.BaseService {
     async listTaggings(input) {
         return this.repository.tag.listTaggings(input);
     }
-    async create(data, { user }) {
-        return this.repository.tag.create({ ...data, userId: user.id });
-    }
-    async update(data, { user }) {
-        return this.repository.tag.update({ ...data, userId: user.id });
-    }
-    async link(data, { user }) {
-        return this.repository.tag.link({ ...data, userId: user.id });
-    }
+    create = this.procedure("create")
+        .requireAuth()
+        .handle(({ input, ctx }) => {
+        return this.repository.tag.create({ ...input, userId: ctx.user.id });
+    });
+    update = this.procedure("update")
+        .requireAuth()
+        .handle(({ input, ctx }) => {
+        return this.repository.tag.update({ ...input, userId: ctx.user.id });
+    });
+    link = this.procedure("link")
+        .requireAuth()
+        .handle(({ input, ctx }) => {
+        return this.repository.tag.link({ ...input, userId: ctx.user.id });
+    });
     async linkBulk(data) {
         return this.repository.tag.linkBulk(data);
     }
     async set(data) {
         return this.repository.tag.set(data);
     }
-    async unlink(data, { user }) {
-        return this.repository.tag.unlink({ ...data, userId: user.id });
-    }
+    unlink = this.procedure("unlink")
+        .requireAuth()
+        .handle(({ input, ctx }) => {
+        return this.repository.tag.unlink({ ...input, userId: ctx.user.id });
+    });
     async delete(data) {
         return this.repository.tag.softDeleteById(data.id);
     }

package/dist/src/modules/tag/tag.trpc.d.ts

@@ -11,11 +11,11 @@ export declare function createTagTRPC({ router, privateProcedure: procedure }: T
             page?: number | undefined;
             limit?: number | undefined;
             sort?: string | undefined;
-            order?: "desc" | "asc" | undefined;
+            order?: "asc" | "desc" | undefined;
             filters?: {
                 columnId: string;
                 type: "string" | "number" | "boolean" | "date" | "enum";
-                method: "intersect" | "contains" | "equals" | "starts_with" | "ends_with" | "greater_than" | "less_than" | "on" | "between" | "before" | "after" | "oneOf" | "isEmpty" | "isNotEmpty" | "is_null" | "is_not_null";
+                method: "on" | "contains" | "equals" | "starts_with" | "ends_with" | "greater_than" | "less_than" | "between" | "before" | "after" | "oneOf" | "intersect" | "isEmpty" | "isNotEmpty" | "is_null" | "is_not_null";
                 value: string | number | boolean | string[];
                 valueTo?: string | undefined;
                 endColumnId?: string | undefined;
@@ -48,7 +48,7 @@ export declare function createTagTRPC({ router, privateProcedure: procedure }: T
             resourceIds?: {
                 columnId: string;
                 type: "string" | "number" | "boolean" | "date" | "enum";
-                method: "intersect" | "contains" | "equals" | "starts_with" | "ends_with" | "greater_than" | "less_than" | "on" | "between" | "before" | "after" | "oneOf" | "isEmpty" | "isNotEmpty" | "is_null" | "is_not_null";
+                method: "on" | "contains" | "equals" | "starts_with" | "ends_with" | "greater_than" | "less_than" | "between" | "before" | "after" | "oneOf" | "intersect" | "isEmpty" | "isNotEmpty" | "is_null" | "is_not_null";
                 value: string | number | boolean | string[];
                 valueTo?: string | undefined;
                 endColumnId?: string | undefined;

package/dist/src/types.d.ts

@@ -147,8 +147,8 @@ export declare const createAuthTRPCRouter: <MastraInstance extends Mastra>(trpcM
         listAdminWaitlist: import("@trpc/server").TRPCQueryProcedure<{
             input: void;
             output: {
-                name: string | null;
                 id: string;
+                name: string | null;
                 email: string | null;
                 createdAt: Date;
                 updatedAt: Date | null;
@@ -161,8 +161,8 @@ export declare const createAuthTRPCRouter: <MastraInstance extends Mastra>(trpcM
                 email: string;
             };
             output: {
-                name: string | null;
                 id: string;
+                name: string | null;
                 email: string | null;
                 createdAt: Date;
                 updatedAt: Date | null;
@@ -192,8 +192,8 @@ export declare const createAuthTRPCRouter: <MastraInstance extends Mastra>(trpcM
                 id: string;
             };
             output: {
-                name: string | null;
                 id: string;
+                name: string | null;
                 email: string | null;
                 createdAt: Date;
                 updatedAt: Date | null;
@@ -206,8 +206,8 @@ export declare const createAuthTRPCRouter: <MastraInstance extends Mastra>(trpcM
                 id: string;
             };
             output: {
-                name: string | null;
                 id: string;
+                name: string | null;
                 email: string | null;
                 createdAt: Date;
                 updatedAt: Date | null;
@@ -220,8 +220,8 @@ export declare const createAuthTRPCRouter: <MastraInstance extends Mastra>(trpcM
                 email: string;
             };
             output: {
-                name: string | null;
                 id: string;
+                name: string | null;
                 email: string | null;
                 createdAt: Date;
                 updatedAt: Date | null;

package/dist/src/utils/trpc.d.ts

@@ -18,11 +18,11 @@ export declare function createAuthContext(auth: BetterAuth): ({ req }: CreateExp
         id: string;
         createdAt: Date;
         updatedAt: Date;
-        userId: string;
         expiresAt: Date;
         token: string;
         ipAddress: string | null;
         userAgent: string | null;
+        userId: string;
         impersonatedBy: string | null;
         activeOrganizationId: string | null;
         activeOrganizationRole: string | null;
@@ -30,15 +30,14 @@ export declare function createAuthContext(auth: BetterAuth): ({ req }: CreateExp
         activeTeamRole: string | null;
     };
     user: {
-        email: string;
+        id: string;
         name: string;
-        role: string | null;
+        email: string;
+        emailVerified: boolean;
         image: string | null;
-        metadata: Record<string, unknown>;
-        id: string;
         createdAt: Date;
         updatedAt: Date;
-        emailVerified: boolean;
+        role: string | null;
         banned: boolean | null;
         banReason: string | null;
         banExpires: Date | null;
@@ -47,6 +46,7 @@ export declare function createAuthContext(auth: BetterAuth): ({ req }: CreateExp
         paymentPlanTier: string | null;
         paymentPlanExpiresAt: Date | null;
         preferences: string | null;
+        metadata: Record<string, unknown>;
         onboarding: number | null;
         flags: string | null;
     };