@restura/core 1.0.4 → 1.0.6

package/dist/index.d.ts

@@ -934,8 +934,10 @@ declare abstract class PsqlConnection {
     readonly instanceId: UUID;
     protected constructor(instanceId?: UUID);
     protected abstract query<R extends QueryResultRow = QueryResultRow, T extends Array<unknown> = unknown[]>(query: string, values?: QueryConfigValues<T>): Promise<QueryResult<R>>;
-    queryOne<T>(query: string, options: any[], requesterDetails: RequesterDetails): Promise<T>;
-    runQuery<T>(query: string, options: any[], requesterDetails: RequesterDetails): Promise<T[]>;
+    queryOne<T>(query: string, options: unknown[], requesterDetails: RequesterDetails): Promise<T>;
+    queryOneSchema<T>(query: string, params: unknown[], requesterDetails: RequesterDetails, zodSchema: z.ZodSchema<T>): Promise<T>;
+    runQuery<T>(query: string, options: unknown[], requesterDetails: RequesterDetails): Promise<T[]>;
+    runQuerySchema<T>(query: string, params: unknown[], requesterDetails: RequesterDetails, zodSchema: z.ZodSchema<T>): Promise<T[]>;
     private logQueryDuration;
     private logSqlStatement;
 }

package/dist/index.js

@@ -1403,7 +1403,11 @@ function requestValidator(req, routeData, validationSchema) {
     if (!routeData.requestType) throw new RsError("BAD_REQUEST", `No request type defined for custom request.`);
     const currentInterface = validationSchema[routeData.requestType];
     const validator = new jsonschema.Validator();
-    const executeValidation = validator.validate(req.data, currentInterface);
+    const strictSchema = {
+      ...currentInterface,
+      additionalProperties: false
+    };
+    const executeValidation = validator.validate(req.data, strictSchema);
     if (!executeValidation.valid) {
       throw new RsError(
         "BAD_REQUEST",
@@ -1617,6 +1621,7 @@ import pg from "pg";
 import crypto from "crypto";
 import format3 from "pg-format";
 import { format as sqlFormat } from "sql-formatter";
+import { z as z6 } from "zod/v4";
 
 // src/restura/sql/PsqlUtils.ts
 import format2 from "pg-format";
@@ -1691,7 +1696,6 @@ var PsqlConnection = class {
   constructor(instanceId) {
     this.instanceId = instanceId || crypto.randomUUID();
   }
-  // eslint-disable-next-line  @typescript-eslint/no-explicit-any
   async queryOne(query, options, requesterDetails) {
     const formattedQuery = questionMarksToOrderedParams(query);
     const meta = { connectionInstanceId: this.instanceId, ...requesterDetails };
@@ -1713,7 +1717,21 @@ var PsqlConnection = class {
       throw new RsError("DATABASE_ERROR", `${error.message}`);
     }
   }
-  // eslint-disable-next-line  @typescript-eslint/no-explicit-any
+  async queryOneSchema(query, params, requesterDetails, zodSchema) {
+    const result = await this.queryOne(query, params, requesterDetails);
+    try {
+      return zodSchema.parse(result);
+    } catch (error) {
+      if (error instanceof z6.ZodError) {
+        logger.error("Invalid data returned from database:");
+        logger.silly("\n" + JSON.stringify(result, null, 2));
+        logger.error("\n" + z6.prettifyError(error));
+      } else {
+        logger.error(error);
+      }
+      throw new RsError("DATABASE_ERROR", `Invalid data returned from database`);
+    }
+  }
   async runQuery(query, options, requesterDetails) {
     const formattedQuery = questionMarksToOrderedParams(query);
     const meta = { connectionInstanceId: this.instanceId, ...requesterDetails };
@@ -1732,6 +1750,21 @@ var PsqlConnection = class {
       throw new RsError("DATABASE_ERROR", `${error.message}`);
     }
   }
+  async runQuerySchema(query, params, requesterDetails, zodSchema) {
+    const result = await this.runQuery(query, params, requesterDetails);
+    try {
+      return z6.array(zodSchema).parse(result);
+    } catch (error) {
+      if (error instanceof z6.ZodError) {
+        logger.error("Invalid data returned from database:");
+        logger.silly("\n" + JSON.stringify(result, null, 2));
+        logger.error("\n" + z6.prettifyError(error));
+      } else {
+        logger.error(error);
+      }
+      throw new RsError("DATABASE_ERROR", `Invalid data returned from database`);
+    }
+  }
   logQueryDuration(startTime) {
     if (logger.level === "silly") {
       const [seconds, nanoseconds] = process.hrtime(startTime);