minerender 2.0.0-alpha.14 → 2.0.0-alpha.15

package/dist/esm/instance/InstanceManager.js

@@ -1,12 +1,3 @@
-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());
-    });
-};
 import { prefix } from "../util/log";
 const p = prefix("InstanceManager");
 export class InstanceManager {
@@ -14,30 +5,26 @@ export class InstanceManager {
         this.isInstanceManager = true;
         this.instanceCache = {};
     }
-    get(key) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (key in this.instanceCache) {
-                console.debug(p, "key in cache", key);
-                // create next instance of existing object
-                return (yield this.instanceCache[key]).nextInstance();
-            }
-            return undefined;
-        });
+    async get(key) {
+        if (key in this.instanceCache) {
+            console.debug(p, "key in cache", key);
+            // create next instance of existing object
+            return (await this.instanceCache[key]).nextInstance();
+        }
+        return undefined;
     }
-    getOrCreate(key, supplier) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (key in this.instanceCache) {
-                return yield (this.get(key));
-            }
-            console.debug(p, "key not in cache", key);
-            this.instanceCache[key] = new Promise((resolve) => __awaiter(this, void 0, void 0, function* () {
-                const obj = yield supplier();
-                const instance = obj.nextInstance();
-                // this.instanceCache[key] = Promise.resolve(instance);
-                resolve(instance);
-            }));
-            return yield this.instanceCache[key];
+    async getOrCreate(key, supplier) {
+        if (key in this.instanceCache) {
+            return await (this.get(key));
+        }
+        console.debug(p, "key not in cache", key);
+        this.instanceCache[key] = new Promise(async (resolve) => {
+            const obj = await supplier();
+            const instance = obj.nextInstance();
+            // this.instanceCache[key] = Promise.resolve(instance);
+            resolve(instance);
         });
+        return await this.instanceCache[key];
     }
     reset() {
         for (let instanceCacheKey in this.instanceCache) {

package/dist/esm/instance/InstanceManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"InstanceManager.js","sourceRoot":"src/","sources":["instance/InstanceManager.ts"],"names":[],"mappings":";;;;;;;;;AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,MAAM,CAAC,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC;AAEpC,MAAM,OAAO,eAAe;IAMxB;QAJgB,sBAAiB,GAAS,IAAI,CAAC;QAE5B,kBAAa,GAAgE,EAAE,CAAC;IAGnG,CAAC;IAEY,GAAG,CAAwB,GAAW;;YAC/C,IAAI,GAAG,IAAI,IAAI,CAAC,aAAa,EAAE;gBAC3B,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,cAAc,EAAE,GAAG,CAAC,CAAA;gBACrC,0CAA0C;gBAC1C,OAAO,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,YAAY,EAA0B,CAAC;aACjF;YACD,OAAO,SAAS,CAAC;QACrB,CAAC;KAAA;IAEY,WAAW,CAAwB,GAAW,EAAE,QAA8B;;YACvF,IAAI,GAAG,IAAI,IAAI,CAAC,aAAa,EAAE;gBAC3B,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,CAAI,GAAG,CAAC,CAAyB,CAAC;aAC3D;YACD,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,kBAAkB,EAAE,GAAG,CAAC,CAAA;YACzC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,IAAI,OAAO,CAAiC,CAAO,OAAO,EAAE,EAAE;gBACpF,MAAM,GAAG,GAAG,MAAM,QAAQ,EAAE,CAAC;gBAC7B,MAAM,QAAQ,GAAG,GAAG,CAAC,YAAY,EAAE,CAAC;gBACpC,uDAAuD;gBACvD,OAAO,CAAC,QAAQ,CAAC,CAAC;YACtB,CAAC,CAAA,CAAC,CAAA;YACF,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAyB,CAAC;QACjE,CAAC;KAAA;IAEM,KAAK;QACR,KAAK,IAAI,gBAAgB,IAAI,IAAI,CAAC,aAAa,EAAE;YAC7C,OAAO,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;SAC/C;IACL,CAAC;CAGJ;AAED,MAAM,UAAU,iBAAiB,CAAC,GAAQ;IACtC,OAAyB,GAAI,CAAC,iBAAiB,CAAC;AACpD,CAAC"}
+{"version":3,"file":"InstanceManager.js","sourceRoot":"src/","sources":["instance/InstanceManager.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,MAAM,CAAC,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC;AAEpC,MAAM,OAAO,eAAe;IAMxB;QAJgB,sBAAiB,GAAS,IAAI,CAAC;QAE5B,kBAAa,GAAgE,EAAE,CAAC;IAGnG,CAAC;IAEM,KAAK,CAAC,GAAG,CAAwB,GAAW;QAC/C,IAAI,GAAG,IAAI,IAAI,CAAC,aAAa,EAAE;YAC3B,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,cAAc,EAAE,GAAG,CAAC,CAAA;YACrC,0CAA0C;YAC1C,OAAO,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,YAAY,EAA0B,CAAC;SACjF;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAEM,KAAK,CAAC,WAAW,CAAwB,GAAW,EAAE,QAA8B;QACvF,IAAI,GAAG,IAAI,IAAI,CAAC,aAAa,EAAE;YAC3B,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,CAAI,GAAG,CAAC,CAAyB,CAAC;SAC3D;QACD,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,kBAAkB,EAAE,GAAG,CAAC,CAAA;QACzC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,IAAI,OAAO,CAAiC,KAAK,EAAE,OAAO,EAAE,EAAE;YACpF,MAAM,GAAG,GAAG,MAAM,QAAQ,EAAE,CAAC;YAC7B,MAAM,QAAQ,GAAG,GAAG,CAAC,YAAY,EAAE,CAAC;YACpC,uDAAuD;YACvD,OAAO,CAAC,QAAQ,CAAC,CAAC;QACtB,CAAC,CAAC,CAAA;QACF,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAyB,CAAC;IACjE,CAAC;IAEM,KAAK;QACR,KAAK,IAAI,gBAAgB,IAAI,IAAI,CAAC,aAAa,EAAE;YAC7C,OAAO,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;SAC/C;IACL,CAAC;CAGJ;AAED,MAAM,UAAU,iBAAiB,CAAC,GAAQ;IACtC,OAAyB,GAAI,CAAC,iBAAiB,CAAC;AACpD,CAAC"}

package/dist/esm/model/ModelMerger.js

@@ -1,44 +1,31 @@
-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());
-    });
-};
 import { Models } from "../assets/Models";
 import merge from "ts-deepmerge";
 import { AssetKey } from "../assets/AssetKey";
 export class ModelMerger {
-    static mergeWithParents(model) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const models = yield this.collectAllParents(model);
-            let merged = {};
-            for (let parentModel of models) {
-                merged = merge(merged, parentModel);
-            }
-            merged = merge(merged, model);
-            merged.hierarchy = models.map(m => m.parent).filter(p => `${p}`);
-            merged.hierarchy.push(`${merged.parent}`);
-            // delete merged.parent;
-            return merged;
-        });
+    static async mergeWithParents(model) {
+        const models = await this.collectAllParents(model);
+        let merged = {};
+        for (let parentModel of models) {
+            merged = merge(merged, parentModel);
+        }
+        merged = merge(merged, model);
+        merged.hierarchy = models.map(m => m.parent).filter(p => `${p}`);
+        merged.hierarchy.push(`${merged.parent}`);
+        // delete merged.parent;
+        return merged;
     }
