typings

knex · Dec 14, 2021 · c09f17a · c09f17a
1 parent 2fe4931
commit c09f17a
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 13 deletions.
diff --git a/lib/query/querycompiler.js b/lib/query/querycompiler.js
@@ -1413,19 +1413,6 @@ class QueryCompiler {
       .join(', ');
   }
 
-  _getExtracts(nameFunction, statement, operator) {
-    return (
-      Array.isArray(statement.values) ? statement.values : [statement.values]
-    )
-      .map(function (value) {
-        return this._jsonExtract(nameFunction, {
-          column: statement.column,
-          path: value,
-        });
-      }, this)
-      .join(operator);
-  }
-
   _jsonSet(nameFunction, params) {
     const jsonSet = `${nameFunction}(${columnize_(
       params.column,

diff --git a/types/index.d.ts b/types/index.d.ts
@@ -509,6 +509,12 @@ export declare namespace Knex {
     fullOuterJoin: Join<TRecord, TResult>;
     crossJoin: Join<TRecord, TResult>;
 
+    // Json manipulation
+    jsonExtract : JsonExtract<TRecord, TResult>;
+    jsonSet: JsonSet<TRecord, TResult>;
+    jsonInsert: JsonInsert<TRecord, TResult>;
+    jsonRemove: JsonRemove<TRecord, TResult>;
+
     // Using
     using: Using<TRecord, TResult>;
 
@@ -1122,6 +1128,30 @@ export declare namespace Knex {
     ): QueryBuilder<TRecord, TResult2>;
   }
 
+  interface JsonExtraction {
+    column: string | Raw | QueryBuilder;
+    path: string;
+    alias?: string;
+    singleValue?: boolean;
+  }
+
+  interface JsonExtract<TRecord extends {} = any, TResult extends {} = any> {
+    (column: string | Raw | QueryBuilder, path: string, alias?: string, singleValue?: boolean): QueryBuilder<TRecord, TResult>;
+    (column: JsonExtraction[] | any[][], singleValue?: boolean): QueryBuilder<TRecord, TResult>;
+  }
+
+  interface JsonSet<TRecord extends {} = any, TResult extends {} = any> {
+    (column: string | Raw | QueryBuilder, path: string, value: any, alias?: string): QueryBuilder<TRecord, TResult>;
+  }
+
+  interface JsonInsert<TRecord extends {} = any, TResult extends {} = any> {
+    (column: string | Raw | QueryBuilder, path: string, value: any, alias?: string): QueryBuilder<TRecord, TResult>;
+  }
+
+  interface JsonRemove<TRecord extends {} = any, TResult extends {} = any> {
+    (column: string | Raw | QueryBuilder, path: string, value: any, alias?: string): QueryBuilder<TRecord, TResult>;
+  }
+
   interface HintComment<TRecord extends {} = any, TResult extends {} = any> {
     (hint: string): QueryBuilder<TRecord, TResult>;
     (hints: readonly string[]): QueryBuilder<TRecord, TResult>;