refactor: Meta service

packages/nocodb/src/db/CustomKnex.ts

@@ -492,23 +492,27 @@ const appendWhereCondition = function (
 
   return knexRef;
 };
-type XcConditionObjVal = {
-  [key in 'eq' | 'neq' | 'lt' | 'gt' | 'ge' | 'le' | 'like' | 'nlike']:
-    | string
-    | number
-    | any;
-};
-
-interface XcXonditionObj {
-  _or: XcXonditionObj[];
-  _and: XcXonditionObj[];
-  _not: XcXonditionObj;
 
-  [key: string]:
-    | XcXonditionObj
-    | XcXonditionObj[]
-    | XcConditionObjVal
-    | XcConditionObjVal[];
+type AtLeastOne<T, U = { [K in keyof T]: Pick<T, K> }> = Partial<T> &
+  U[keyof U];
+
+export type ConditionVal = AtLeastOne<{
+  eq: string | number | boolean | Date;
+  neq: string | number | boolean | Date;
+  lt: number | string | Date;
+  gt: number | string | Date;
+  ge: number | string | Date;
+  le: number | string | Date;
+  like: string;
+  nlike: string;
+}>;
+
+export interface Condition {
+  _or?: Condition[];
+  _and?: Condition[];
+  _not?: Condition;
+
+  [key: string]: ConditionVal | Condition | Condition[];
 }
 
 declare module 'knex' {
@@ -527,7 +531,7 @@ declare module 'knex' {
       ): Knex.QueryBuilder<TRecord, TResult>;
 
       condition<TRecord, TResult>(
-        conditionObj: XcXonditionObj,
+        conditionObj: Condition,
         columnAliases?: {
           [columnAlias: string]: string;
         },
@@ -542,7 +546,7 @@ declare module 'knex' {
       ): Knex.QueryBuilder<TRecord, TResult>;
 
       conditionGraph<TRecord, TResult>(condition: {
-        condition: XcXonditionObj;
+        condition: Condition;
         models: { [key: string]: BaseModelSql };
       }): Knex.QueryBuilder<TRecord, TResult>;
 
@@ -552,6 +556,8 @@ declare module 'knex' {
           [columnAlias: string]: string;
         },
       ): Knex.QueryBuilder<TRecord, TResult>;
+
+      hasWhere(): boolean;
     }
   }
 }
@@ -1274,8 +1280,15 @@ function parseNestedConditionv2(obj, qb, pKey?, table?, tableAlias?) {
   return qb;
 }
 
-// Conditionv2
+// extend the knex query builder with a method to check if a where clause exists
+knex.QueryBuilder.extend('hasWhere', function () {
+  // Inspect the _statements array for 'where' clauses
+  return (
+    this as unknown as { _statements: { grouping: string }[] }
+  )._statements.some((statement) => statement.grouping === 'where') as any;
+});
 
+// Conditionv2
 /**
  * Append custom where condition(nested object) to knex query builder
  */

packages/nocodb/src/filters/global-exception/global-exception.filter.ts

@@ -41,9 +41,8 @@ export class GlobalExceptionFilter implements ExceptionFilter {
     }
 
     // try to extract db error for unknown errors
-    const dbError = !(exception instanceof NcBaseError)
-      ? extractDBError(exception)
-      : null;
+    const dbError =
+      exception instanceof NcBaseError ? null : extractDBError(exception);
 
     // skip unnecessary error logging
     if (

packages/nocodb/src/helpers/catchError.ts

@@ -415,6 +415,13 @@ export class NotFound extends NcBaseError {}
 
 export class SsoError extends NcBaseError {}
 
+export class MetaError extends NcBaseError {
+  constructor(param: { message: string; sql: string }) {
+    super(param.message);
+    Object.assign(this, param);
+  }
+}
+
 export class ExternalError extends NcBaseError {
   constructor(error: Error) {
     super(error.message);
@@ -747,4 +754,8 @@ export class NcError {
       `Email domain ${domain} is not allowed for this organization`,
     );
   }
+
+  static metaError(param: { message: string; sql: string }) {
+    throw new MetaError(param);
+  }
 }