-    static collectAllParents(model) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!model.parent) {
-                return [];
-            }
-            const models = [];
-            const parentKey = AssetKey.parse("models", model.parent);
-            const parentModel = yield Models.getRaw(parentKey);
-            if (parentModel) {
-                models.unshift(parentModel);
-                models.unshift(...yield this.collectAllParents(parentModel));
-            }
-            return models;
-        });
+    static async collectAllParents(model) {
+        if (!model.parent) {
+            return [];
+        }
+        const models = [];
+        const parentKey = AssetKey.parse("models", model.parent);
+        const parentModel = await Models.getRaw(parentKey);
+        if (parentModel) {
+            models.unshift(parentModel);
+            models.unshift(...await this.collectAllParents(parentModel));
+        }
+        return models;
     }
 }
 //# sourceMappingURL=ModelMerger.js.map

package/dist/esm/model/ModelMerger.js.map

@@ -1 +1 @@
-{"version":3,"file":"ModelMerger.js","sourceRoot":"src/","sources":["model/ModelMerger.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,KAAK,MAAM,cAAc,CAAC;AAEjC,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C,MAAM,OAAO,WAAW;IAEb,MAAM,CAAO,gBAAgB,CAAC,KAAY;;YAC7C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;YACnD,IAAI,MAAM,GAAU,EAAE,CAAC;YACvB,KAAK,IAAI,WAAW,IAAI,MAAM,EAAE;gBAC5B,MAAM,GAAG,KAAK,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;aACvC;YACD,MAAM,GAAG,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YAC9B,MAAM,CAAC,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAa,CAAC;YAC7E,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;YAC1C,wBAAwB;YACxB,OAAO,MAAM,CAAC;QAClB,CAAC;KAAA;IAES,MAAM,CAAO,iBAAiB,CAAC,KAAY;;YACjD,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;gBACf,OAAO,EAAE,CAAC;aACb;YACD,MAAM,MAAM,GAAY,EAAE,CAAC;YAC3B,MAAM,SAAS,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;YACzD,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YACnD,IAAI,WAAW,EAAE;gBACb,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;gBAC5B,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC,CAAC;aAChE;YACD,OAAO,MAAM,CAAC;QAClB,CAAC;KAAA;CAEJ"}
+{"version":3,"file":"ModelMerger.js","sourceRoot":"src/","sources":["model/ModelMerger.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,KAAK,MAAM,cAAc,CAAC;AAEjC,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C,MAAM,OAAO,WAAW;IAEb,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,KAAY;QAC7C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;QACnD,IAAI,MAAM,GAAU,EAAE,CAAC;QACvB,KAAK,IAAI,WAAW,IAAI,MAAM,EAAE;YAC5B,MAAM,GAAG,KAAK,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;SACvC;QACD,MAAM,GAAG,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAC9B,MAAM,CAAC,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAa,CAAC;QAC7E,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;QAC1C,wBAAwB;QACxB,OAAO,MAAM,CAAC;IAClB,CAAC;IAES,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,KAAY;QACjD,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;YACf,OAAO,EAAE,CAAC;SACb;QACD,MAAM,MAAM,GAAY,EAAE,CAAC;QAC3B,MAAM,SAAS,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;QACzD,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACnD,IAAI,WAAW,EAAE;YACb,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YAC5B,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC,CAAC;SAChE;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;CAEJ"}