@opra/elastic 1.5.2 → 1.5.4

package/cjs/adapter-utils/prepare-projection.js

@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = prepareProjection;
 exports.prepare = prepare;
 const common_1 = require("@opra/common");
-function prepareProjection(dataType, projection) {
+function prepareProjection(dataType, projection, scope) {
     const out = {};
     const includes = [];
     const excludes = [];
     const projection_ = typeof projection === 'string' || Array.isArray(projection)
         ? (0, common_1.parseFieldsProjection)(projection)
         : projection;
-    prepare(dataType, includes, excludes, '', projection_);
+    prepare(dataType, includes, excludes, '', projection_, scope);
     if (includes.length)
         out.includes = includes;
     if (excludes.length)
@@ -20,7 +20,7 @@ function prepareProjection(dataType, projection) {
 function getNeedIncludes(projection) {
     return !!(projection && Object.values(projection).find(p => !p.sign));
 }
-function prepare(dataType, includes, excludes, curPath, projection) {
+function prepare(dataType, includes, excludes, curPath, projection, scope) {
     const needIncludes = getNeedIncludes(projection);
     const projectionKeys = projection && Object.keys(projection);
     const projectionKeysSet = new Set(projectionKeys);
@@ -29,7 +29,7 @@ function prepare(dataType, includes, excludes, curPath, projection) {
     let field;
     let k;
     /** Add fields from data type */
-    for (field of dataType.fields.values()) {
+    for (field of dataType.fields(scope)) {
         fieldName = field.name;
         fieldPath = curPath + (curPath ? '.' : '') + fieldName;
         k = fieldName.toLowerCase();

package/cjs/elastic-entity-service.js

@@ -215,7 +215,7 @@ class ElasticEntityService extends elastic_service_js_1.ElasticService {
             sort: options?.sort
                 ? elastic_adapter_js_1.ElasticAdapter.prepareSort(options?.sort)
                 : undefined,
-            _source: elastic_adapter_js_1.ElasticAdapter.prepareProjection(this.dataType, options?.projection),
+            _source: elastic_adapter_js_1.ElasticAdapter.prepareProjection(this.dataType, options?.projection, this.scope),
             index: this.getIndexName(),
             ...options?.request,
             query,
@@ -299,7 +299,8 @@ class ElasticEntityService extends elastic_service_js_1.ElasticService {
      * @param operation - The operation to retrieve the encoder for. Valid values are 'create' and 'update'.
      */
     _getInputCodec(operation) {
-        let validator = this._inputCodecs[operation];
+        const cacheKey = operation + (this._dataTypeScope ? ':' + this._dataTypeScope : '');
+        let validator = this._inputCodecs[cacheKey];
         if (validator)
             return validator;
         const options = {
@@ -310,14 +311,15 @@ class ElasticEntityService extends elastic_service_js_1.ElasticService {
             options.partial = 'deep';
         const dataType = this.dataType;
         validator = dataType.generateCodec('decode', options);
-        this._inputCodecs[operation] = validator;
+        this._inputCodecs[cacheKey] = validator;
         return validator;
     }
     /**
      * Retrieves the codec.
      */
     _getOutputCodec(operation) {
-        let validator = this._outputCodecs[operation];
+        const cacheKey = operation + (this._dataTypeScope ? ':' + this._dataTypeScope : '');
+        let validator = this._outputCodecs[cacheKey];
         if (validator)
             return validator;
         const options = {
@@ -327,7 +329,7 @@ class ElasticEntityService extends elastic_service_js_1.ElasticService {
         };
         const dataType = this.dataType;
         validator = dataType.generateCodec('decode', options);
-        this._outputCodecs[operation] = validator;
+        this._outputCodecs[cacheKey] = validator;
         return validator;
     }
     async _executeCommand(command, commandFn) {

package/esm/adapter-utils/prepare-projection.js

@@ -1,12 +1,12 @@
 import { ComplexType, parseFieldsProjection, } from '@opra/common';
-export default function prepareProjection(dataType, projection) {
+export default function prepareProjection(dataType, projection, scope) {
     const out = {};
     const includes = [];
     const excludes = [];
     const projection_ = typeof projection === 'string' || Array.isArray(projection)
         ? parseFieldsProjection(projection)
         : projection;
-    prepare(dataType, includes, excludes, '', projection_);
+    prepare(dataType, includes, excludes, '', projection_, scope);
     if (includes.length)
         out.includes = includes;
     if (excludes.length)
@@ -16,7 +16,7 @@ export default function prepareProjection(dataType, projection) {
 function getNeedIncludes(projection) {
     return !!(projection && Object.values(projection).find(p => !p.sign));
 }
-export function prepare(dataType, includes, excludes, curPath, projection) {
+export function prepare(dataType, includes, excludes, curPath, projection, scope) {
     const needIncludes = getNeedIncludes(projection);
     const projectionKeys = projection && Object.keys(projection);
     const projectionKeysSet = new Set(projectionKeys);
@@ -25,7 +25,7 @@ export function prepare(dataType, includes, excludes, curPath, projection) {
     let field;
     let k;
     /** Add fields from data type */
-    for (field of dataType.fields.values()) {
+    for (field of dataType.fields(scope)) {
         fieldName = field.name;
         fieldPath = curPath + (curPath ? '.' : '') + fieldName;
         k = fieldName.toLowerCase();

package/esm/elastic-entity-service.js

@@ -212,7 +212,7 @@ export class ElasticEntityService extends ElasticService {
             sort: options?.sort
                 ? ElasticAdapter.prepareSort(options?.sort)
                 : undefined,
-            _source: ElasticAdapter.prepareProjection(this.dataType, options?.projection),
+            _source: ElasticAdapter.prepareProjection(this.dataType, options?.projection, this.scope),
             index: this.getIndexName(),
             ...options?.request,
             query,
@@ -296,7 +296,8 @@ export class ElasticEntityService extends ElasticService {
      * @param operation - The operation to retrieve the encoder for. Valid values are 'create' and 'update'.
      */
     _getInputCodec(operation) {
-        let validator = this._inputCodecs[operation];
+        const cacheKey = operation + (this._dataTypeScope ? ':' + this._dataTypeScope : '');
+        let validator = this._inputCodecs[cacheKey];
         if (validator)
             return validator;
         const options = {
@@ -307,14 +308,15 @@ export class ElasticEntityService extends ElasticService {
             options.partial = 'deep';
         const dataType = this.dataType;
         validator = dataType.generateCodec('decode', options);
-        this._inputCodecs[operation] = validator;
+        this._inputCodecs[cacheKey] = validator;
         return validator;
     }
     /**
      * Retrieves the codec.
      */
     _getOutputCodec(operation) {
-        let validator = this._outputCodecs[operation];
+        const cacheKey = operation + (this._dataTypeScope ? ':' + this._dataTypeScope : '');
+        let validator = this._outputCodecs[cacheKey];
         if (validator)
             return validator;
         const options = {
@@ -324,7 +326,7 @@ export class ElasticEntityService extends ElasticService {
         };
         const dataType = this.dataType;
         validator = dataType.generateCodec('decode', options);
-        this._outputCodecs[operation] = validator;
+        this._outputCodecs[cacheKey] = validator;
         return validator;
     }
     async _executeCommand(command, commandFn) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/elastic",
-  "version": "1.5.2",
+  "version": "1.5.4",
   "description": "Opra Elastic Search adapter package",
   "author": "Panates",
   "license": "MIT",
@@ -11,8 +11,8 @@
   },
   "peerDependencies": {
     "@elastic/elasticsearch": ">=8.7.0",
-    "@opra/common": "^1.5.2",
-    "@opra/core": "^1.5.2"
+    "@opra/common": "^1.5.4",
+    "@opra/core": "^1.5.4"
   },
   "type": "module",
   "exports": {

package/types/adapter-utils/prepare-projection.d.ts

@@ -3,5 +3,5 @@ export interface ElasticProjection {
     includes?: string[];
     excludes?: string[];
 }
-export default function prepareProjection(dataType: ComplexType, projection?: string | string[]): ElasticProjection | undefined;
-export declare function prepare(dataType: ComplexType, includes: string[], excludes: string[], curPath: string, projection?: FieldsProjection): void;
+export default function prepareProjection(dataType: ComplexType, projection?: string | string[], scope?: string): ElasticProjection | undefined;
+export declare function prepare(dataType: ComplexType, includes: string[], excludes: string[], curPath: string, projection?: FieldsProjection, scope?: string): void;