@koralium/base-client 1.0.5 → 1.3.0-alpha10

package/lib/queryOptions.d.ts

@@ -1,5 +1,5 @@
-export interface QueryOptions {
-    parameters?: {} | null;
-    headers?: {};
-    extraData?: {};
-}
+export interface QueryOptions {
+    parameters?: {} | null;
+    headers?: {};
+    extraData?: {};
+}

package/lib/queryOptions.js

@@ -1,3 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=queryOptions.js.map

package/lib/queryResult.d.ts

@@ -1,9 +1,16 @@
-export declare class Metadata {
-    customMetadata: {};
-    constructor(customMetadata: {});
-}
-export declare class QueryResult {
-    rows: Array<{}>;
-    metadata: Metadata;
-    constructor(rows: Array<{}>, metadata: Metadata);
-}
+export declare class Metadata {
+    customMetadata: {};
+    constructor(customMetadata: {});
+}
+export interface ResultArray<T> extends Iterable<T> {
+    length: number;
+    get(index: number): T;
+    toArray: () => Array<T>;
+}
+export declare class QueryResult<T extends {
+    [key: string]: any;
+} = any> {
+    rows: ResultArray<T>;
+    metadata: Metadata;
+    constructor(rows: ResultArray<T>, metadata: Metadata);
+}

package/lib/queryResult.js

@@ -1,30 +1,30 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.QueryResult = exports.Metadata = void 0;
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-class Metadata {
-    constructor(customMetadata) {
-        this.customMetadata = customMetadata;
-    }
-}
-exports.Metadata = Metadata;
-class QueryResult {
-    constructor(rows, metadata) {
-        this.rows = rows;
-        this.metadata = metadata;
-    }
-}
-exports.QueryResult = QueryResult;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.QueryResult = exports.Metadata = void 0;
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class Metadata {
+    constructor(customMetadata) {
+        this.customMetadata = customMetadata;
+    }
+}
+exports.Metadata = Metadata;
+class QueryResult {
+    constructor(rows, metadata) {
+        this.rows = rows;
+        this.metadata = metadata;
+    }
+}
+exports.QueryResult = QueryResult;
 //# sourceMappingURL=queryResult.js.map

package/lib/queryResult.js.map

