electrodb 2.10.0 → 2.10.2

package/src/where.js

@@ -1,147 +1,169 @@
-const {MethodTypes, ExpressionTypes, BuilderTypes} = require("./types");
-const {AttributeOperationProxy, ExpressionState, FilterOperations} = require("./operations");
+const { MethodTypes, ExpressionTypes, BuilderTypes } = require("./types");
+const {
+  AttributeOperationProxy,
+  ExpressionState,
+  FilterOperations,
+} = require("./operations");
 const e = require("./errors");
 
 class FilterExpression extends ExpressionState {
-	constructor(props) {
-		super(props);
-		this.expression = "";
-		this.type = BuilderTypes.filter;
-	}
+  constructor(props) {
+    super(props);
+    this.expression = "";
+    this.type = BuilderTypes.filter;
+  }
 
-	_trim(expression) {
-		if (typeof expression === "string" && expression.length > 0) {
-			return expression.replace(/\n|\r/g, "").trim();
-		}
-		return "";
-	}
+  _trim(expression) {
+    if (typeof expression === "string" && expression.length > 0) {
+      return expression.replace(/\n|\r/g, "").trim();
+    }
+    return "";
+  }
 
-	_isEmpty(expression) {
-		if (typeof expression !== "string") {
-			throw new Error("Invalid expression value type. Expected type string.");
-		}
-		return !expression.replace(/\n|\r|\w/g, "").trim();
-	}
+  _isEmpty(expression) {
+    if (typeof expression !== "string") {
+      throw new Error("Invalid expression value type. Expected type string.");
+    }
+    return !expression.replace(/\n|\r|\w/g, "").trim();
+  }
 
-	add(newExpression) {
-		let expression = "";
-		let existingExpression = this.expression;
-		if (typeof existingExpression === "string" && existingExpression.length > 0) {
-			newExpression = this._trim(newExpression);
-			let isEmpty = this._isEmpty(newExpression);
-			if (isEmpty) {
-				return existingExpression;
-			}
-			let existingNeedsParens = !existingExpression.startsWith("(") && !existingExpression.endsWith(")");
-			if (existingNeedsParens) {
-				existingExpression = `(${existingExpression})`;
-			}
-			expression = `${existingExpression} AND ${newExpression}`;
-		} else {
-			expression = this._trim(newExpression);
-		}
-		this.expression = expression;
-	}
+  add(newExpression) {
+    let expression = "";
+    let existingExpression = this.expression;
+    if (
+      typeof existingExpression === "string" &&
+      existingExpression.length > 0
+    ) {
+      newExpression = this._trim(newExpression);
+      let isEmpty = this._isEmpty(newExpression);
+      if (isEmpty) {
+        return existingExpression;
+      }
+      let existingNeedsParens =
+        !existingExpression.startsWith("(") &&
+        !existingExpression.endsWith(")");
+      if (existingNeedsParens) {
+        existingExpression = `(${existingExpression})`;
+      }
+      expression = `${existingExpression} AND ${newExpression}`;
+    } else {
+      expression = this._trim(newExpression);
+    }
+    this.expression = expression;
+  }
 
-	// applies operations without verifying them against known attributes. Used internally for key conditions.
-	unsafeSet(operation, name, ...values) {
-		const {template} = FilterOperations[operation] || {};
-		if (template === undefined) {
-			throw new Error(`Invalid operation: "${operation}". Please report this issue via a bug ticket.`);
-		}
-		const names = this.setName({}, name, name);
-		const valueExpressions = values.map(value => this.setValue(name, value));
-		const condition = template({}, names.expression, names.prop, ...valueExpressions);
-		this.add(condition);
-	}
+  // applies operations without verifying them against known attributes. Used internally for key conditions.
+  unsafeSet(operation, name, ...values) {
+    const { template } = FilterOperations[operation] || {};
+    if (template === undefined) {
+      throw new Error(
+        `Invalid operation: "${operation}". Please report this issue via a bug ticket.`,
+      );
+    }
+    const names = this.setName({}, name, name);
+    const valueExpressions = values.map((value) => this.setValue(name, value));
+    const condition = template(
+      {},
+      names.expression,
+      names.prop,
+      ...valueExpressions,
+    );
+    this.add(condition);
+  }
 
-	build() {
-		return this.expression;
-	}
+  build() {
+    return this.expression;
+  }
 }
 
 class WhereFactory {
   constructor(attributes = {}, operations = {}) {
-    this.attributes = {...attributes};
-    this.operations = {...operations};
+    this.attributes = { ...attributes };
+    this.operations = { ...operations };
   }
 
   getExpressionType(methodType) {
-  	switch (methodType) {
-		case MethodTypes.put:
-		case MethodTypes.create:
-		case MethodTypes.update:
-		case MethodTypes.patch:
-		case MethodTypes.delete:
-		case MethodTypes.remove:
-		case MethodTypes.upsert:
-		case MethodTypes.get:
-		case MethodTypes.check:
-			return ExpressionTypes.ConditionExpression
-		default:
-			return ExpressionTypes.FilterExpression
-	}
+    switch (methodType) {
+      case MethodTypes.put:
+      case MethodTypes.create:
+      case MethodTypes.update:
+      case MethodTypes.patch:
+      case MethodTypes.delete:
+      case MethodTypes.remove:
+      case MethodTypes.upsert:
+      case MethodTypes.get:
+      case MethodTypes.check:
+        return ExpressionTypes.ConditionExpression;
+      default:
+        return ExpressionTypes.FilterExpression;
+    }
   }
 
-	buildClause(cb) {
-		if (typeof cb !== "function") {
-			throw new e.ElectroError(e.ErrorCodes.InvalidWhere, 'Where callback must be of type "function"');
-		}
-		return (entity, state, ...params) => {
-			const type = this.getExpressionType(state.query.method);
-			const builder = state.query.filter[type];
-			const proxy = new AttributeOperationProxy({
-				builder,
-				attributes: this.attributes,
-				operations: this.operations
-			});
-			const expression = proxy.invokeCallback(cb, ...params);
-			if (typeof expression !== "string") {
-				throw new e.ElectroError(e.ErrorCodes.InvalidWhere, "Invalid response from where clause callback. Expected return result to be of type string");
-			}
-			builder.add(expression);
-			return state;
-		};
-	}
+  buildClause(cb) {
+    if (typeof cb !== "function") {
+      throw new e.ElectroError(
+        e.ErrorCodes.InvalidWhere,
+        'Where callback must be of type "function"',
+      );
+    }
+    return (entity, state, ...params) => {
+      const type = this.getExpressionType(state.query.method);
+      const builder = state.query.filter[type];
+      const proxy = new AttributeOperationProxy({
+        builder,
+        attributes: this.attributes,
+        operations: this.operations,
+      });
+      const expression = proxy.invokeCallback(cb, ...params);
+      if (typeof expression !== "string") {
+        throw new e.ElectroError(
+          e.ErrorCodes.InvalidWhere,
+          "Invalid response from where clause callback. Expected return result to be of type string",
+        );
+      }
+      builder.add(expression);
+      return state;
+    };
+  }
 
   injectWhereClauses(clauses = {}, filters = {}) {
-		let injected = { ...clauses };
-		let filterParents = Object.entries(injected)
-			.filter(clause => {
-				let [name, { children }] = clause;
-				return children.find(child => ['go', 'commit'].includes(child));
-			})
-			.map(([name]) => name);
-		let modelFilters = Object.keys(filters);
-		let filterChildren = [];
-		for (let [name, filter] of Object.entries(filters)) {
-			filterChildren.push(name);
-			injected[name] = {
-				name,
-				action: this.buildClause(filter),
-				children: ["params", "go", "commit", "where", ...modelFilters],
-			};
-		}
-		filterChildren.push("where");
-		injected["where"] = {
-			name: "where",
-			action: (entity, state, fn) => {
-				return this.buildClause(fn)(entity, state);
-			},
-			children: ["params", "go", "commit", "where", ...modelFilters],
-		};
-		for (let parent of filterParents) {
-			injected[parent] = { ...injected[parent] };
-			injected[parent].children = [
-				...filterChildren,
-				...injected[parent].children,
-			];
-		}
-		return injected;
-	}
+    let injected = { ...clauses };
+    let filterParents = Object.entries(injected)
+      .filter((clause) => {
+        let [name, { children }] = clause;
+        return children.find((child) => ["go", "commit"].includes(child));
+      })
+      .map(([name]) => name);
+    let modelFilters = Object.keys(filters);
+    let filterChildren = [];
+    for (let [name, filter] of Object.entries(filters)) {
+      filterChildren.push(name);
+      injected[name] = {
+        name,
+        action: this.buildClause(filter),
+        children: ["params", "go", "commit", "where", ...modelFilters],
+      };
+    }
+    filterChildren.push("where");
+    injected["where"] = {
+      name: "where",
+      action: (entity, state, fn) => {
+        return this.buildClause(fn)(entity, state);
+      },
+      children: ["params", "go", "commit", "where", ...modelFilters],
+    };
+    for (let parent of filterParents) {
+      injected[parent] = { ...injected[parent] };
+      injected[parent].children = [
+        ...filterChildren,
+        ...injected[parent].children,
+      ];
+    }
+    return injected;
+  }
 }
 
 module.exports = {
-	WhereFactory,
-	FilterExpression
+  WhereFactory,
+  FilterExpression,
 };

