@revisium/core 2.3.0-alpha.1 → 2.3.0-alpha.2

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@revisium/core",
-    "version": "2.3.0-alpha.1",
+    "version": "2.3.0-alpha.2",
     "description": "Revisium is a tool (UI/API) inspired by JSON (JSON Schema) and Git, designed to provide a flexible and low-level headless CMS solution.",
     "private": false,
     "homepage": "https://revisium.io",
@@ -66,6 +66,7 @@
         "@nestjs/swagger": "^11.2.0",
         "@nestjs/terminus": "^11.0.0",
         "@prisma/client": "^6.8.2",
+        "@revisium/prisma-pg-json": "^0.4.0",
         "ajv": "^8.17.1",
         "bcrypt": "^6.0.0",
         "bentocache": "^1.5.0",

package/dist/src/features/row/queries/handlers/get-rows.handler.d.ts

@@ -1,5 +1,4 @@
 import { IQueryHandler } from '@nestjs/cqrs';
-import { Prisma } from '@prisma/client';
 import { PluginService } from '../../../../features/plugin/plugin.service';
 import { TransactionPrismaService } from '../../../../infrastructure/database/transaction-prisma.service';
 import { GetRowsQuery, GetRowsQueryReturnType } from '../../../../features/row/queries/impl';
@@ -15,7 +14,7 @@ export declare class GetRowsHandler implements IQueryHandler<GetRowsQuery, GetRo
             revisionId: string;
             tableId: string;
         };
-        data: Prisma.JsonValue;
+        data: import("@prisma/client/runtime/library").JsonValue;
         id: string;
         createdId: string;
         createdAt: Date;
@@ -23,11 +22,10 @@ export declare class GetRowsHandler implements IQueryHandler<GetRowsQuery, GetRo
         readonly: boolean;
         updatedAt: Date;
         hash: string;
-        meta: Prisma.JsonValue;
+        meta: import("@prisma/client/runtime/library").JsonValue;
         publishedAt: Date;
         schemaHash: string;
     }>>;
     private getRows;
-    private isSimpleOrdering;
     private getRowsCount;
 }

package/dist/src/features/row/queries/handlers/get-rows.handler.js

@@ -11,13 +11,12 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetRowsHandler = void 0;
 const cqrs_1 = require("@nestjs/cqrs");
-const client_1 = require("@prisma/client");
 const plugin_service_1 = require("../../../plugin/plugin.service");
+const get_rows_sql_1 = require("../../utils/get-rows-sql");
 const transaction_prisma_service_1 = require("../../../../infrastructure/database/transaction-prisma.service");
 const impl_1 = require("../impl");
 const getOffsetPagination_1 = require("../../../share/commands/utils/getOffsetPagination");
 const share_transactional_queries_1 = require("../../../share/share.transactional.queries");
-const prisma_sql_generator_1 = require("../../../../utils/prisma-sql-generator");
 let GetRowsHandler = class GetRowsHandler {
     constructor(transactionService, shareTransactionalQueries, pluginService) {
         this.transactionService = transactionService;
@@ -50,30 +49,11 @@ let GetRowsHandler = class GetRowsHandler {
         });
     }
     getRows(args, tableVersionId, data) {
-        if (this.isSimpleOrdering(data.orderBy)) {
-            return this.transaction.table
-                .findUniqueOrThrow({ where: { versionId: tableVersionId } })
-                .rows({
-                ...args,
-                orderBy: data.orderBy ?? {
-                    createdAt: client_1.Prisma.SortOrder.desc,
-                },
-                where: data.where,
-            });
-        }
-        else {
-            return this.transaction.$queryRaw((0, prisma_sql_generator_1.generateGetRowsQueryPrisma)(tableVersionId, args.take, args.skip, data.where, data.orderBy));
-        }
-    }
-    isSimpleOrdering(order) {
-        return !order || Boolean(order?.every((orderItem) => !orderItem['data']));
+        return this.transaction.$queryRaw((0, get_rows_sql_1.getRowsSql)(tableVersionId, args.take, args.skip, data.where, data.orderBy));
     }
     async getRowsCount(tableVersionId, data) {
-        const result = await this.transaction.table.findUniqueOrThrow({
-            where: { versionId: tableVersionId },
-            include: { _count: { select: { rows: { where: data.where } } } },
-        });
-        return result._count.rows;
+        const result = await this.transaction.$queryRaw((0, get_rows_sql_1.getRowsCountSql)(tableVersionId, data.where));
+        return Number(result[0].count);
     }
 };
 exports.GetRowsHandler = GetRowsHandler;

