@stemy/backend 2.8.1 → 2.8.5

package/fesm2015/stemy-backend.js

@@ -876,9 +876,11 @@ let Configuration = class Configuration {
         }).replace(/\./gi, "_").replace(/^_/, "").toUpperCase();
         const envValue = process.env[envName];
         if (typeof envValue !== "undefined") {
-            return isFunction(param.resolver)
+            const value = isFunction(param.resolver)
                 ? param.resolver(envValue)
                 : convertValue(envValue, getType(param.defaultValue));
+            console.log(`Processing param value`, name, envName, envValue, value);
+            return value;
         }
         return param.defaultValue;
     }
@@ -1229,7 +1231,7 @@ let Assets = class Assets {
     }
     read(id) {
         return __awaiter$q(this, void 0, void 0, function* () {
-            return this.find({ _id: new ObjectId(id) });
+            return !id ? null : this.find({ _id: new ObjectId(id) });
         });
     }
     find(where) {
@@ -1310,13 +1312,13 @@ class LazyAsset extends BaseEntity {
         this.load().then(() => {
             if (this.deleted)
                 return;
-            const progressPromise = !this.progressId ? Promise.resolve(null) : this.progresses.get(this.progressId).then(p => p.cancel());
-            progressPromise.then(() => {
-                this.startWorkingOnAsset().then(() => {
-                    console.log(`Started working on lazy asset: ${this.id}`);
-                }).catch(reason => {
-                    console.log(`Can't start working on lazy asset: ${this.id}\nReason: ${reason}`);
-                });
+            this.progresses.get(this.progressId).then(p => {
+                p === null || p === void 0 ? void 0 : p.cancel();
+            });
+            this.startWorkingOnAsset().then(() => {
+                console.log(`Started working on lazy asset: ${this.id}`);
+            }).catch(reason => {
+                console.log(`Can't start working on lazy asset: ${this.id}\nReason: ${reason}`);
             });
         });
     }
@@ -1345,8 +1347,8 @@ class LazyAsset extends BaseEntity {
     }
     startWorkingOnAsset() {
         return __awaiter$p(this, void 0, void 0, function* () {
-            const { id } = yield this.progresses.create();
-            this.data.progressId = id;
+            this.data.progressId = (yield this.progresses.create()).id;
+            this.data.assetId = null;
             yield this.save();
             yield this.jobMan.enqueueWithName(this.data.jobName, Object.assign(Object.assign({}, this.data.jobParams), { lazyId: this.id }));
         });
@@ -1795,7 +1797,7 @@ let Progresses = class Progresses {
     }
     get(id) {
         return __awaiter$m(this, void 0, void 0, function* () {
-            return this.find({ _id: new ObjectId(id) });
+            return !id ? null : this.find({ _id: new ObjectId(id) });
         });
     }
     find(where) {
@@ -1876,7 +1878,7 @@ let LazyAssets = class LazyAssets {
     }
     read(id) {
         return __awaiter$l(this, void 0, void 0, function* () {
-            return this.find({ _id: new ObjectId(id) });
+            return !id ? null : this.find({ _id: new ObjectId(id) });
         });
     }
     find(where) {
@@ -3354,8 +3356,9 @@ CompressionMiddleware = __decorate([
 ], CompressionMiddleware);
 
 class Tree {
-    constructor(container, path) {
+    constructor(container, exists, path) {
         this.container = container;
+        this.exists = exists;
         this.path = path;
         this.map = new Map();
     }
@@ -3363,7 +3366,7 @@ class Tree {
         return this.container.parent.tree;
     }
     resolveService() {
-        return this.container.resolve(this.path);
+        return !this.exists ? null : this.container.resolve(this.path);
     }
     resolveLeaves() {
         let map;
@@ -3404,7 +3407,7 @@ class Tree {
             parentTree = parentTree.resolveAncestor(path);
         }
         catch (e) {
-            parentTree = new Tree(this.container, "");
+            parentTree = new Tree(this.container, false, "");
         }
         const pathParts = path.split(".");
         let tree = this;
@@ -3427,7 +3430,7 @@ class Tree {
     }
     resolvePath(path, throwError = true) {
         const absolutePath = !this.path ? path : `${this.path}.${path}`;
-        let tree = new Tree(this.container, absolutePath);
+        let tree = new Tree(this.container, false, absolutePath);
         try {
             tree = this.resolveAncestor(path);
         }
@@ -3450,13 +3453,16 @@ class Tree {
             return this;
         }
         const pathParts = path.split(".");
+        const maxIx = pathParts.length - 1;
         let tree = this;
         path = this.path;
-        for (let part of pathParts) {
+        for (let ix = 0; ix <= maxIx; ix++) {
+            const part = pathParts[ix];
             if (!tree.map.has(part)) {
-                tree.map.set(part, new Tree(this.container, !path ? part : `${path}.${part}`));
+                tree.map.set(part, new Tree(this.container, false, !path ? part : `${path}.${part}`));
             }
             tree = tree.map.get(part);
+            tree.exists = tree.exists || ix == maxIx;
             path = tree.path;
         }
         return this;
@@ -3470,14 +3476,14 @@ class DiContainer {
         container["wrapperContainer"] = this;
         this.tokens = [];
         this.tokenSet = new Set();
-        this.myTree = new Tree(this, "");
+        this.root = new Tree(this, false, "");
     }
     get registeredTokens() {
         var _a;
         return (((_a = this.parent) === null || _a === void 0 ? void 0 : _a.registeredTokens) || []).concat(this.tokens);
     }
     get tree() {
-        return this.myTree;
+        return this.root;
     }
     beforeResolution(token, callback, options) {
         this.container.beforeResolution(token, callback, options);
@@ -3538,7 +3544,7 @@ class DiContainer {
         this.tokenSet.add(token);
         this.tokens.push(token);
         if (isString(token)) {
-            this.myTree.addPath(token);
+            this.root.addPath(token);
         }
         return this;
     }