@@ -1 +1 @@
-{"version":3,"file":"queryResult.js","sourceRoot":"","sources":["../src/queryResult.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;GAYG;AACH,MAAa,QAAQ;IAGnB,YAAY,cAAkB;QAC5B,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACvC,CAAC;CACF;AAND,4BAMC;AAED,MAAa,WAAW;IAItB,YAAY,IAAe,EAAE,QAAkB;QAC7C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;CACF;AARD,kCAQC"}
+{"version":3,"file":"queryResult.js","sourceRoot":"","sources":["../src/queryResult.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;GAYG;AACH,MAAa,QAAQ;IAGnB,YAAY,cAAkB;QAC5B,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACvC,CAAC;CACF;AAND,4BAMC;AAQD,MAAa,WAAW;IAItB,YAAY,IAAoB,EAAE,QAAkB;QAClD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;CACF;AARD,kCAQC"}

package/package.json

@@ -1,31 +1,32 @@
-{
-  "name": "@koralium/base-client",
-  "version": "1.0.5",
-  "main": "./lib/index.js",
-  "license": "MIT",
-  "scripts": {
-    "build": "tsc --build",
-    "clean": "tsc --build --clean",
-    "test": "jest",
-    "coverage": "jest --coverage",
-    "publish-package": "npm publish --access public"
-  },
-  "devDependencies": {
-    "@types/chai": "^4.2.11",
-    "@types/google-protobuf": "^3.7.2",
-    "@types/jest": "^26.0.24",
-    "@types/node": "^14.0.14",
-    "chai": "4.2.0",
-    "chai-arrays": "^2.2.0",
-    "cross-env": "5.2.0",
-    "jest": "^26.1.0",
-    "jest-editor-support": "^27.2.0",
-    "jest-sonar-reporter": "^2.0.0",
-    "neat-csv": "^5.2.0",
-    "nyc": "14.1.1",
-    "testcontainers": "^2.14.0",
-    "ts-jest": "^26.1.1",
-    "ts-node": "^8.10.2",
-    "typescript": "^3.2.2"
-  }
-}
+{
+  "name": "@koralium/base-client",
+  "version": "1.3.0-alpha10",
+  "main": "./lib/index.js",
+  "license": "MIT",
+  "scripts": {
+    "build": "tsc --build",
+    "clean": "tsc --build --clean",
+    "test": "jest",
+    "coverage": "jest --coverage",
+    "publish-package": "npm publish --access public"
+  },
+  "devDependencies": {
+    "@types/chai": "^4.2.11",
+    "@types/google-protobuf": "^3.7.2",
+    "@types/jest": "^26.0.24",
+    "@types/node": "^14.0.14",
+    "chai": "4.2.0",
+    "chai-arrays": "^2.2.0",
+    "cross-env": "5.2.0",
+    "jest": "^26.1.0",
+    "jest-editor-support": "^27.2.0",
+    "jest-sonar-reporter": "^2.0.0",
+    "neat-csv": "^5.2.0",
+    "nyc": "14.1.1",
+    "testcontainers": "^2.14.0",
+    "ts-jest": "^26.1.1",
+    "ts-node": "^8.10.2",
+    "typescript": "^3.2.2"
+  },
+  "gitHead": "f7ad9a5e126086a6a02a2d349f1d2d6546912a25"
+}

package/src/filterBuilder.ts

@@ -1,200 +1,200 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { ParameterBuilder } from "./parameterBuilder";
-
-
-function isString(val: any): val is string {
-  return typeof (val) === "string";
-}
-
-function isNumber(val: any): val is number {
-  return typeof (val) === "number";
-}
-
-function isBoolean(val: any): val is boolean {
-  return typeof (val) === 'boolean';
-}
-
-//Check if the value is a FieldQuery type
-function isFieldQuery(val: any): val is FieldQuery {
-  return val.eq !== undefined ||
-      val.lt !== undefined ||
-      val.lte !== undefined ||
-      val.gt !== undefined ||
-      val.gte !== undefined ||
-      val.startsWith !== undefined ||
-      val.endsWith !== undefined ||
-      val.contains !== undefined ||
-      val.in !== undefined;
-}
-
-
-function writeSingleValue(arr: Array<string>, parameters: ParameterBuilder, val: string | number | boolean | undefined, operation: (string: string) => string): void {
-  if (val !== undefined) {
-      if (isString(val)) {
-          const parameterName = parameters.getParameterName(val);
-          arr.push(operation(`@${parameterName}`));
-      }
-      if (isNumber(val)) {
-          arr.push(operation(`${val}`));
-      }
-      if (isBoolean(val)) {
-          arr.push(operation(`${val}`));
-      }
-  }
-}
-
-function writeArrayValue(arr: Array<string>, parameters: ParameterBuilder, val: Array<string | number | boolean> | undefined, operation: (values: Array<string>) => string) {
-  if (!!val && val.length > 0) {
-    const arrayvalues: Array<string> = [];
-    for(let v of val) {
-      if (isString(v)) {
-        const parameterName = parameters.getParameterName(v);
-        arrayvalues.push(`@${parameterName}`);
-      }
-      if (isNumber(v) || isBoolean(v)) {
-          arrayvalues.push(`${v}`);
-      }
-    }
-    arr.push(operation(arrayvalues));
-  }
-}
-
-export function writeFilter(filter: {} | FieldQuery): FilterResult {
-
-  const parameters = new ParameterBuilder();
-  
-  const result = writeFilterWithParameterBuilder(parameters, filter);
-
-  return new FilterResult(result, parameters.getParameters());
-}
-
-function writeSearchFilter(parameters: ParameterBuilder, value: SearchFilter): string {
-  
-  if (value.queryString !== undefined) {
-
-    let output = "CONTAINS(";
-
-    if (value.fields !== undefined) {
-      output += `(${value.fields.join(', ')})`;
-    }
-    else{
-      output += "*";
-    }
-    output += ", ";
-    output += `@${parameters.getParameterName(value.queryString)}`;
-    output += ")";
-    
-    return output;
-  }
-
-  return "";
-}
-
-export function writeFilterWithParameterBuilder(parameterBuilder: ParameterBuilder, filter: {} | FieldQuery): string {
-  let operations: Array<string> = [];
-  let andOperation = null;
-  let orOperation = null;
-
-  for (let [key, value] of Object.entries(filter)) {
-
-      if (isFieldQuery(value)) {
-          operations.push(writeFilterField(key, value, parameterBuilder));
-      }
-      if (key === "and") {
-          andOperation = writeFilterWithParameterBuilder(parameterBuilder, value);
-      }
-      if (key === "or") {
-          orOperation = writeFilterWithParameterBuilder(parameterBuilder, value);
-      }
-      if(key === "search") {
-        operations.push(writeSearchFilter(parameterBuilder, value));
-      }
-  }
-  let query = "";
-
-  operations = operations.filter(x => x !== "");
-  
-  if(operations.length > 0) {
-    query = `(${operations.join(" AND ")})`;
-  }
-
-  if (andOperation != null) {
-    if(query !== "") {
-      query += " AND ";
-    }
-    query += andOperation;
-  }
-  if (orOperation != null) {
-    if(query !== "") {
-      query += " OR ";
-    }
-    query += orOperation;
-  }
-
-  return query;
-}
-
-function writeFilterField(fieldName: string, field: FieldQuery, parameters: ParameterBuilder): string {
-
-  const basicOperations: Array<string> = [];
-
-  writeSingleValue(basicOperations, parameters, field.eq, c => `${fieldName} = ${c}`);
-  writeSingleValue(basicOperations, parameters, field.gt, c => `${fieldName} > ${c}`);
-  writeSingleValue(basicOperations, parameters, field.gte, c => `${fieldName} >= ${c}`);
-  writeSingleValue(basicOperations, parameters, field.lt, c => `${fieldName} < ${c}`);
-  writeSingleValue(basicOperations, parameters, field.lte, c => `${fieldName} <= ${c}`);
-
-  writeArrayValue(basicOperations, parameters, field.in, c => `${fieldName} IN (${c.join(', ')})`);
-
-  //string specific
-  writeSingleValue(basicOperations, parameters, field.contains, c => `${fieldName} LIKE '%' + ${c} + '%'`);
-  writeSingleValue(basicOperations, parameters, field.endsWith, c => `${fieldName} LIKE '%' + ${c}`);
-  writeSingleValue(basicOperations, parameters, field.startsWith, c => `${fieldName} LIKE ${c} + '%'`);
-  
-  let basicQuery = basicOperations.join(" AND ");
-
-  return basicQuery;
-}
-
-export class FilterResult {
-  filter: string;
-  parameters: {};
-
-  constructor(filter: string, parameters: {}) {
-    this.filter = filter;
-    this.parameters = parameters;
-  }
-}
-
-export class FieldQuery {
-  eq: string | number | boolean | undefined;
-
-  lt: string | number | undefined;
-  lte: string | number | undefined;
-  gt: string | number | undefined;
-  gte: string | number | undefined;
-
-  in: Array<string | number | boolean> | undefined;
-
-  //String specific
-  startsWith: string | number | undefined;
-  endsWith: string | number | undefined;
-  contains: string | number | undefined;
-}
-
-export class SearchFilter {
-  queryString: string | undefined;
-  fields: Array<string> | undefined;
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { ParameterBuilder } from "./parameterBuilder";
+
+
+function isString(val: any): val is string {
+  return typeof (val) === "string";
+}
+
+function isNumber(val: any): val is number {
+  return typeof (val) === "number";
+}
+
+function isBoolean(val: any): val is boolean {
+  return typeof (val) === 'boolean';
+}
+
+//Check if the value is a FieldQuery type
+function isFieldQuery(val: any): val is FieldQuery {
+  return val.eq !== undefined ||
+      val.lt !== undefined ||
+      val.lte !== undefined ||
+      val.gt !== undefined ||
+      val.gte !== undefined ||
+      val.startsWith !== undefined ||
+      val.endsWith !== undefined ||
+      val.contains !== undefined ||
+      val.in !== undefined;
+}
+
+
+function writeSingleValue(arr: Array<string>, parameters: ParameterBuilder, val: string | number | boolean | undefined, operation: (string: string) => string): void {
+  if (val !== undefined) {
+      if (isString(val)) {
+          const parameterName = parameters.getParameterName(val);
+          arr.push(operation(`@${parameterName}`));
+      }
+      if (isNumber(val)) {
+          arr.push(operation(`${val}`));
+      }
+      if (isBoolean(val)) {
+          arr.push(operation(`${val}`));
+      }
+  }
+}
+
+function writeArrayValue(arr: Array<string>, parameters: ParameterBuilder, val: Array<string | number | boolean> | undefined, operation: (values: Array<string>) => string) {
+  if (!!val && val.length > 0) {
+    const arrayvalues: Array<string> = [];
+    for(let v of val) {
+      if (isString(v)) {
+        const parameterName = parameters.getParameterName(v);
+        arrayvalues.push(`@${parameterName}`);
+      }
+      if (isNumber(v) || isBoolean(v)) {
+          arrayvalues.push(`${v}`);
+      }
+    }
+    arr.push(operation(arrayvalues));
+  }
+}
+
+export function writeFilter(filter: {} | FieldQuery): FilterResult {
+
+  const parameters = new ParameterBuilder();
+  
+  const result = writeFilterWithParameterBuilder(parameters, filter);
+
+  return new FilterResult(result, parameters.getParameters());
+}
+
+function writeSearchFilter(parameters: ParameterBuilder, value: SearchFilter): string {
+  
+  if (value.queryString !== undefined) {
+
+    let output = "CONTAINS(";
+
+    if (value.fields !== undefined) {
+      output += `(${value.fields.join(', ')})`;
+    }
+    else{
+      output += "*";
+    }
+    output += ", ";
+    output += `@${parameters.getParameterName(value.queryString)}`;
+    output += ")";
+    
+    return output;
+  }
+
+  return "";
+}
+
+export function writeFilterWithParameterBuilder(parameterBuilder: ParameterBuilder, filter: {} | FieldQuery): string {
+  let operations: Array<string> = [];
+  let andOperation = null;
+  let orOperation = null;
+
+  for (let [key, value] of Object.entries(filter)) {
+
+      if (isFieldQuery(value)) {
+          operations.push(writeFilterField(key, value, parameterBuilder));
+      }
+      if (key === "and") {
+          andOperation = writeFilterWithParameterBuilder(parameterBuilder, value);
+      }
+      if (key === "or") {
+          orOperation = writeFilterWithParameterBuilder(parameterBuilder, value);
+      }
+      if(key === "search") {
+        operations.push(writeSearchFilter(parameterBuilder, value));
+      }
+  }
+  let query = "";
+
+  operations = operations.filter(x => x !== "");
+  
+  if(operations.length > 0) {
+    query = `(${operations.join(" AND ")})`;
+  }
+
+  if (andOperation != null) {
+    if(query !== "") {
+      query += " AND ";
+    }
+    query += andOperation;
+  }
+  if (orOperation != null) {
+    if(query !== "") {
+      query += " OR ";
+    }
+    query += orOperation;
+  }
+
+  return query;
+}
+
+function writeFilterField(fieldName: string, field: FieldQuery, parameters: ParameterBuilder): string {
+
+  const basicOperations: Array<string> = [];
+
+  writeSingleValue(basicOperations, parameters, field.eq, c => `${fieldName} = ${c}`);
+  writeSingleValue(basicOperations, parameters, field.gt, c => `${fieldName} > ${c}`);
+  writeSingleValue(basicOperations, parameters, field.gte, c => `${fieldName} >= ${c}`);
+  writeSingleValue(basicOperations, parameters, field.lt, c => `${fieldName} < ${c}`);
+  writeSingleValue(basicOperations, parameters, field.lte, c => `${fieldName} <= ${c}`);
+
+  writeArrayValue(basicOperations, parameters, field.in, c => `${fieldName} IN (${c.join(', ')})`);
+
+  //string specific
+  writeSingleValue(basicOperations, parameters, field.contains, c => `${fieldName} LIKE '%' + ${c} + '%'`);
+  writeSingleValue(basicOperations, parameters, field.endsWith, c => `${fieldName} LIKE '%' + ${c}`);
+  writeSingleValue(basicOperations, parameters, field.startsWith, c => `${fieldName} LIKE ${c} + '%'`);
+  
+  let basicQuery = basicOperations.join(" AND ");
+
+  return basicQuery;
+}
+
+export class FilterResult {
+  filter: string;
+  parameters: {};
+
+  constructor(filter: string, parameters: {}) {
+    this.filter = filter;
+    this.parameters = parameters;
+  }
+}
+
+export class FieldQuery {
+  eq: string | number | boolean | undefined;
+
+  lt: string | number | undefined;
+  lte: string | number | undefined;
+  gt: string | number | undefined;
+  gte: string | number | undefined;
+
+  in: Array<string | number | boolean> | undefined;
+
+  //String specific
+  startsWith: string | number | undefined;
+  endsWith: string | number | undefined;
+  contains: string | number | undefined;
+}
+
+export class SearchFilter {
+  queryString: string | undefined;
+  fields: Array<string> | undefined;
 }