@stemy/backend 2.8.1 → 2.8.5

package/bundles/stemy-backend.umd.js

@@ -1355,9 +1355,11 @@
             }).replace(/\./gi, "_").replace(/^_/, "").toUpperCase();
             var envValue = process.env[envName];
             if (typeof envValue !== "undefined") {
-                return isFunction(param.resolver)
+                var 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;
         };
@@ -1887,7 +1889,7 @@
         Assets.prototype.read = function (id) {
             return __awaiter$q(this, void 0, void 0, function () {
                 return __generator(this, function (_b) {
-                    return [2 /*return*/, this.find({ _id: new bson.ObjectId(id) })];
+                    return [2 /*return*/, !id ? null : this.find({ _id: new bson.ObjectId(id) })];
                 });
             });
         };
@@ -2044,13 +2046,13 @@
             this.load().then(function () {
                 if (_this.deleted)
                     return;
-                var progressPromise = !_this.progressId ? Promise.resolve(null) : _this.progresses.get(_this.progressId).then(function (p) { return p.cancel(); });
-                progressPromise.then(function () {
-                    _this.startWorkingOnAsset().then(function () {
-                        console.log("Started working on lazy asset: " + _this.id);
-                    }).catch(function (reason) {
-                        console.log("Can't start working on lazy asset: " + _this.id + "\nReason: " + reason);
-                    });
+                _this.progresses.get(_this.progressId).then(function (p) {
+                    p === null || p === void 0 ? void 0 : p.cancel();
+                });
+                _this.startWorkingOnAsset().then(function () {
+                    console.log("Started working on lazy asset: " + _this.id);
+                }).catch(function (reason) {
+                    console.log("Can't start working on lazy asset: " + _this.id + "\nReason: " + reason);
                 });
             });
         };
@@ -2095,19 +2097,21 @@
         };
         LazyAsset.prototype.startWorkingOnAsset = function () {
             return __awaiter$p(this, void 0, void 0, function () {
-                var id;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0: return [4 /*yield*/, this.progresses.create()];
+                var _a;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            _a = this.data;
+                            return [4 /*yield*/, this.progresses.create()];
                         case 1:
-                            id = (_a.sent()).id;
-                            this.data.progressId = id;
+                            _a.progressId = (_b.sent()).id;
+                            this.data.assetId = null;
                             return [4 /*yield*/, this.save()];
                         case 2:
-                            _a.sent();
+                            _b.sent();
                             return [4 /*yield*/, this.jobMan.enqueueWithName(this.data.jobName, Object.assign(Object.assign({}, this.data.jobParams), { lazyId: this.id }))];
                         case 3:
-                            _a.sent();
+                            _b.sent();
                             return [2 /*return*/];
                     }
                 });
@@ -2871,7 +2875,7 @@
         Progresses.prototype.get = function (id) {
             return __awaiter$m(this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
-                    return [2 /*return*/, this.find({ _id: new bson.ObjectId(id) })];
+                    return [2 /*return*/, !id ? null : this.find({ _id: new bson.ObjectId(id) })];
                 });
             });
         };
@@ -3004,7 +3008,7 @@
         LazyAssets.prototype.read = function (id) {
             return __awaiter$l(this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
-                    return [2 /*return*/, this.find({ _id: new bson.ObjectId(id) })];
+                    return [2 /*return*/, !id ? null : this.find({ _id: new bson.ObjectId(id) })];
                 });
             });
         };
@@ -5223,8 +5227,9 @@
     ], CompressionMiddleware);
 
     var Tree = /** @class */ (function () {
-        function Tree(container, path) {
+        function Tree(container, exists, path) {
             this.container = container;
+            this.exists = exists;
             this.path = path;
             this.map = new Map();
         }
@@ -5236,7 +5241,7 @@
             configurable: true
         });
         Tree.prototype.resolveService = function () {
-            return this.container.resolve(this.path);
+            return !this.exists ? null : this.container.resolve(this.path);
         };
         Tree.prototype.resolveLeaves = function () {
             var map;
@@ -5278,7 +5283,7 @@
                 parentTree = parentTree.resolveAncestor(path);
             }
             catch (e) {
-                parentTree = new Tree(this.container, "");
+                parentTree = new Tree(this.container, false, "");
             }
             var pathParts = path.split(".");
             var tree = this;
@@ -5312,7 +5317,7 @@
         Tree.prototype.resolvePath = function (path, throwError) {
             if (throwError === void 0) { throwError = true; }
             var absolutePath = !this.path ? path : this.path + "." + path;
-            var tree = new Tree(this.container, absolutePath);
+            var tree = new Tree(this.container, false, absolutePath);
             try {
                 tree = this.resolveAncestor(path);
             }
@@ -5331,29 +5336,21 @@
             return tree;
         };
         Tree.prototype.addPath = function (path) {
-            var e_2, _a;
             if (!isString(path) || path.length == 0) {
                 return this;
             }
             var pathParts = path.split(".");
+            var maxIx = pathParts.length - 1;
             var tree = this;
             path = this.path;
-            try {
-                for (var pathParts_2 = __values(pathParts), pathParts_2_1 = pathParts_2.next(); !pathParts_2_1.done; pathParts_2_1 = pathParts_2.next()) {
-                    var part = pathParts_2_1.value;
-                    if (!tree.map.has(part)) {
-                        tree.map.set(part, new Tree(this.container, !path ? part : path + "." + part));
-                    }
-                    tree = tree.map.get(part);
-                    path = tree.path;
-                }
-            }
-            catch (e_2_1) { e_2 = { error: e_2_1 }; }
-            finally {
-                try {
-                    if (pathParts_2_1 && !pathParts_2_1.done && (_a = pathParts_2.return)) _a.call(pathParts_2);
+            for (var ix = 0; ix <= maxIx; ix++) {
+                var part = pathParts[ix];
+                if (!tree.map.has(part)) {
+                    tree.map.set(part, new Tree(this.container, false, !path ? part : path + "." + part));
                 }
-                finally { if (e_2) throw e_2.error; }
+                tree = tree.map.get(part);
+                tree.exists = tree.exists || ix == maxIx;
+                path = tree.path;
             }
             return this;
         };
@@ -5368,7 +5365,7 @@
             container["wrapperContainer"] = this;
             this.tokens = [];
             this.tokenSet = new Set();
-            this.myTree = new Tree(this, "");
+            this.root = new Tree(this, false, "");
         }
         Object.defineProperty(DiContainer.prototype, "registeredTokens", {
             get: function () {
@@ -5380,7 +5377,7 @@
         });
         Object.defineProperty(DiContainer.prototype, "tree", {
             get: function () {
-                return this.myTree;
+                return this.root;
             },
             enumerable: false,
             configurable: true
@@ -5444,7 +5441,7 @@
             this.tokenSet.add(token);
             this.tokens.push(token);
             if (isString(token)) {
-                this.myTree.addPath(token);
+                this.root.addPath(token);
             }
             return this;
         };