add if else clause. (#7)

Author: igalklebanov

README.md

@@ -41,7 +41,7 @@ To fix that, add an [`import_map.json`](https://deno.land/manual@v1.26.1/linking
 ```json
 {
   "imports": {
-    "kysely": "https://cdn.jsdelivr.net/npm/kysely@0.22.0/dist/esm/index.js"
+    "kysely": "https://cdn.jsdelivr.net/npm/kysely@0.23.5/dist/esm/index.js"
   }
 }
 ```
@@ -140,7 +140,9 @@ await db
 
 #### Supported SurrealQL specific statements:
 
-[create](https://surrealdb.com/docs/surrealql/statements/create), [relate](https://surrealdb.com/docs/surrealql/statements/relate).
+[create](https://surrealdb.com/docs/surrealql/statements/create), 
+[if else](https://surrealdb.com/docs/surrealql/statements/ifelse),
+[relate](https://surrealdb.com/docs/surrealql/statements/relate).
 
 #### Why not write a query builder from scratch
 

package.json

@@ -35,7 +35,7 @@
     "type-check": "tsc --noEmit"
   },
   "peerDependencies": {
-    "kysely": ">= 0.7.8 < 1"
+    "kysely": ">= 0.23.5 < 1"
   },
   "devDependencies": {
     "@tsconfig/node16": "^1.0.3",
@@ -53,7 +53,7 @@
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "kysely": "^0.22.0",
+    "kysely": "^0.23.5",
     "mocha": "^10.0.0",
     "node-fetch": "^2",
     "prettier": "^2.7.1",

pnpm-lock.yaml

@@ -11,11 +11,11 @@ export class SurrealDbHttpAdapter extends DialectAdapterBase {
     return false
   }
 
-  async acquireMigrationLock(db: Kysely<any>): Promise<void> {
+  async acquireMigrationLock(_: Kysely<any>): Promise<void> {
     this.#throwLocksError()
   }
 
-  async releaseMigrationLock(db: Kysely<any>): Promise<void> {
+  async releaseMigrationLock(_: Kysely<any>): Promise<void> {
     this.#throwLocksError()
   }
 

src/dialect/http/http-adapter.ts

@@ -38,8 +38,11 @@ export class SurrealDbHttpConnection implements DatabaseConnection {
       throw new SurrealDbHttpDatabaseError(queryResult.detail)
     }
 
+    const rows = queryResult?.result || []
+
     return {
-      rows: queryResult?.result ?? [],
+      numAffectedRows: BigInt(rows.length),
+      rows,
     }
   }
 

src/dialect/http/http-connection.ts

@@ -41,6 +41,7 @@ export class SurrealDbHttpIntrospector implements DatabaseIntrospector {
             isNullable: true,
             name,
           })),
+          isView: false,
           name: tableName,
         }
       }),

src/dialect/http/http-introspector.ts

@@ -6,6 +6,7 @@ export * from './dialect/http/http-errors.js'
 export * from './dialect/http/http-introspector.js'
 export type {FetchRequest, FetchResponse, SurrealDbHttpDialectConfig} from './dialect/http/http-types.js'
 export * from './query-builder/create-query-builder.js'
+export * from './query-builder/if-else-query-builder.js'
 export * from './query-builder/relate-query-builder.js'
 export * from './query-compiler/query-compiler.js'
 export * from './surreal-kysely.js'

src/index.ts

@@ -1,4 +1,4 @@
-import {ColumnUpdateNode, TableNode, ValueNode} from 'kysely'
+import type {ColumnUpdateNode, TableNode, ValueNode} from 'kysely'
 
 import {freeze} from '../util/object-utils.js'
 import type {SurrealOperationNode} from './operation-node.js'

src/operation-node/create-query-node.ts

@@ -0,0 +1,27 @@
+import type {OperationNode} from 'kysely'
+
+import {freeze} from '../util/object-utils.js'
+import type {SurrealOperationNode} from './operation-node.js'
+
+export interface ElseIfNode extends SurrealOperationNode {
+  readonly kind: 'ElseIfNode'
+  readonly if: OperationNode
+  readonly then: OperationNode
+}
+
+/**
+ * @internal
+ */
+export const ElseIfNode = freeze({
+  is(node: SurrealOperationNode): node is ElseIfNode {
+    return node.kind === 'ElseIfNode'
+  },
+
+  create(condition: OperationNode, expression: OperationNode): ElseIfNode {
+    return freeze({
+      kind: 'ElseIfNode',
+      if: condition,
+      then: expression,
+    })
+  },
+})

src/operation-node/else-if-node.ts

@@ -0,0 +1,46 @@
+import type {OperationNode} from 'kysely'
+
+import {freeze} from '../util/object-utils.js'
+import {ElseIfNode} from './else-if-node.js'
+import type {SurrealOperationNode} from './operation-node.js'
+
+export interface IfElseQueryNode extends SurrealOperationNode {
+  readonly kind: 'IfElseQueryNode'
+  readonly if: OperationNode
+  readonly then: OperationNode
+  readonly else?: OperationNode
+  readonly elseIf?: ReadonlyArray<ElseIfNode>
+}
+
+/**
+ * @internal
+ */
+export const IfElseQueryNode = freeze({
+  is(node: SurrealOperationNode): node is IfElseQueryNode {
+    return node.kind === 'IfElseQueryNode'
+  },
+
+  create(condition: OperationNode, expression: OperationNode): IfElseQueryNode {
+    return freeze({
+      kind: 'IfElseQueryNode',
+      if: condition,
+      then: expression,
+    })
+  },
+
+  cloneWithElse(ifElseQuery: IfElseQueryNode, elze: OperationNode): IfElseQueryNode {
+    return freeze({
+      ...ifElseQuery,
+      else: elze,
+    })
+  },
+
+  cloneWithElseIf(ifElseQuery: IfElseQueryNode, condition: OperationNode, expression: OperationNode): IfElseQueryNode {
+    const elseIfNode = ElseIfNode.create(condition, expression)
+
+    return freeze({
+      ...ifElseQuery,
+      elseIf: ifElseQuery.elseIf !== undefined ? [...ifElseQuery.elseIf, elseIfNode] : [elseIfNode],
+    })
+  },
+})