package/tsconfig.json

@@ -4,17 +4,18 @@
 
     /* Basic Options */
     // "incremental": true,                         /* Enable incremental compilation */
-    "target": "es5",                                /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */
-    "module": "commonjs",                           /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
-    // "lib": [],                                   /* Specify library files to be included in the compilation. */
+    "target": "ESNext" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */,
+    "module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */,
+    "lib": ["ESNext"],                                   /* Specify library files to be included in the compilation. */
+    "resolveJsonModule": true,
     // "allowJs": true,                             /* Allow javascript files to be compiled. */
     // "checkJs": true,                             /* Report errors in .js files. */
     // "jsx": "preserve",                           /* Specify JSX code generation: 'preserve', 'react-native', 'react', 'react-jsx' or 'react-jsxdev'. */
     // "declaration": true,                         /* Generates corresponding '.d.ts' file. */
     // "declarationMap": true,                      /* Generates a sourcemap for each corresponding '.d.ts' file. */
-    "sourceMap": true,                              /* Generates corresponding '.map' file. */
+    "sourceMap": true /* Generates corresponding '.map' file. */,
     // "outFile": "./",                             /* Concatenate and emit output to single file. */
-    "outDir": "./dist",                                 /* Redirect output structure to the directory. */
+    "outDir": "./dist" /* Redirect output structure to the directory. */,
     // "rootDir": "./",                             /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
     // "composite": true,                           /* Enable project compilation */
     // "tsBuildInfoFile": "./",                     /* Specify file to store incremental compilation information */
