electrodb 3.6.2 → 3.7.0

package/src/errors.js

@@ -133,28 +133,28 @@ const ErrorCodes = {
     name: "IncompatibleKeyCasing",
     sym: ErrorCode,
   },
-  InvalidClientProvided: {
+  InvalidListenerProvided: {
     code: 1021,
-    section: "invalid-client-provided",
-    name: "InvalidClientProvided",
+    section: "invalid-listener-provided",
+    name: "InvalidListenerProvided",
     sym: ErrorCode,
   },
-  InconsistentIndexDefinition: {
+  InvalidLoggerProvided: {
     code: 1022,
-    section: "inconsistent-index-definition",
-    name: "Inconsistent Index Definition",
+    section: "invalid-logger-provided",
+    name: "InvalidLoggerProvided",
     sym: ErrorCode,
   },
-  InvalidListenerProvided: {
+  InvalidClientProvided: {
     code: 1023,
-    section: "invalid-listener-provided",
-    name: "InvalidListenerProvided",
+    section: "invalid-client-provided",
+    name: "InvalidClientProvided",
     sym: ErrorCode,
   },
-  InvalidLoggerProvided: {
+  InconsistentIndexDefinition: {
     code: 1024,
-    section: "invalid-listener-provided",
-    name: "InvalidListenerProvided",
+    section: "inconsistent-index-definition",
+    name: "Inconsistent Index Definition",
     sym: ErrorCode,
   },
   InvalidProjectionDefinition: {
@@ -163,6 +163,12 @@ const ErrorCodes = {
     name: "InvalidProjectionDefinition",
     sym: ErrorCode,
   },
+  InvalidIndexDefinition: {
+    code: 1026,
+    section: "invalid-index-definition",
+    name: "InvalidIndexDefinition",
+    sym: ErrorCode,
+  },
   MissingAttribute: {
     code: 2001,
     section: "missing-attribute",
@@ -235,6 +241,12 @@ const ErrorCodes = {
     name: "IncompleteIndexCompositesAttributesProvided",
     sym: ErrorCode,
   },
+  InvalidQueryParameters: {
+    code: 2013,
+    section: "invalid-query-parameters",
+    name: "InvalidQueryParameters",
+    sym: ErrorCode,
+  },
   InvalidAttribute: {
     code: 3001,
     section: "invalid-attribute",

package/src/operations.js

@@ -90,9 +90,9 @@ class ExpressionState {
   }
 
   setValue(name, value) {
-    name = this.formatName(name);
-    let valueCount = this.incrementName(name);
-    let expression = `:${name}${valueCount}`;
+    const formated = this.formatName(name);
+    let valueCount = this.incrementName(formated);
+    let expression = `:${formated}${valueCount}`;
     this.values[expression] = value;
     return expression;
   }

package/src/service.js

@@ -16,7 +16,7 @@ const {
   DataOptions, IndexProjectionOptions,
 } = require("./types");
 const { FilterFactory } = require("./filters");
-const { FilterOperations } = require("./operations");
+const { FilterOperations, ExpressionState } = require("./operations");
 const { WhereFactory } = require("./where");
 const v = require("./validations");
 const c = require("./client");
@@ -279,9 +279,11 @@ class Service {
 
     this.entities[name] = entity;
     for (let collection of this.entities[name].model.collections) {
-      // todo: this used to be inside the collection callback, it does not do well being ran multiple times
-      // this forlook adds the entity filters multiple times
-      this._addCollectionEntity(collection, name, this.entities[name]);
+      this._addCollectionEntity(
+        collection,
+        name,
+        this.entities[name],
+      );
       this.collections[collection] = (...facets) => {
         return this._makeCollectionChain(
           {
@@ -659,7 +661,10 @@ class Service {
       );
     }
 
-    if (definition.type === "clustered") {
+    if (
+      definition.type === IndexTypes.clustered ||
+      definition.type === IndexTypes.composite
+    ) {
       for (
         let i = 0;
         i <
@@ -933,11 +938,12 @@ class Service {
 
     if (
       providedSubCollections.length > 1 &&
-      providedType === IndexTypes.clustered
+      (providedType === IndexTypes.clustered ||
+        providedType === IndexTypes.composite)
     ) {
       throw new e.ElectroError(
         e.ErrorCodes.InvalidJoin,
-        `Clustered indexes do not support sub-collections. The sub-collection "${collectionName}", on Entity "${entityName}" must be defined as either an individual collection name or the index must be redefined as an isolated cluster`,
+        `"${providedType}" indexes do not support sub-collections. The sub-collection "${collectionName}", on Entity "${entityName}" must be defined as either an individual collection name or the index must be redefined as an "${IndexTypes.isolated}" index`,
       );
     }
     const existingRequiredIndex =
@@ -997,7 +1003,11 @@ class Service {
     }
   }
 
-  _addCollectionEntity(collection = "", name = "", entity = {}) {
+  _addCollectionEntity(
+    collection = "",
+    name = "",
+    entity = {},
+  ) {
     let providedIndex = this._getEntityIndexFromCollectionName(
       collection,
       entity,
@@ -1007,11 +1017,7 @@ class Service {
       entities: {},
       keys: {},
       attributes: {},
-      identifiers: {
-        names: {},
-        values: {},
-        expression: "",
-      },
+      identifiers: new ExpressionState({ prefix: "_c" }),
       index: undefined,
       table: "",
       collection: [],
@@ -1060,10 +1066,12 @@ class Service {
         this.collectionSchema[collection].keys,
       );
     this.collectionSchema[collection].entities[name] = entity;
+
     this.collectionSchema[collection].identifiers =
       this._processEntityIdentifiers(
         this.collectionSchema[collection].identifiers,
-        entity.getIdentifierExpressions(name),
+        name,
+        entity,
       );
     this.collectionSchema[collection].index =
       this._processEntityCollectionIndex(
@@ -1104,20 +1112,16 @@ class Service {
     }
   }
 
-  _processEntityIdentifiers(existing = {}, { names, values, expression } = {}) {
-    let identifiers = {};
-    if (names) {
-      identifiers.names = Object.assign({}, existing.names, names);
-    }
-    if (values) {
-      identifiers.values = Object.assign({}, existing.values, values);
-    }
+  _processEntityIdentifiers(state, alias, entity) {
+    const expression = entity.applyIdentifierExpressionState(state, alias);
     if (expression) {
-      identifiers.expression = [existing.expression, expression]
+      const combined = [state.getExpression().trim(), expression.trim()]
         .filter(Boolean)
         .join(" OR ");
+      state.setExpression(combined);
     }
-    return identifiers;
+
+    return state;
   }
 }
 

package/src/types.js

@@ -31,6 +31,7 @@ const QueryTypes = {
   between: "between",
   collection: "collection",
   clustered_collection: "clustered_collection",
+  composite_collection: "composite_collection",
   is: "is",
 };
 
@@ -89,6 +90,7 @@ const MethodTypeTranslation = {
 const IndexTypes = {
   isolated: "isolated",
   clustered: "clustered",
+  composite: "composite",
 };
 
 const Comparisons = {
@@ -229,6 +231,7 @@ const ItemOperations = {
   subtract: "subtract",
   append: "append",
   ifNotExists: "ifNotExists",
+  none: "",
 };
 
 const UpsertOperations = {

package/src/validations.js

@@ -1,5 +1,5 @@
 const e = require("./errors");
-const { KeyCasing, IndexProjectionOptions } = require("./types");
+const { KeyCasing, IndexProjectionOptions, IndexTypes } = require("./types");
 
 const Validator = require("jsonschema").Validator;
 Validator.prototype.customFormats.isFunction = function (input) {
@@ -89,7 +89,7 @@ const Index = {
       properties: {
         field: {
           type: "string",
-          required: true,
+          required: false,
         },
         facets: {
           type: ["array", "string"],
@@ -127,11 +127,10 @@ const Index = {
     },
     sk: {
       type: "object",
-      required: ["field"],
       properties: {
         field: {
           type: "string",
-          required: true,
+          required: false,
         },
         facets: {
           type: ["array", "string"],
@@ -171,7 +170,7 @@ const Index = {
     },
     type: {
       type: "string",
-      enum: ["clustered", "isolated"],
+      enum: Object.values(IndexTypes),
       required: false,
     },
     condition: {
@@ -190,7 +189,6 @@ const Index = {
 
 const Modelv1 = {
   type: "object",
-  required: true,
   properties: {
     model: {
       type: "object",
@@ -233,7 +231,6 @@ const Modelv1 = {
 
 const ModelBeta = {
   type: "object",
-  required: true,
   properties: {
     service: {
       type: "string",