package/dist/src/features/row/queries/handlers/get-rows.handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-rows.handler.js","sourceRoot":"","sources":["../../../../../../src/features/row/queries/handlers/get-rows.handler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"get-rows.handler.js","sourceRoot":"","sources":["../../../../../../src/features/row/queries/handlers/get-rows.handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uCAA2D;AAG3D,mEAAmE;AACnE,2DAG6C;AAC7C,+GAAkG;AAClG,kCAIuC;AACvC,2FAA4F;AAC5F,4FAA2F;AAGpF,IAAM,cAAc,GAApB,MAAM,cAAc;IAGzB,YACmB,kBAA4C,EAC5C,yBAAoD,EACpD,aAA4B;QAF5B,uBAAkB,GAAlB,kBAAkB,CAA0B;QAC5C,8BAAyB,GAAzB,yBAAyB,CAA2B;QACpD,kBAAa,GAAb,aAAa,CAAe;IAC5C,CAAC;IAEJ,IAAY,WAAW;QACrB,OAAO,IAAI,CAAC,kBAAkB,CAAC,sBAAsB,EAAE,CAAC;IAC1D,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,EAAE,IAAI,EAAgB;QACzC,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,GACjC,MAAM,IAAI,CAAC,yBAAyB,CAAC,0BAA0B,CAC7D,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,OAAO,CACb,CAAC;QAEJ,OAAO,IAAA,yCAAmB,EAAC;YACzB,QAAQ,EAAE,IAAI;YACd,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;gBACvB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,cAAc,EAAE,IAAI,CAAC,CAAC;gBAE5D,MAAM,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC;oBACnC,UAAU,EAAE,IAAI,CAAC,UAAU;oBAC3B,OAAO,EAAE,IAAI,CAAC,OAAO;oBACrB,IAAI;iBACL,CAAC,CAAC;gBAEH,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;oBACxB,GAAG,GAAG;oBACN,OAAO,EAAE;wBACP,UAAU,EAAE,IAAI,CAAC,UAAU;wBAC3B,OAAO,EAAE,IAAI,CAAC,OAAO;qBACtB;iBACF,CAAC,CAAC,CAAC;YACN,CAAC;YACD,KAAK,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,cAAc,EAAE,IAAI,CAAC;SACrD,CAAC,CAAC;IACL,CAAC;IAEO,OAAO,CACb,IAAoC,EACpC,cAAsB,EACtB,IAAsB;QAEtB,OAAO,IAAI,CAAC,WAAW,CAAC,SAAS,CAC/B,IAAA,yBAAU,EACR,cAAc,EACd,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,KAAmC,EACxC,IAAI,CAAC,OAAyC,CAC/C,CACF,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,YAAY,CAAC,cAAsB,EAAE,IAAsB;QACvE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,CAC7C,IAAA,8BAAe,EAAC,cAAc,EAAE,IAAI,CAAC,KAAmC,CAAC,CAC1E,CAAC;QACF,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;CACF,CAAA;AAjEY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,mBAAY,EAAC,mBAAY,CAAC;qCAKc,qDAAwB;QACjB,uDAAyB;QACrC,8BAAa;GANpC,cAAc,CAiE1B"}

package/dist/src/features/row/queries/impl/get-rows.query.d.ts

@@ -1,7 +1,7 @@
 import { Prisma } from '@prisma/client';