@@ -25,8 +26,8 @@
     // "isolatedModules": true,                     /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
 
     /* Strict Type-Checking Options */
-    "strict": true,                                 /* Enable all strict type-checking options. */
-    "noImplicitAny": true,                       /* Raise error on expressions and declarations with an implied 'any' type. */
+    "strict": true /* Enable all strict type-checking options. */,
+    "noImplicitAny": true /* Raise error on expressions and declarations with an implied 'any' type. */,
     // "strictNullChecks": true,                    /* Enable strict null checks. */
     // "strictFunctionTypes": true,                 /* Enable strict checking of function types. */
     // "strictBindCallApply": true,                 /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
@@ -43,14 +44,14 @@
     // "noPropertyAccessFromIndexSignature": true,  /* Require undeclared properties from index signatures to use element accesses. */
 
     /* Module Resolution Options */
-    // "moduleResolution": "node",                  /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
+    "moduleResolution": "node",                  /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
     // "baseUrl": "./",                             /* Base directory to resolve non-absolute module names. */
     // "paths": {},                                 /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
     // "rootDirs": [],                              /* List of root folders whose combined content represents the structure of the project at runtime. */
     // "typeRoots": [],                             /* List of folders to include type definitions from. */
     // "types": [],                                 /* Type declaration files to be included in compilation. */
     // "allowSyntheticDefaultImports": true,        /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
-    "esModuleInterop": true,                        /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
+    "esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */,
     // "preserveSymlinks": true,                    /* Do not resolve the real path of symlinks. */
     // "allowUmdGlobalAccess": true,                /* Allow accessing UMD globals from modules. */
 
@@ -65,7 +66,7 @@
     // "emitDecoratorMetadata": true,               /* Enables experimental support for emitting type metadata for decorators. */
 
     /* Advanced Options */
-    "skipLibCheck": true,                           /* Skip type checking of declaration files. */
-    "forceConsistentCasingInFileNames": true        /* Disallow inconsistently-cased references to the same file. */
+    "skipLibCheck": true /* Skip type checking of declaration files. */,
+    "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */
   }
 }