Merge pull request #199 from neo4j/fix-rawCypher-types

Fix RawCypher types

.changeset/spotty-files-trade.md

@@ -0,0 +1,5 @@
+---
+"@neo4j/cypher-builder": patch
+---
+
+Fix RawCypher types

src/clauses/Raw.ts

@@ -61,4 +61,33 @@ export class Raw extends Clause {
  * @group Other
  * @deprecated use {@link Raw} instead
  */
-export const RawCypher = Raw;
+export class RawCypher extends Clause {
+    private callback: RawCypherCallback;
+
+    constructor(callback: RawCypherCallback | string) {
+        super();
+        if (typeof callback === "string") {
+            this.callback = this.stringToCallback(callback);
+        } else this.callback = callback;
+    }
+
+    public getCypher(env: CypherEnvironment): string {
+        const cbResult = this.callback(env);
+        if (!cbResult) return "";
+        let query: string;
+        let params = {};
+        if (typeof cbResult === "string") query = cbResult;
+        else {
+            [query, params] = cbResult;
+        }
+
+        const cypherParams = toCypherParams(params);
+        env.addExtraParams(cypherParams);
+
+        return query;
+    }
+
+    private stringToCallback(str: string): RawCypherCallback {
+        return () => str;
+    }
+}

src/types.ts

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-import type { Raw } from ".";
+import type { Raw, RawCypher } from ".";
 import type { CypherEnvironment } from "./Environment";
 import type { Case } from "./expressions/Case";
 import type { HasLabel } from "./expressions/HasLabel";
@@ -63,6 +63,7 @@ export type Predicate =
     | BooleanOp
     | ComparisonOp
     | Raw
+    | RawCypher
     | Exists
     | Count
     | PredicateFunction