@appxdigital/appx-core 0.1.82 → 0.1.83

package/dist/modules/auth/auth.controller.d.ts

@@ -2,7 +2,7 @@ import { AuthService } from './auth.service';
 import { RegisterDto } from './dto/register.dto';
 import { Request, Response } from 'express';
 export declare class AuthController {
-    private readonly authService;
+    protected readonly authService: AuthService;
     constructor(authService: AuthService);
     register(registerDto: RegisterDto): Promise<{
         message: string;

package/dist/modules/auth/auth.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth.controller.d.ts","sourceRoot":"","sources":["../../../src/modules/auth/auth.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAC,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAG/C,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;AAI1C,qBACa,cAAc;IACX,OAAO,CAAC,QAAQ,CAAC,WAAW;gBAAX,WAAW,EAAE,WAAW;IAG/C,QAAQ,CAAS,WAAW,EAAE,WAAW;;;;IAMzC,KAAK,CAAQ,GAAG,EAAE,OAAO,EAAS,GAAG,EAAE,QAAQ;IAW/C,MAAM,CAAQ,GAAG,EAAE,OAAO,EAAS,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAoBhE,EAAE,CAAQ,GAAG,EAAE,OAAO;;;IAQtB,iBAAiB,CAAQ,GAAG,EAAE,OAAO;;;IAOrC,gBAAgB,CAAQ,GAAG,EAAE,OAAO,EAAS,GAAG,EAAE,QAAQ;IAK1D,cAAc,CAAkB,MAAM,EAAE,MAAM,EAAS,GAAG,EAAE,OAAO;;;IAUnE,oBAAoB,CACF,SAAS,EAAE,MAAM,EAC9B,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ;IAgBlB,QAAQ,CAAQ,GAAG,EAAE,OAAO;;;;;IAM5B,aAAa,CAAQ,GAAG,EAAE,OAAO;;;;IAOjC,SAAS,CAAQ,GAAG,EAAE,OAAO;;;CAQtC"}
+{"version":3,"file":"auth.controller.d.ts","sourceRoot":"","sources":["../../../src/modules/auth/auth.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAC,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAG/C,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;AAI1C,qBACa,cAAc;IACX,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW;gBAAxB,WAAW,EAAE,WAAW;IAGjD,QAAQ,CAAS,WAAW,EAAE,WAAW;;;;IAMzC,KAAK,CAAQ,GAAG,EAAE,OAAO,EAAS,GAAG,EAAE,QAAQ;IAW/C,MAAM,CAAQ,GAAG,EAAE,OAAO,EAAS,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAoBhE,EAAE,CAAQ,GAAG,EAAE,OAAO;;;IAQtB,iBAAiB,CAAQ,GAAG,EAAE,OAAO;;;IAOrC,gBAAgB,CAAQ,GAAG,EAAE,OAAO,EAAS,GAAG,EAAE,QAAQ;IAK1D,cAAc,CAAkB,MAAM,EAAE,MAAM,EAAS,GAAG,EAAE,OAAO;;;IAUnE,oBAAoB,CACF,SAAS,EAAE,MAAM,EAC9B,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ;IAgBlB,QAAQ,CAAQ,GAAG,EAAE,OAAO;;;;;IAM5B,aAAa,CAAQ,GAAG,EAAE,OAAO;;;;IAOjC,SAAS,CAAQ,GAAG,EAAE,OAAO;;;CAQtC"}

package/dist/modules/auth/auth.service.d.ts

@@ -6,10 +6,10 @@ import { Request, Response } from 'express';
 import { JwtService } from "@nestjs/jwt";
 import { User } from "@prisma/client";
 export declare class AuthService {
-    private readonly userService;
-    private prisma;
-    private readonly jwtService;
-    private configService;
+    protected readonly userService: UserService;
+    protected readonly prisma: PrismaService;
+    protected readonly jwtService: JwtService;
+    protected readonly configService: ConfigService;
     private readonly sessionCookieName;
     constructor(userService: UserService, prisma: PrismaService, jwtService: JwtService, configService: ConfigService);
     register(registerDto: RegisterDto): Promise<{

package/dist/modules/auth/auth.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth.service.d.ts","sourceRoot":"","sources":["../../../src/modules/auth/auth.service.ts"],"names":[],"mappings":"AAOA,OAAO,EAAC,WAAW,EAAC,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAC,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAE/C,OAAO,EAAC,aAAa,EAAC,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAC,aAAa,EAAC,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;AAC1C,OAAO,EAAC,UAAU,EAAC,MAAM,aAAa,CAAC;AAGvC,OAAO,EAAC,IAAI,EAAC,MAAM,gBAAgB,CAAC;AAEpC,qBACa,WAAW;IAIhB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,aAAa;IANzB,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAS;gBAGtB,WAAW,EAAE,WAAW,EACjC,MAAM,EAAE,aAAa,EACZ,UAAU,EAAE,UAAU,EAC/B,aAAa,EAAE,aAAa;IAKlC,QAAQ,CAAC,WAAW,EAAE,WAAW;;cAaE,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC;;IAWzD,KAAK,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,GAAG,CAAA;KAAC,CAAC;IA8B1D,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBlD,YAAY,CACd,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,GACtB,OAAO,CAAC,GAAG,CAAC;IAuBT,cAAc,CAAC,GAAG,EAAE,OAAO;IAW3B,iBAAiB,CAAC,GAAG,EAAE,OAAO;IAW9B,oBAAoB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ;IA0BhD,mBAAmB,CAAC,MAAM,EAAE,MAAM;IAMlC,oBAAoB,CAAC,SAAS,EAAE,MAAM;IAOtC,kBAAkB,CAAC,OAAO,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;YAQtC,cAAc;IAkCtB,aAAa,CAAC,yBAAyB,EAAE,GAAG,GAAG,OAAO,CAAC;QAAC,YAAY,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAA;KAAC,CAAC;IAuB3G,OAAO,CAAC,WAAW;IAUb,QAAQ,CAAC,iBAAiB,EAAE,GAAG,GAAG,OAAO,CAAC;QAAC,YAAY,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,GAAG,CAAA;KAAC,CAAC;IAUnG,0BAA0B,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAUlE"}
+{"version":3,"file":"auth.service.d.ts","sourceRoot":"","sources":["../../../src/modules/auth/auth.service.ts"],"names":[],"mappings":"AAOA,OAAO,EAAC,WAAW,EAAC,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAC,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAE/C,OAAO,EAAC,aAAa,EAAC,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAC,aAAa,EAAC,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;AAC1C,OAAO,EAAC,UAAU,EAAC,MAAM,aAAa,CAAC;AAGvC,OAAO,EAAC,IAAI,EAAC,MAAM,gBAAgB,CAAC;AAEpC,qBACa,WAAW;IAIhB,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW;IAC3C,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,aAAa;IACxC,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,UAAU;IACzC,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa;IANnD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAS;gBAGpB,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,aAAa,EACrB,UAAU,EAAE,UAAU,EACtB,aAAa,EAAE,aAAa;IAK7C,QAAQ,CAAC,WAAW,EAAE,WAAW;;cAaE,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC;;IAWzD,KAAK,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,GAAG,CAAA;KAAC,CAAC;IA8B1D,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBlD,YAAY,CACd,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,GACtB,OAAO,CAAC,GAAG,CAAC;IAuBT,cAAc,CAAC,GAAG,EAAE,OAAO;IAW3B,iBAAiB,CAAC,GAAG,EAAE,OAAO;IAW9B,oBAAoB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ;IA0BhD,mBAAmB,CAAC,MAAM,EAAE,MAAM;IAMlC,oBAAoB,CAAC,SAAS,EAAE,MAAM;IAOtC,kBAAkB,CAAC,OAAO,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;YAQtC,cAAc;IAkCtB,aAAa,CAAC,yBAAyB,EAAE,GAAG,GAAG,OAAO,CAAC;QAAC,YAAY,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAA;KAAC,CAAC;IAuB3G,OAAO,CAAC,WAAW;IAUb,QAAQ,CAAC,iBAAiB,EAAE,GAAG,GAAG,OAAO,CAAC;QAAC,YAAY,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,GAAG,CAAA;KAAC,CAAC;IAUnG,0BAA0B,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAUlE"}

package/dist/modules/user/user.service.d.ts

@@ -1,8 +1,9 @@
 import { PrismaService } from '../../prisma/prisma.service';
 import { UserCreateInput } from '../../common/interfaces/user.interface';
 import { User } from '@prisma/client';
-export declare class UserService {
-    private prisma;
+import { CoreService } from "../core/core.service";
+export declare class UserService extends CoreService<User> {
+    protected prisma: PrismaService;
     constructor(prisma: PrismaService);
     createUser(createUserInput: UserCreateInput): Promise<User>;
     findByField(field: string, value: any): Promise<any>;

package/dist/modules/user/user.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"user.service.d.ts","sourceRoot":"","sources":["../../../src/modules/user/user.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,aAAa,EAAC,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAC,eAAe,EAAC,MAAM,wCAAwC,CAAC;AAEvE,OAAO,EAAC,IAAI,EAAC,MAAM,gBAAgB,CAAC;AAEpC,qBACa,WAAW;IACR,OAAO,CAAC,MAAM;gBAAN,MAAM,EAAE,aAAa;IAEnC,UAAU,CAAC,eAAe,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAM3D,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IAUpD,WAAW,CAAC,KAAK,EAAE,MAAM;CAYlC"}
+{"version":3,"file":"user.service.d.ts","sourceRoot":"","sources":["../../../src/modules/user/user.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,aAAa,EAAC,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAC,eAAe,EAAC,MAAM,wCAAwC,CAAC;AAEvE,OAAO,EAAC,IAAI,EAAC,MAAM,gBAAgB,CAAC;AACpC,OAAO,EAAC,WAAW,EAAC,MAAM,sBAAsB,CAAC;AAEjD,qBACa,WAAY,SAAQ,WAAW,CAAC,IAAI,CAAC;IAClC,SAAS,CAAC,MAAM,EAAE,aAAa;gBAArB,MAAM,EAAE,aAAa;IAIrC,UAAU,CAAC,eAAe,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAM3D,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IAUpD,WAAW,CAAC,KAAK,EAAE,MAAM;CAYlC"}

package/dist/modules/user/user.service.js

@@ -12,8 +12,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UserService = void 0;
 const common_1 = require("@nestjs/common");
 const prisma_service_1 = require("../../prisma/prisma.service");
-let UserService = class UserService {
+const core_service_1 = require("../core/core.service");
+let UserService = class UserService extends core_service_1.CoreService {
     constructor(prisma) {
+        super(prisma.model.user);
         this.prisma = prisma;
     }
     async createUser(createUserInput) {

package/dist/prisma/prisma.service.d.ts

@@ -6,7 +6,6 @@ export declare class PrismaService {
     private readonly permissionsConfig;
     private fieldConfigs;
     prismaClient: PrismaClient;
-    private schemaPath;
     constructor(prismaClient: PrismaClient, permissionsConfig: PermissionsConfigType);
     $transaction<T>(fn: (prisma: Prisma.TransactionClient) => Promise<T>): any;
     proxyModels(): void;
@@ -25,26 +24,6 @@ export declare class PrismaService {
      * including custom annotations (e.g., @Role(CLIENT)) and enums.
      */
     parseSchema(): void;
-    /**
-     * Extracts enums from the Prisma schema.
-     * @param schema - The raw schema content as a string.
-     * @returns An array of enum names.
-     */
-    private extractEnumsFromSchema;
-    /**
-     * Extracts models and custom annotations from the Prisma schema.
-     * @param schema - The raw schema content as a string.
-     * @param enums - An array of enum names for determining scalar fields.
-     * @returns A parsed object with models and their custom annotations.
-     */
-    private extractModelsFromSchema;
-    /**
-     * Extracts fields from the model and looks for custom annotations like @Role.
-     * @param modelBody - The body of the model in the schema.
-     * @returns A parsed object with fields and their custom annotations.
-     */
-    private extractFieldsFromModel;
-    private isScalarType;
     /**
      * Applies field omission logic based on the user's role.
      * Fields that the user does not have permission to access are removed from the query.
@@ -69,47 +48,7 @@ export declare class PrismaService {
      * @throws ForbiddenException if no valid `where` conditions are present after applying permissions.
      */
     private applyWhereConditions;
-    /**
-     * Extracts the `where` conditions from a `select` object.
-     * Documentation specifies this structure, however depending on the relation it might not be possible.
-     const result = await prisma.user.findFirst({
-     select: {
-     posts: {
-     where: {
-     published: false,
-     },
-     select: {
-     title: true,
-     },
-     },
-     },
-     })
-
-     * Instead, do it this way:
-     const result = await prisma.user.findFirst({
-     where: {
-     posts: {
-     published: false,
-     },
-     },
-     select: {
-     posts: {
-     select: {
-     title: true,
-     },
-     },
-     },
-     })
-
-     */
-    private extractWhereFromSelect;
-    getRelationType(parentModel: string, relatedField: string): {
-        relation: null;
-        identifier: null;
-    } | {
-        relation: string;
-        identifier: any;
-    };
+    getRelationType(parentModel: string, relatedField: string): any;
     /**
      * Builds dynamic conditions based on the type of clause (OR, AND, or field conditions).
      * Each condition is processed, and placeholders (like `$USER_ID`) are replaced with actual values.

package/dist/prisma/prisma.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prisma.service.d.ts","sourceRoot":"","sources":["../../src/prisma/prisma.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,MAAM,EAAE,YAAY,EAAC,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAC,qBAAqB,EAAC,MAAM,yCAAyC,CAAC;AAI9E,OAAO,KAAK,EAAC,YAAY,IAAI,aAAa,EAAC,MAAM,gBAAgB,CAAC;AAElE,KAAK,QAAQ,GAAG,MAAM,aAAa,CAAC;AAEpC,qBACa,aAAa;IAOY,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IANpE,OAAO,CAAC,YAAY,CAA2B;IAC/C,YAAY,EAAE,YAAY,CAAC;IAC3B,OAAO,CAAC,UAAU,CAAc;gBAG5B,YAAY,EAAE,YAAY,EACqB,iBAAiB,EAAE,qBAAqB;IAO3F,YAAY,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,iBAAiB,KAAK,OAAO,CAAC,CAAC,CAAC;IAIpE,WAAW;IA8CX;;;;OAIG;IACH,gBAAgB,CAAC,CAAC,SAAS,QAAQ,EAAE,KAAK,EAAE,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC;IAYhE,IAAI,KAAK,IAAI,aAAa,CAUzB;IAED,IAAI,IAAI,IAAI,aAAa,CAAC,MAAM,CAAC,CAEhC;IAED,IAAI,OAAO,IAAI,aAAa,CAAC,SAAS,CAAC,CAEtC;IAED,IAAI,gBAAgB,QAEnB;IAED;;;OAGG;IACH,WAAW;IASX;;;;OAIG;IACH,OAAO,CAAC,sBAAsB;IAU9B;;;;;OAKG;IACH,OAAO,CAAC,uBAAuB;IA4B/B;;;;OAIG;IACH,OAAO,CAAC,sBAAsB;IAsD9B,OAAO,CAAC,YAAY;IAMpB;;;;;;;;OAQG;IACH,OAAO,CAAC,kBAAkB;IAiC1B,IAAI,2BAA2B,QAM9B;IAED;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,oBAAoB;IAkG5B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAgCG;IACH,OAAO,CAAC,sBAAsB;IAuB9B,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;;;;;;;IAoCzD;;;;;;;OAOG;IACH,OAAO,CAAC,eAAe;IAgBvB;;;;;;;OAOG;IACH,OAAO,CAAC,mBAAmB;IA2B3B;;;;;;;OAOG;IACH,OAAO,CAAC,eAAe;IAQvB;;;;;;;;;OASG;IACH,OAAO,CAAC,iBAAiB;IAkDzB;;;;;;;;OAQG;IACH,OAAO,CAAC,mBAAmB;CAiB9B"}
+{"version":3,"file":"prisma.service.d.ts","sourceRoot":"","sources":["../../src/prisma/prisma.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,MAAM,EAAE,YAAY,EAAC,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAC,qBAAqB,EAAC,MAAM,yCAAyC,CAAC;AAI9E,OAAO,KAAK,EAAC,YAAY,IAAI,aAAa,EAAC,MAAM,gBAAgB,CAAC;AAGlE,KAAK,QAAQ,GAAG,MAAM,aAAa,CAAC;AAEpC,qBACa,aAAa;IAMY,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IALpE,OAAO,CAAC,YAAY,CAA2B;IAC/C,YAAY,EAAE,YAAY,CAAC;gBAGvB,YAAY,EAAE,YAAY,EACqB,iBAAiB,EAAE,qBAAqB;IAO3F,YAAY,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,iBAAiB,KAAK,OAAO,CAAC,CAAC,CAAC;IAIpE,WAAW;IA6CX;;;;OAIG;IACH,gBAAgB,CAAC,CAAC,SAAS,QAAQ,EAAE,KAAK,EAAE,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC;IAYhE,IAAI,KAAK,IAAI,aAAa,CAUzB;IAED,IAAI,IAAI,IAAI,aAAa,CAAC,MAAM,CAAC,CAEhC;IAED,IAAI,OAAO,IAAI,aAAa,CAAC,SAAS,CAAC,CAEtC;IAED,IAAI,gBAAgB,QAEnB;IAED;;;OAGG;IACH,WAAW;IAoDX;;;;;;;;OAQG;IACH,OAAO,CAAC,kBAAkB;IAiC1B,IAAI,2BAA2B,QAM9B;IAED;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,oBAAoB;IAiG5B,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;IAYzD;;;;;;;OAOG;IACH,OAAO,CAAC,eAAe;IAgBvB;;;;;;;OAOG;IACH,OAAO,CAAC,mBAAmB;IA2B3B;;;;;;;OAOG;IACH,OAAO,CAAC,eAAe;IAQvB;;;;;;;;;OASG;IACH,OAAO,CAAC,iBAAiB;IAkDzB;;;;;;;;OAQG;IACH,OAAO,CAAC,mBAAmB;CAgB9B"}

package/dist/prisma/prisma.service.js

@@ -1,43 +1,10 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
@@ -48,14 +15,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PrismaService = void 0;
 const common_1 = require("@nestjs/common");
 const client_1 = require("@prisma/client");
-const path = __importStar(require("path"));
-const fs = __importStar(require("fs"));
 const nestjs_request_context_1 = require("nestjs-request-context");
 let PrismaService = class PrismaService {
     constructor(prismaClient, permissionsConfig) {
         this.permissionsConfig = permissionsConfig;
         this.fieldConfigs = {};
-        this.schemaPath = '';
         this.prismaClient = prismaClient;
         this.parseSchema();
         this.proxyModels();
@@ -82,8 +46,6 @@ let PrismaService = class PrismaService {
                                         params = this.applyFieldOmission(String(propKey), userRole, params);
                                     if (!options?.BYPASS_FILTERING) {
                                         params = this.applyWhereConditions(String(propKey), userRole, params, user, methodKey);
-                                        // Extract where conditions from inside select
-                                        params = this.extractWhereFromSelect(params);
                                         // findUnique should be findFirst for where conditions to work properly
                                         if (methodKey === 'findUnique')
                                             methodKey = 'findFirst';
@@ -147,40 +109,41 @@ let PrismaService = class PrismaService {
      * including custom annotations (e.g., @Role(CLIENT)) and enums.
      */
     parseSchema() {
-        this.schemaPath = path.join(process.cwd(), 'prisma/schema.prisma');
-        const schema = fs.readFileSync(this.schemaPath, 'utf-8');
-        const enums = this.extractEnumsFromSchema(schema);
-        this.fieldConfigs = this.extractModelsFromSchema(schema, enums);
-    }
-    /**
-     * Extracts enums from the Prisma schema.
-     * @param schema - The raw schema content as a string.
-     * @returns An array of enum names.
-     */
-    extractEnumsFromSchema(schema) {
-        const enumRegex = /enum\s+(\w+)\s+\{/g;
-        const enums = [];
-        let match;
-        while ((match = enumRegex.exec(schema)) !== null) {
-            enums.push(match[1]);
-        }
-        return enums;
-    }
-    /**
-     * Extracts models and custom annotations from the Prisma schema.
-     * @param schema - The raw schema content as a string.
-     * @param enums - An array of enum names for determining scalar fields.
-     * @returns A parsed object with models and their custom annotations.
-     */
-    extractModelsFromSchema(schema, enums) {
-        const models = {};
-        const modelRegex = /model\s+(\w+)\s+\{([\s\S]+?)\}/g;
-        let match;
-        while ((match = modelRegex.exec(schema)) !== null) {
-            const modelName = match[1];
-            const modelBody = match[2];
-            const { allFields, fieldConfig, fieldTypes, scalarFields, relationFields, } = this.extractFieldsFromModel(modelBody, enums);
-            models[modelName.toLowerCase()] = {
+        let data_model = this.prismaClient._runtimeDataModel;
+        for (const model_name in data_model.models) {
+            let fields = data_model.models[model_name].fields;
+            const allFields = [];
+            const fieldConfig = {};
+            const fieldTypes = {};
+            const scalarFields = [];
+            const relationFields = {};
+            for (const field of fields) {
+                let field_name = field.name;
+                const fieldType = field.type;
+                const commentPart = field.documentation || '';
+                if (commentPart) {
+                    const roleMatch = commentPart.match(/@Role\((.*?)\)/);
+                    if (roleMatch) {
+                        fieldConfig[field_name] = roleMatch[1].split(',').map(role => role.trim());
+                    }
+                }
+                allFields.push(field_name);
+                fieldTypes[field_name] = fieldType;
+                if (field.kind === 'scalar' || field.kind === 'enum') {
+                    scalarFields.push(field_name);
+                }
+                else {
+                    relationFields[field_name] = {
+                        model: field.type,
+                        relation: field.isList ? 'hasMany' : 'belongsTo',
+                    };
+                    if (!field.isList && field.relationToFields && field.relationFromFields) {
+                        relationFields[field_name].foreignKey = field.relationToFields[0];
+                        relationFields[field_name].referencingColumn = field.relationFromFields[0];
+                    }
+                }
+            }
+            this.fieldConfigs[model_name.toLowerCase()] = {
                 fieldConfig,
                 allFields,
                 fieldTypes,
@@ -188,62 +151,6 @@ let PrismaService = class PrismaService {
                 relationFields,
             };
         }
-        return models;
-    }
-    /**
-     * Extracts fields from the model and looks for custom annotations like @Role.
-     * @param modelBody - The body of the model in the schema.
-     * @returns A parsed object with fields and their custom annotations.
-     */
-    extractFieldsFromModel(modelBody, enums) {
-        const allFields = [];
-        const fieldConfig = {};
-        const fieldTypes = {};
-        const scalarFields = [];
-        const relationFields = [];
-        const lines = modelBody.split('\n');
-        for (const line of lines) {
-            const trimmedLine = line.trim();
-            if (!trimmedLine || trimmedLine.startsWith('//')) {
-                continue;
-            }
-            const [codePart, commentPart] = trimmedLine.split('///');
-            const codeTokens = codePart.trim().split(/\s+/);
-            if (codeTokens.length < 2) {
-                continue;
-            }
-            const fieldName = codeTokens[0];
-            const fieldType = codeTokens[1];
-            const attributes = codeTokens.slice(2);
-            if (commentPart && commentPart.includes('@Role(')) {
-                const roleMatch = commentPart.match(/@Role\((.*?)\)/);
-                if (roleMatch) {
-                    const roles = roleMatch[1].split(',').map(role => role.trim());
-                    fieldConfig[fieldName] = roles;
-                }
-            }
-            allFields.push(fieldName);
-            fieldTypes[fieldName] = fieldType;
-            let baseType = fieldType.replace('?', '').replace('[]', '');
-            if (this.isScalarType(baseType, enums)) {
-                scalarFields.push(fieldName);
-            }
-            else {
-                relationFields.push(fieldName);
-            }
-        }
-        return {
-            allFields,
-            fieldConfig,
-            fieldTypes,
-            scalarFields,
-            relationFields,
-        };
-    }
-    // Helper method to identify scalar types
-    isScalarType(fieldType, enums) {
-        const scalarTypes = ['Int', 'String', 'Boolean', 'DateTime', 'Float', 'BigInt', 'Decimal', 'Json', 'Bytes', 'Unsupported'];
-        return scalarTypes.includes(fieldType) || enums.includes(fieldType);
     }
     /**
      * Applies field omission logic based on the user's role.
@@ -301,21 +208,21 @@ let PrismaService = class PrismaService {
         const normalizedName = modelName.toLowerCase().trim();
         const permissions = permissionsConfig[normalizedName]?.[userRole];
         if (args.select) {
-            for (const model of Object.keys(args.select)) {
-                if (!this.fieldConfigs[model.toLowerCase()]) {
+            for (const field of Object.keys(args.select)) {
+                let relation = this.getRelationType(modelName, field);
+                if (!relation) {
                     continue;
                 }
-                const relation = this.getRelationType(modelName, model);
                 if (relation.relation === 'belongsTo') {
-                    const relatedPermissions = permissionsConfig[model.toLowerCase()]?.[userRole]?.[action];
+                    const relatedPermissions = permissionsConfig[relation.model.toLowerCase()]?.[userRole]?.[action];
                     belongsToQueue.push({
-                        modelName: model,
+                        field,
                         relation,
                         relatedPermissions,
                     });
                     continue;
                 }
-                if (permissionsConfig[model.toLowerCase()]) {
+                if (permissionsConfig[relation.model.toLowerCase()]) {
                     /* Where conditions are applied outside of the select. Example as per documentation:
                     const result = await prisma.user.findFirst({
                       select: {
@@ -330,11 +237,11 @@ let PrismaService = class PrismaService {
                       },
                     })
                      */
-                    args.select[model].where = this.applyWhereConditions(model, userRole, args.select[model], user, action).where;
-                    delete args.select[model].select.where;
+                    args.select[field].where = this.applyWhereConditions(relation.model, userRole, args.select[field], user, action).where;
+                    delete args.select[field].select.where;
                 }
                 else {
-                    throw new common_1.ForbiddenException(`No permissions found for model ${model} and role ${userRole}`);
+                    throw new common_1.ForbiddenException(`No permissions found for model ${relation.model} and role ${userRole}`);
                 }
             }
         }
@@ -357,12 +264,12 @@ let PrismaService = class PrismaService {
             throw new common_1.ForbiddenException(`You are not authorized to access this record`);
         }
         for (const entry of belongsToQueue) {
-            const { modelName: relatedModel, relatedPermissions } = entry;
+            const { relatedPermissions, field } = entry;
             args.where = {
                 ...args.where,
-                [relatedModel]: {
+                [field]: {
                     AND: [
-                        args?.where?.[relatedModel] ?? {},
+                        args?.where?.[field] ?? {},
                         this.buildConditions(relatedPermissions?.conditions, user)
                     ]
                 }
@@ -370,78 +277,14 @@ let PrismaService = class PrismaService {
         }
         return args;
     }
-    /**
-     * Extracts the `where` conditions from a `select` object.
-     * Documentation specifies this structure, however depending on the relation it might not be possible.
-     const result = await prisma.user.findFirst({
-     select: {
-     posts: {
-     where: {
-     published: false,
-     },
-     select: {
-     title: true,
-     },
-     },
-     },
-     })
-
-     * Instead, do it this way:
-     const result = await prisma.user.findFirst({
-     where: {
-     posts: {
-     published: false,
-     },
-     },
-     select: {
-     posts: {
-     select: {
-     title: true,
-     },
-     },
-     },
-     })
-
-     */
-    extractWhereFromSelect(args) {
-        if (!args || !args.select) {
-            return args;
-        }
-        const whereConditions = {};
-        for (const key in args.select) {
-            if (args.select[key] && typeof args.select[key] === 'object') {
-                if (args.select[key].where) {
-                    whereConditions[key] = args.select[key].where;
-                    delete args.select[key].where;
-                }
-            }
-        }
-        if (Object.keys(whereConditions).length > 0) {
-            args.where = { ...args.where, ...whereConditions };
-        }
-        return args;
-    }
     getRelationType(parentModel, relatedField) {
-        //TODO Remove what is now unnecessary since this is no longer used to determine the foreign key and it was very strict due to relying on the assumption that said fk would be [model name]_id
         parentModel = parentModel.toLowerCase();
         relatedField = relatedField.toLowerCase();
-        const parentKey = Object.keys(this.fieldConfigs).find(key => key.toLowerCase() === parentModel);
-        if (!parentKey)
-            return { relation: null, identifier: null };
-        const parent = this.fieldConfigs[parentKey];
-        const relationKey = parent.relationFields.find((key) => key.toLowerCase() === relatedField);
-        if (!relationKey)
-            return { relation: null, identifier: null };
-        const fieldType = parent.fieldTypes[relationKey];
-        if (fieldType.endsWith('[]')) {
-            return { relation: 'hasMany', identifier: null };
-        }
-        const foreignKeyName = `${relatedField}_id`;
-        const foreignKey = parent.scalarFields.find((key) => key.toLowerCase() === foreignKeyName);
-        if (foreignKey) {
-            return { relation: 'belongsTo', identifier: foreignKey };
-        }
-        return { relation: null, identifier: null };
+        const parent = this.fieldConfigs[parentModel];
+        const relation = parent.relationFields[relatedField];
+        if (!relation)
+            return null;
+        return relation;
     }
     /**
      * Builds dynamic conditions based on the type of clause (OR, AND, or field conditions).
@@ -530,7 +373,7 @@ let PrismaService = class PrismaService {
         }
         if (includeRelations) {
             for (const relationKey in includeRelations) {
-                if (!relationFields.includes(relationKey))
+                if (!relationFields[relationKey])
                     continue;
                 let includedArgs = includeRelations[relationKey];
                 if (includedArgs === true) {
@@ -560,9 +403,8 @@ let PrismaService = class PrismaService {
         if (!modelInfo) {
             throw new Error(`Model information not found for ${parentModelName}`);
         }
-        if (modelInfo.relationFields.includes(relationKey)) {
-            // Remove [] and ? from the field type to get the related model name TODO assumes that there are no other relation qualifiers
-            return modelInfo.fieldTypes[relationKey].toLowerCase().replace('[]', '').replace('?', '');
+        if (modelInfo.relationFields[relationKey]) {
+            return modelInfo.relationFields[relationKey].model;
         }
         throw new Error(`Relation key ${relationKey} not found in model ${parentModelName}`);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@appxdigital/appx-core",
-    "version": "0.1.82",
+    "version": "0.1.83",
     "description": "Appx Core is a library that provides a set of tools to help you build your application faster.",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
@@ -20,6 +20,7 @@
         "@nestjs/jwt": "^11.0.0",
         "@paljs/plugins": "^8.1.0",
         "@paralleldrive/cuid2": "^2.2.2",
+        "@prisma/sdk": "^4.0.0",
         "@types/bcrypt": "^5.0.2",
         "@types/express": "^5.0.0",
         "@types/express-session": "^1.18.0",