+import { JsonValueType, JsonAggregation, OrderByConditions } from '@revisium/prisma-pg-json';
 import { IPaginatedType } from '../../../../features/share/pagination.interface';
 import { RowWithContext } from '../../../../features/share/types/row-with-context.types';
-import { JsonAggregation, JsonValueType } from '../../../../utils/prisma-sql-generator';
 export type JsonOrder = {
     data: {
         path: string;
@@ -16,7 +16,7 @@ export declare class GetRowsQuery {
         readonly tableId: string;
         readonly first: number;
         readonly after?: string;
-        readonly orderBy?: (Prisma.RowOrderByWithRelationInput | JsonOrder)[];
+        readonly orderBy?: OrderByConditions[];
         readonly where?: Prisma.RowWhereInput;
     };
     constructor(data: {
@@ -24,7 +24,7 @@ export declare class GetRowsQuery {
         readonly tableId: string;
         readonly first: number;
         readonly after?: string;
-        readonly orderBy?: (Prisma.RowOrderByWithRelationInput | JsonOrder)[];
+        readonly orderBy?: OrderByConditions[];
         readonly where?: Prisma.RowWhereInput;
     });
 }

package/dist/src/features/row/queries/impl/get-rows.query.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-rows.query.js","sourceRoot":"","sources":["../../../../../../src/features/row/queries/impl/get-rows.query.ts"],"names":[],"mappings":";;;AAcA,MAAa,YAAY;IACvB,YACkB,IAOf;QAPe,SAAI,GAAJ,IAAI,CAOnB;IACA,CAAC;CACL;AAXD,oCAWC"}
+{"version":3,"file":"get-rows.query.js","sourceRoot":"","sources":["../../../../../../src/features/row/queries/impl/get-rows.query.ts"],"names":[],"mappings":";;;AAkBA,MAAa,YAAY;IACvB,YACkB,IAOf;QAPe,SAAI,GAAJ,IAAI,CAOnB;IACA,CAAC;CACL;AAXD,oCAWC"}

package/dist/src/features/row/utils/get-rows-sql.d.ts

@@ -0,0 +1,5 @@
+import { Prisma } from '@prisma/client';
+import { FieldConfig, OrderByConditions, WhereConditions } from '@revisium/prisma-pg-json';
+export declare const DEFAULT_ROW_FIELDS: FieldConfig;
+export declare function getRowsSql(tableId: string, take: number, skip: number, whereConditions?: WhereConditions, orderBy?: OrderByConditions[]): Prisma.Sql;
+export declare function getRowsCountSql(tableId: string, whereConditions?: WhereConditions): Prisma.Sql;

package/dist/src/features/row/utils/get-rows-sql.js

@@ -0,0 +1,70 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEFAULT_ROW_FIELDS = void 0;
+exports.getRowsSql = getRowsSql;
+exports.getRowsCountSql = getRowsCountSql;
+const client_1 = require("@prisma/client");
+const prisma_pg_json_1 = require("@revisium/prisma-pg-json");
+exports.DEFAULT_ROW_FIELDS = {
+    versionId: 'string',
+    createdId: 'string',
+    id: 'string',
+    hash: 'string',
+    schemaHash: 'string',
+    readonly: 'boolean',
+    createdAt: 'date',
+    updatedAt: 'date',
+    publishedAt: 'date',
+    data: 'json',
+    meta: 'json',
+};
+function getRowsSql(tableId, take, skip, whereConditions, orderBy) {
+    const whereClause = (0, prisma_pg_json_1.generateWhere)({
+        where: whereConditions || {},
+        fieldConfig: exports.DEFAULT_ROW_FIELDS,
+        tableAlias: 'r',
+    });
+    const orderByClause = (orderBy ?? []).length
+        ? (0, prisma_pg_json_1.generateOrderBy)({
+            orderBy,
+            fieldConfig: exports.DEFAULT_ROW_FIELDS,
+            tableAlias: 'r',
+        })
+        : client_1.Prisma.sql `ORDER BY r."createdAt" DESC`;
+    return client_1.Prisma.sql `
+    SELECT
+      r."versionId",
+      r."createdId",
+      r."id",
+      r."readonly",
+      r."createdAt",
+      r."updatedAt",
+      r."publishedAt",
+      r."data",
+      r."meta",
+      r."hash",
+      r."schemaHash"
+    FROM "Row" r
+    INNER JOIN "_RowToTable" rt ON r."versionId" = rt."A"
+    WHERE rt."B" = ${tableId}
+      AND (${whereClause})
+    ${orderByClause}
+    LIMIT ${take}
+    OFFSET ${skip}
+  `;
+}
+function getRowsCountSql(tableId, whereConditions) {
+    const whereClause = (0, prisma_pg_json_1.generateWhere)({
+        where: whereConditions || {},
+        fieldConfig: exports.DEFAULT_ROW_FIELDS,
+        tableAlias: 'r',
+    });
+    return client_1.Prisma.sql `
+    SELECT COUNT(*) as count
+    FROM "Row" r
+    INNER JOIN "_RowToTable" rt ON r."versionId" = rt."A"
+    WHERE rt."B" = ${tableId}
+      AND (${whereClause})
+  `;
+}
+//# sourceMappingURL=get-rows-sql.js.map

package/dist/src/features/row/utils/get-rows-sql.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-rows-sql.js","sourceRoot":"","sources":["../../../../../src/features/row/utils/get-rows-sql.ts"],"names":[],"mappings":";;;AAuBA,gCA2CC;AAED,0CAiBC;AArFD,2CAAwC;AACxC,6DAMkC;AAErB,QAAA,kBAAkB,GAAgB;IAC7C,SAAS,EAAE,QAAQ;IACnB,SAAS,EAAE,QAAQ;IACnB,EAAE,EAAE,QAAQ;IACZ,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE,QAAQ;IACpB,QAAQ,EAAE,SAAS;IACnB,SAAS,EAAE,MAAM;IACjB,SAAS,EAAE,MAAM;IACjB,WAAW,EAAE,MAAM;IACnB,IAAI,EAAE,MAAM;IACZ,IAAI,EAAE,MAAM;CACb,CAAC;AAEF,SAAgB,UAAU,CACxB,OAAe,EACf,IAAY,EACZ,IAAY,EACZ,eAAiC,EACjC,OAA6B;IAE7B,MAAM,WAAW,GAAG,IAAA,8BAAa,EAAC;QAChC,KAAK,EAAE,eAAe,IAAI,EAAE;QAC5B,WAAW,EAAE,0BAAkB;QAC/B,UAAU,EAAE,GAAG;KAChB,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,MAAM;QAC1C,CAAC,CAAC,IAAA,gCAAe,EAAC;YACd,OAAO;YACP,WAAW,EAAE,0BAAkB;YAC/B,UAAU,EAAE,GAAG;SAChB,CAAC;QACJ,CAAC,CAAC,eAAM,CAAC,GAAG,CAAA,6BAA6B,CAAC;IAG5C,OAAO,eAAM,CAAC,GAAG,CAAA;;;;;;;;;;;;;;;qBAeE,OAAO;aACf,WAAW;MAClB,aAAa;YACP,IAAI;aACH,IAAI;GACd,CAAC;AACJ,CAAC;AAED,SAAgB,eAAe,CAC7B,OAAe,EACf,eAAiC;IAEjC,MAAM,WAAW,GAAG,IAAA,8BAAa,EAAC;QAChC,KAAK,EAAE,eAAe,IAAI,EAAE;QAC5B,WAAW,EAAE,0BAAkB;QAC/B,UAAU,EAAE,GAAG;KAChB,CAAC,CAAC;IAEH,OAAO,eAAM,CAAC,GAAG,CAAA;;;;qBAIE,OAAO;aACf,WAAW;GACrB,CAAC;AACJ,CAAC"}