Revert graph change that made paramToString pure

Author: Robert Kesterson

Diff for: src/graph.js

@@ -0,0 +1,260 @@
+"use strict";
+const redis = require("redis"),
+	util = require("util"),
+	ResultSet = require("./resultSet");
+
+/**
+ * RedisGraph client
+ */
+class Graph {
+     /**
+      * Creates a client to a specific graph running on the specific host/post
+      * See: node_redis for more options on createClient 
+      * 
+      * @param {string} graphId the graph id
+      * @param {string | RedisClient} [host] Redis host or node_redis client
+      * @param {string | int} [port] Redis port
+      * @param {ClientOpts} [options] node_redis options
+      */
+	constructor(graphId, host, port, options) {
+		this._graphId = graphId;        // Graph ID
+		this._labels = [];              // List of node labels.
+		this._relationshipTypes = [];   // List of relation types.
+		this._properties = [];          // List of properties.
+
+		this._labelsPromise = undefined;        // used as a synchronization mechanizom for labels retrival
+		this._propertyPromise = undefined;      // used as a synchronization mechanizom for property names retrival
+		this._relationshipPromise = undefined;  // used as a synchronization mechanizom for relationship types retrival
+
+		this._client =
+			host instanceof redis.RedisClient
+				? host
+				: redis.createClient(port, host, options);
+		this._sendCommand = util.promisify(this._client.send_command).bind(this._client);
+    }
+    /**
+     * Closes the client.
+     */
+    close() {
+        this._client.quit();
+    }
+
+	/**
+	 * Auxiliary function to extract string(s) data from procedures such as:
+	 * db.labels, db.propertyKeys and db.relationshipTypes
+	 * @param {ResultSet} resultSet - a procedure result set
+     * @returns {string[]} strings array.
+	 */
+	_extractStrings(resultSet) {
+		var strings = [];
+		while (resultSet.hasNext()) {
+			strings.push(resultSet.next().getString(0));
+		}
+		return strings;
+	}
+
+    /**
+     * Transforms a parameter value to string.
+     * @param {object} paramValue 
+     * @returns {string} the string representation of paramValue.
+     */
+	paramToString(paramValue) {
+		if (paramValue == null) return "null";
+		let paramType = typeof paramValue;
+		if (paramType == "string") {
+			let strValue = "";
+            paramValue = paramValue.replace(/[\\"']/g, '\\$&');  
+			if (paramValue[0] != '"') strValue += '"';
+			strValue += paramValue;
+			if (!paramValue.endsWith('"') || paramValue.endsWith("\\\"")) strValue += '"';
+			return strValue;
+		}
+		if (Array.isArray(paramValue)) {
+			let stringsArr = new Array(paramValue.length);
+			for (var i = 0; i < paramValue.length; i++) {
+				stringsArr[i] = this.paramToString(paramValue[i]);
+			}
+			return ["[", stringsArr.join(", "), "]"].join("");
+		}
+		return paramValue;
+	}
+
+	/**
+	 * Extracts parameters from dictionary into cypher parameters string.
+	 * @param {Map} params parameters dictionary.
+	 * @return {string} a cypher parameters string.
+	 */
+	buildParamsHeader(params) {
+		let paramsArray = ["CYPHER"];
+
+		for (var key in params) {
+			let value = this.paramToString(params[key]);
+			paramsArray.push(`${key}=${value}`);
+		}
+		paramsArray.push(" ");
+		return paramsArray.join(" ");
+	}
+
+	/**
+	 * Execute a Cypher query
+     * @async
+	 * @param {string} query Cypher query
+	 * @param {Map} [params] Parameters map
+	 * @returns {ResultSet} a promise contains a result set
+	 */
+	async query(query, params) {
+		if (params) {
+			query = this.buildParamsHeader(params) + query;
+		}
+		var res = await this._sendCommand("graph.QUERY", [
+			this._graphId,
+			query,
+			"--compact"
+		]);
+		var resultSet = new ResultSet(this);
+		return resultSet.parseResponse(res);
+	}
+
+	/**
+	 * Deletes the entire graph
+     * @async
+	 * @returns {ResultSet} a promise contains the delete operation running time statistics
+	 */
+	async deleteGraph() {
+		var res = await this._sendCommand("graph.DELETE", [this._graphId]);
+		//clear internal graph state
+		this._labels = [];
+		this._relationshipTypes = [];
+		this._properties = [];
+		var resultSet = new ResultSet(this);
+		return resultSet.parseResponse(res);
+	}
+
+	/**
+	 * Calls procedure
+	 * @param {string} procedure Procedure to call
+	 * @param {string[]} [args] Arguments to pass
+	 * @param {string[]} [y] Yield outputs
+	 * @returns {ResultSet} a promise contains the procedure result set data
+	 */
+	callProcedure(procedure, args = new Array(), y = new Array()) {
+		let q = "CALL " + procedure + "(" + args.join(",") + ")" + y.join(" ");
+		return this.query(q);
+	}
+
+	/**
+	 * Retrieves all labels in graph.
+     * @async
+	 */
+	async labels() {
+		if (this._labelsPromise == undefined) {
+			this._labelsPromise = this.callProcedure("db.labels").then(
+				response => {
+					return this._extractStrings(response);
+				}
+			);
+			this._labels = await this._labelsPromise;
+			this._labelsPromise = undefined;
+		} else {
+			await this._labelsPromise;
+		}
+	}
+
+	/**
+	 * Retrieves all relationship types in graph.
+     * @async
+	 */
+	async relationshipTypes() {
+		if (this._relationshipPromise == undefined) {
+			this._relationshipPromise = this.callProcedure(
+				"db.relationshipTypes"
+			).then(response => {
+				return this._extractStrings(response);
+			});
+			this._relationshipTypes = await this._relationshipPromise;
+			this._relationshipPromise = undefined;
+		} else {
+			await this._relationshipPromise;
+		}
+	}
+
+	/**
+	 * Retrieves all properties in graph.
+     * @async
+	 */
+	async propertyKeys() {
+		if (this._propertyPromise == undefined) {
+			this._propertyPromise = this.callProcedure("db.propertyKeys").then(
+				response => {
+					return this._extractStrings(response);
+				}
+			);
+			this._properties = await this._propertyPromise;
+			this._propertyPromise = undefined;
+		} else {
+			await this._propertyPromise;
+		}
+	}
+
+	/**
+	 * Retrieves label by ID.
+	 * @param {int} id internal ID of label.
+	 * @returns {string} String label.
+	 */
+	getLabel(id) {
+		return this._labels[id];
+	}
+
+	/**
+	 * Retrieve all the labels from the graph and returns the wanted label
+     * @async
+	 * @param {int} id internal ID of label.
+	 * @returns {string} String label.
+	 */
+	async fetchAndGetLabel(id) {
+		await this.labels();
+		return this._labels[id];
+	}
+
+	/**
+	 * Retrieves relationship type by ID.
+	 * @param {int} id internal ID of relationship type.
+	 * @return String relationship type.
+	 */
+	getRelationship(id) {
+		return this._relationshipTypes[id];
+	}
+
+	/**
+	 * Retrieves al the relationships types from the graph, and returns the wanted type
+     * @async
+	 * @param {int} id internal ID of relationship type.
+	 * @returns {string} String relationship type.
+	 */
+	async fetchAndGetRelationship(id) {
+		await this.relationshipTypes();
+		return this._relationshipTypes[id];
+	}
+
+	/**
+	 * Retrieves property name by ID.
+	 * @param {int} id internal ID of property.
+	 * @returns {string} String property.
+	 */
+	getProperty(id) {
+		return this._properties[id];
+	}
+
+	/**
+	 * Retrieves al the properties from the graph, and returns the wanted property
+     * @async
+	 * @param {int} id internal ID of property.
+	 * @returns {string} String property.
+	 */
+	async fetchAndGetProperty(id) {
+		await this.propertyKeys();
+		return this._properties[id];
+	}
+}
+
+module.exports = Graph;

Diff for: src/graph.ts

@@ -85,11 +85,11 @@ export class Graph {
     if (paramValue == null) return "null";
     if (isString(paramValue)) {
       let strValue = "";
-      let pv: string = `${paramValue}`;
-      pv = pv.replace(/[\\"']/g, "\\$&");
-      if (pv[0] != '"') strValue += '"';
-      strValue += pv;
-      if (!pv.endsWith('"') || pv.endsWith('\\"')) pv += '"';
+      paramValue = paramValue.replace(/[\\"']/g, "\\$&");
+      if (paramValue[0] != '"') strValue += '"';
+      strValue += paramValue;
+      if (!paramValue.endsWith('"') || paramValue.endsWith('\\"'))
+        strValue += '"';
       return strValue;
     }
     if (Array.isArray(paramValue)) {