@roit/roit-data-firestore 1.2.38 → 1.2.41

package/dist/query/QueryPredicateFunctionTransform.js

@@ -81,7 +81,7 @@ class QueryPredicateFunctionTransform {
             startTracer: Tracer_1.startTracer,
             archiveService: ArchiveService_1.ArchiveService.getInstance()
         };
-        if (!(options === null || options === void 0 ? void 0 : options.collection)) {
+        if (!options?.collection) {
             throw new Error(`Collection is required`);
         }
         this.classConfig.set(repositoryClassName, options);
@@ -97,28 +97,28 @@ class QueryPredicateFunctionTransform {
                 .replace(/yield/g, 'await')
                 .replace(/<COLLECTION_REPLACE>/g, options.collection)
                 .replace("let modelName = ''", `let modelName = '${modelName}'`)
-                .replace("let validatorOptions", `let validatorOptions = ${(options === null || options === void 0 ? void 0 : options.validatorOptions) ? JSON.stringify(options === null || options === void 0 ? void 0 : options.validatorOptions) : undefined}`)
+                .replace("let validatorOptions", `let validatorOptions = ${options?.validatorOptions ? JSON.stringify(options?.validatorOptions) : undefined}`)
                 .replace("let repositoryClassName = ''", `let repositoryClassName = '${repositoryClassName}'`)
                 .replace("let methodSignature = ''", `let methodSignature = '${methodSignature}'`);
-            if (options === null || options === void 0 ? void 0 : options.ttl) {
-                functionString = functionString.replace("let ttlExpirationIn", `let ttlExpirationIn = ${options === null || options === void 0 ? void 0 : options.ttl.expirationIn}`);
-                functionString = functionString.replace("let ttlUnit", `let ttlUnit = '${options === null || options === void 0 ? void 0 : options.ttl.unit}'`);
-                functionString = functionString.replace("let ttlUpdate", `let ttlUpdate = ${options === null || options === void 0 ? void 0 : options.ttl.ttlUpdate}`);
+            if (options?.ttl) {
+                functionString = functionString.replace("let ttlExpirationIn", `let ttlExpirationIn = ${options?.ttl.expirationIn}`);
+                functionString = functionString.replace("let ttlUnit", `let ttlUnit = '${options?.ttl.unit}'`);
+                functionString = functionString.replace("let ttlUpdate", `let ttlUpdate = ${options?.ttl.ttlUpdate}`);
             }
             functionString = this.removeLast(functionString, '});');
             return Function(`return ${functionString}`)();
         }
-        let parameters = queryPredicate.filter(query => { var _a; return (_a = query.operator) === null || _a === void 0 ? void 0 : _a.includes('.where'); });
+        let parameters = queryPredicate.filter(query => query.operator?.includes('.where'));
         parameters = parameters.concat({ attribute: 'paging' });
         let functionBuilder = functionQueryTemplate;
-        const getAttribute = (queryPredicate) => { var _a; return (_a = queryPredicate.paramContent) !== null && _a !== void 0 ? _a : queryPredicate.attribute; };
+        const getAttribute = (queryPredicate) => queryPredicate.paramContent ?? queryPredicate.attribute;
         functionBuilder = functionBuilder.replace(/<repositoryClassName_value>/g, repositoryClassName);
         functionBuilder = functionBuilder.replace(/<methodSignature_value>/g, methodSignature);
         functionBuilder = functionBuilder.replace(/<params_replace>/g, parameters.map(att => getAttribute(att)).join(','));
         functionBuilder = functionBuilder.replace(/<params_validator_replace>/g, parameters.filter(par => par.attribute != 'paging').map(att => `!${getAttribute(att)}`).join('||'));
         functionBuilder = functionBuilder.replace(/<collection_name_replace>/g, options.collection);
-        functionBuilder = functionBuilder.replace(/<query_predicate_replace>/g, queryPredicate.map(att => { var _a; return `${(_a = att.operator) === null || _a === void 0 ? void 0 : _a.replace('ATRIBUTE', att.attribute).replace('VALUE', getAttribute(att))}`; }).join(''));
-        functionBuilder = functionBuilder.replace(/<is_one_row>/g, (methodQueryOptions === null || methodQueryOptions === void 0 ? void 0 : methodQueryOptions.oneRow) ? 'true' : 'false');
+        functionBuilder = functionBuilder.replace(/<query_predicate_replace>/g, queryPredicate.map(att => `${att.operator?.replace('ATRIBUTE', att.attribute).replace('VALUE', getAttribute(att))}`).join(''));
+        functionBuilder = functionBuilder.replace(/<is_one_row>/g, methodQueryOptions?.oneRow ? 'true' : 'false');
         return Function(`return ${functionBuilder}`)();
     }
     static removeLast(value, repl) {

package/dist/query/TransformMethodFromQuery.js

@@ -13,9 +13,9 @@ class TransformMethodFromQuery {
             const operator = operators.find(opt => opt.length == opertorMaxLength) || 'Iqual';
             const operatorConfig = OperatorMap_1.operatorMap.get(operator);
             const predicate = new QueryPredicate_1.QueryPredicate;
-            const attribute = this.lowerCamelCase((operatorConfig === null || operatorConfig === void 0 ? void 0 : operatorConfig.extractOperator) ? operatorConfig === null || operatorConfig === void 0 ? void 0 : operatorConfig.extractOperator(part) : part.replace(operator, ''));
+            const attribute = this.lowerCamelCase(operatorConfig?.extractOperator ? operatorConfig?.extractOperator(part) : part.replace(operator, ''));
             predicate.attribute = attribute;
-            predicate.operator = operatorConfig === null || operatorConfig === void 0 ? void 0 : operatorConfig.predicate(part);
+            predicate.operator = operatorConfig?.predicate(part);
             predicate.operatorKey = operator;
             predicate.paramContent = `${attribute}${index}`;
             return predicate;

package/dist/tracer/Tracer.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.startTracer = void 0;
 const getTracerAgent = () => {
@@ -17,7 +8,7 @@ const getTracerAgent = () => {
     }
     return agent;
 };
-const startTracer = (name, operation) => __awaiter(void 0, void 0, void 0, function* () {
+const startTracer = async (name, operation) => {
     const tracerAgent = getTracerAgent();
     if (!tracerAgent) {
         return operation({
@@ -25,13 +16,13 @@ const startTracer = (name, operation) => __awaiter(void 0, void 0, void 0, funct
             end: () => { }
         });
     }
-    return yield tracerAgent.getGlobalTracer().startActiveSpan(name, (span) => __awaiter(void 0, void 0, void 0, function* () {
+    return await tracerAgent.getGlobalTracer().startActiveSpan(name, async (span) => {
         try {
-            return yield operation(span);
+            return await operation(span);
         }
         finally {
             span.end();
         }
-    }));
-});
+    });
+};
 exports.startTracer = startTracer;