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

package/dist/esm/assets/ModelTextures.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 { Caching } from "../cache/Caching";
 import { AssetLoader } from "./AssetLoader";
 import { ImageLoader } from "../image/ImageLoader";
@@ -14,20 +5,32 @@ import { PersistentCache } from "../cache/PersistentCache";
 import { AssetKey } from "./AssetKey";
 import { AssetParser } from "./source/parser/AssetParsers";
 export class ModelTextures {
-    static get(key) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const asset = yield this.preload(key);
-            if (asset) {
-                return ImageLoader.infoToCanvasData(asset);
-            }
-            return undefined;
+    static async get(key) {
+        const asset = await this.preload(key);
+        if (asset) {
+            return ImageLoader.infoToCanvasData(asset);
+        }
+        return undefined;
+    }
+    static async preload(key) {
+        const keyStr = key.serialize();
+        return Caching.textureAssetCache.get(keyStr, k => {
+            return AssetLoader.get(key, AssetParser.IMAGE).then(asset => {
+                if (asset)
+                    asset.key = key;
+                return asset;
+            });
         });
     }
-    static preload(key) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const keyStr = key.serialize();
-            return Caching.textureAssetCache.get(keyStr, k => {
-                return AssetLoader.get(key, AssetParser.IMAGE).then(asset => {
+    static async getMeta(key) {
+        if (!key.extension || !key.extension.endsWith(".mcmeta")) {
+            key = Object.assign(new AssetKey("", ""), key);
+            key.extension += ".mcmeta";
+        }
+        const keyStr = key.serialize();
+        return Caching.textureMetaCache.get(keyStr, k => {
+            return this.PERSISTENT_META_CACHE.getOrLoad(keyStr, k1 => {
+                return AssetLoader.get(key, AssetParser.META).then(asset => {
                     if (asset)
                         asset.key = key;
                     return asset;
@@ -35,28 +38,8 @@ export class ModelTextures {
             });
         });
     }
-    static getMeta(key) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!key.extension || !key.extension.endsWith(".mcmeta")) {
-                key = Object.assign(new AssetKey("", ""), key);
-                key.extension += ".mcmeta";
-            }
-            const keyStr = key.serialize();
-            return Caching.textureMetaCache.get(keyStr, k => {
-                return this.PERSISTENT_META_CACHE.getOrLoad(keyStr, k1 => {
-                    return AssetLoader.get(key, AssetParser.META).then(asset => {
-                        if (asset)
-                            asset.key = key;
-                        return asset;
-                    });
-                });
-            });
-        });
-    }
-    static clearCache() {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.PERSISTENT_META_CACHE.clear();
-        });
+    static async clearCache() {
+        await this.PERSISTENT_META_CACHE.clear();
     }
 }
 ModelTextures.PERSISTENT_META_CACHE = PersistentCache.open("minerender-texturemeta");

package/dist/esm/assets/ModelTextures.js.map

@@ -1 +1 @@
-{"version":3,"file":"ModelTextures.js","sourceRoot":"src/","sources":["assets/ModelTextures.ts"],"names":[],"mappings":";;;;;;;;;AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAGnD,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAE3D,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAE3D,MAAM,OAAO,aAAa;IAIf,MAAM,CAAO,GAAG,CAAC,GAAa;;YACjC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACtC,IAAI,KAAK,EAAE;gBACP,OAAO,WAAW,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;aAC9C;YACD,OAAO,SAAS,CAAC;QACrB,CAAC;KAAA;IAEM,MAAM,CAAO,OAAO,CAAC,GAAa;;YACrC,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC;YAC/B,OAAO,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE;gBAC7C,OAAO,WAAW,CAAC,GAAG,CAAe,GAAG,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;oBACtE,IAAI,KAAK;wBACL,KAAK,CAAC,GAAG,GAAG,GAAG,CAAC;oBACpB,OAAO,KAAK,CAAC;gBACjB,CAAC,CAAC,CAAA;YACN,CAAC,CAAC,CAAA;QACN,CAAC;KAAA;IAEM,MAAM,CAAO,OAAO,CAAC,GAAa;;YACrC,IAAI,CAAC,GAAG,CAAC,SAAS,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;gBACtD,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC;gBAC/C,GAAG,CAAC,SAAS,IAAI,SAAS,CAAC;aAC9B;YACD,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC;YAE/B,OAAO,OAAO,CAAC,gBAAgB,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE;gBAC5C,OAAO,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE;oBACrD,OAAO,WAAW,CAAC,GAAG,CAAuB,GAAG,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;wBAC7E,IAAI,KAAK;4BACL,KAAK,CAAC,GAAG,GAAG,GAAG,CAAC;wBACpB,OAAO,KAAK,CAAC;oBACjB,CAAC,CAAC,CAAA;gBACN,CAAC,CAAC,CAAA;YACN,CAAC,CAAC,CAAA;QACN,CAAC;KAAA;IAEM,MAAM,CAAO,UAAU;;YAC1B,MAAM,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE,CAAC;QAC7C,CAAC;KAAA;;AAzCc,mCAAqB,GAAG,eAAe,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC"}
+{"version":3,"file":"ModelTextures.js","sourceRoot":"src/","sources":["assets/ModelTextures.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAGnD,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAE3D,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAE3D,MAAM,OAAO,aAAa;IAIf,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,GAAa;QACjC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACtC,IAAI,KAAK,EAAE;YACP,OAAO,WAAW,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;SAC9C;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,GAAa;QACrC,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC;QAC/B,OAAO,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE;YAC7C,OAAO,WAAW,CAAC,GAAG,CAAe,GAAG,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;gBACtE,IAAI,KAAK;oBACL,KAAK,CAAC,GAAG,GAAG,GAAG,CAAC;gBACpB,OAAO,KAAK,CAAC;YACjB,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;IACN,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,GAAa;QACrC,IAAI,CAAC,GAAG,CAAC,SAAS,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;YACtD,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC;YAC/C,GAAG,CAAC,SAAS,IAAI,SAAS,CAAC;SAC9B;QACD,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC;QAE/B,OAAO,OAAO,CAAC,gBAAgB,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE;YAC5C,OAAO,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE;gBACrD,OAAO,WAAW,CAAC,GAAG,CAAuB,GAAG,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;oBAC7E,IAAI,KAAK;wBACL,KAAK,CAAC,GAAG,GAAG,GAAG,CAAC;oBACpB,OAAO,KAAK,CAAC;gBACjB,CAAC,CAAC,CAAA;YACN,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;IACN,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,UAAU;QAC1B,MAAM,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE,CAAC;IAC7C,CAAC;;AAzCc,mCAAqB,GAAG,eAAe,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC"}

package/dist/esm/assets/Models.js

@@ -4,15 +4,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-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 { Caching } from "../cache/Caching";
 import { ModelMerger } from "../model/ModelMerger";
 import { AssetLoader } from "./AssetLoader";
@@ -22,66 +13,54 @@ import { PersistentCache } from "../cache/PersistentCache";
 import { AssetKey } from "./AssetKey";
 import { AssetParser } from "./source/parser/AssetParsers";
 export class Models {
-    static getItemList() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return AssetLoader.get(new AssetKey(DEFAULT_NAMESPACE, "_list", "models", "item", "assets", ".json", DEFAULT_ROOT), AssetParser.LIST).then(r => { var _a; return (_a = r === null || r === void 0 ? void 0 : r.files) !== null && _a !== void 0 ? _a : []; });
-        });
+    static async getItemList() {
+        return AssetLoader.get(new AssetKey(DEFAULT_NAMESPACE, "_list", "models", "item", "assets", ".json", DEFAULT_ROOT), AssetParser.LIST).then(r => r?.files ?? []);
     }
-    static loadAndMerge(key) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const model = yield this.getRaw(key);
-            if (!model) {
-                return undefined;
-            }
-            return ModelMerger.mergeWithParents(model);
-        });
+    static async loadAndMerge(key) {
+        const model = await this.getRaw(key);
+        if (!model) {
+            return undefined;
+        }
+        return ModelMerger.mergeWithParents(model);
     }
-    static getRaw(key) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!key.assetType) {
-                key.assetType = "models";
-            }
-            if (!key.extension) {
-                key.extension = ".json";
-            }
-            const keyStr = key.serialize();
-            //TODO: maybe add the asset source to the key
-            return Caching.rawModelCache.get(keyStr, k => {
-                return this.PERSISTENT_CACHE.getOrLoad(keyStr, k1 => {
-                    return AssetLoader.get(key, AssetParser.MODEL);
-                });
-            }).then(asset => {
-                if (asset) {
-                    asset.key = key;
-                }
-                return asset;
+    static async getRaw(key) {
+        if (!key.assetType) {
+            key.assetType = "models";
+        }
+        if (!key.extension) {
+            key.extension = ".json";
+        }
+        const keyStr = key.serialize();
+        //TODO: maybe add the asset source to the key
+        return Caching.rawModelCache.get(keyStr, k => {
+            return this.PERSISTENT_CACHE.getOrLoad(keyStr, k1 => {
+                return AssetLoader.get(key, AssetParser.MODEL);
             });
-        });
-    }
-    static getMerged(key) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!key.assetType) {
-                key.assetType = "models";
-            }
-            if (!key.extension) {
-                key.extension = ".json";
+        }).then(asset => {
+            if (asset) {
+                asset.key = key;
             }
-            const keyStr = key.serialize();
-            return Caching.mergedModelCache.get(keyStr, k => {
-                //TODO: persistent cache
-                return Models.loadAndMerge(key);
-            });
+            return asset;
         });
     }
-    static get(key) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.getMerged(key);
+    static async getMerged(key) {
+        if (!key.assetType) {
+            key.assetType = "models";
+        }
+        if (!key.extension) {
+            key.extension = ".json";
+        }
+        const keyStr = key.serialize();
+        return Caching.mergedModelCache.get(keyStr, k => {
+            //TODO: persistent cache
+            return Models.loadAndMerge(key);
         });
     }
-    static clearCache() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.PERSISTENT_CACHE.clear();
-        });
+    static async get(key) {
+        return this.getMerged(key);
+    }
+    static async clearCache() {
+        return this.PERSISTENT_CACHE.clear();
     }
 }
 Models.PERSISTENT_CACHE = PersistentCache.open("minerender-models");

package/dist/esm/assets/Models.js.map

@@ -1 +1 @@
-{"version":3,"file":"Models.js","sourceRoot":"src/","sources":["assets/Models.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Models.js","sourceRoot":"src/","sources":["assets/Models.ts"],"names":[],"mappings":";;;;;;AACA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAG3C,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAE3D,MAAM,OAAO,MAAM;IAKK,AAAb,MAAM,CAAC,KAAK,CAAC,WAAW;QAC3B,OAAO,WAAW,CAAC,GAAG,CAAY,IAAI,QAAQ,CAC1C,iBAAiB,EACjB,OAAO,EACP,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,OAAO,EACP,YAAY,CACf,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;IACnD,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,GAAa;QAC1C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACrC,IAAI,CAAC,KAAK,EAAE;YACR,OAAO,SAAS,CAAC;SACpB;QACD,OAAO,WAAW,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;IAC/C,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAa;QACpC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE;YAChB,GAAG,CAAC,SAAS,GAAG,QAAQ,CAAC;SAC5B;QACD,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE;YAChB,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC;SAC3B;QACD,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC;QAC/B,6CAA6C;QAC7C,OAAO,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE;YACzC,OAAO,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE;gBAChD,OAAO,WAAW,CAAC,GAAG,CAAQ,GAAG,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC;YAC1D,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;YACZ,IAAI,KAAK,EAAE;gBACP,KAAK,CAAC,GAAG,GAAG,GAAG,CAAC;aACnB;YACD,OAAO,KAAK,CAAC;QACjB,CAAC,CAAC,CAAA;IACN,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,GAAa;QACvC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE;YAChB,GAAG,CAAC,SAAS,GAAG,QAAQ,CAAC;SAC5B;QACD,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE;YAChB,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC;SAC3B;QACD,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC;QAC/B,OAAO,OAAO,CAAC,gBAAgB,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE;YAC5C,wBAAwB;YACxB,OAAO,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,GAAa;QACjC,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IAC/B,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,UAAU;QAC1B,OAAO,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAC;IACzC,CAAC;;AAhEc,uBAAgB,GAAG,eAAe,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;AAGxD;IADnB,OAAO,EAAE;+BAWT"}

package/dist/esm/assets/source/HostedAssetSource.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 { AssetSource } from ".";
 import { prefix } from "../../util";
 import { NBTHelper } from "../../nbt";
@@ -22,86 +13,81 @@ const DEFAULT_OPTIONS = {
     retryDefaults: true
 };
 export class HostedAssetSource extends AssetSource {
-    loadOrRetryWithDefaults(key, parser) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const direct = yield this.load(key, parser);
-            if (typeof direct !== "undefined") {
-                return direct;
+    async loadOrRetryWithDefaults(key, parser) {
+        const direct = await this.load(key, parser);
+        if (typeof direct !== "undefined") {
+            return direct;
+        }
+        if (key.namespace !== DEFAULT_NAMESPACE) {
+            console.info(p, "Retrying", key, "with default namespace");
+            // Try on the same host but with default minecraft: namespace
+            const namespaceKey = new AssetKey(DEFAULT_NAMESPACE, key.path, key.assetType, key.type, key.rootType, key.extension, key.root);
+            const namespaced = await this.load(namespaceKey, parser);
+            if (typeof namespaced !== "undefined") {
+                return namespaced;
             }
-            if (key.namespace !== DEFAULT_NAMESPACE) {
-                console.info(p, "Retrying", key, "with default namespace");
-                // Try on the same host but with default minecraft: namespace
-                const namespaceKey = new AssetKey(DEFAULT_NAMESPACE, key.path, key.assetType, key.type, key.rootType, key.extension, key.root);
-                const namespaced = yield this.load(namespaceKey, parser);
-                if (typeof namespaced !== "undefined") {
-                    return namespaced;
-                }
-                if ((typeof key.root !== "undefined" && key.root !== DEFAULT_ROOT) || (typeof this.root !== "undefined" && this.root !== DEFAULT_ROOT)) {
-                    console.info(p, "Retrying", key, "with default root+namespace");
-                    // Try both defaults
-                    const namespacedRootedKey = new AssetKey(DEFAULT_NAMESPACE, key.path, key.assetType, key.type, key.rootType, key.extension, DEFAULT_ROOT);
-                    const namespacedRooted = yield this.load(namespacedRootedKey, parser);
-                    if (typeof namespacedRooted !== "undefined") {
-                        return namespacedRooted;
-                    }
+            if ((typeof key.root !== "undefined" && key.root !== DEFAULT_ROOT) || (typeof this.root !== "undefined" && this.root !== DEFAULT_ROOT)) {
+                console.info(p, "Retrying", key, "with default root+namespace");
+                // Try both defaults
+                const namespacedRootedKey = new AssetKey(DEFAULT_NAMESPACE, key.path, key.assetType, key.type, key.rootType, key.extension, DEFAULT_ROOT);
+                const namespacedRooted = await this.load(namespacedRootedKey, parser);
+                if (typeof namespacedRooted !== "undefined") {
+                    return namespacedRooted;
                 }
             }
-            else if ((typeof key.root !== "undefined" && key.root !== DEFAULT_ROOT) || (typeof this.root !== "undefined" && this.root !== DEFAULT_ROOT)) {
-                console.info(p, "Retrying", key, "with default root");
-                // Try on default root
-                const rootKey = new AssetKey(key.namespace, key.path, key.assetType, key.type, key.rootType, key.extension, DEFAULT_ROOT);
-                const rooted = yield this.load(rootKey, parser);
-                if (typeof rooted !== "undefined") {
-                    return rooted;
-                }
+        }
+        else if ((typeof key.root !== "undefined" && key.root !== DEFAULT_ROOT) || (typeof this.root !== "undefined" && this.root !== DEFAULT_ROOT)) {
+            console.info(p, "Retrying", key, "with default root");
+            // Try on default root
+            const rootKey = new AssetKey(key.namespace, key.path, key.assetType, key.type, key.rootType, key.extension, DEFAULT_ROOT);
+            const rooted = await this.load(rootKey, parser);
+            if (typeof rooted !== "undefined") {
+                return rooted;
             }
-            return undefined;
-        });
+        }
+        return undefined;
     }
-    load(key, parser) {
-        return __awaiter(this, void 0, void 0, function* () {
-            console.info(p, "Loading", key);
-            const url = `${this.assetBasePath(key)}${key.type !== undefined ? key.type + '/' : ''}${key.path}${key.extension}`;
-            console.debug(p, url);
-            let req = {
-                url: url
-            };
-            parser.config(req);
-            // @ts-ignore
-            return yield Requests.mcAssetRequest(req)
-                .then(response => {
-                if (response && response.data) {
-                    try {
-                        return parser.parse(response);
-                    }
-                    catch (e) {
-                        console.warn("Parser failed to process response", response, e);
-                        throw e;
-                    }
+    async load(key, parser) {
+        console.info(p, "Loading", key);
+        const url = `${this.assetBasePath(key)}${key.type !== undefined ? key.type + '/' : ''}${key.path}${key.extension}`;
+        console.debug(p, url);
+        let req = {
+            url: url
+        };
+        parser.config(req);
+        // @ts-ignore
+        return await Requests.mcAssetRequest(req)
+            .then(response => {
+            if (response && response.data) {
+                try {
+                    return parser.parse(response);
                 }
-                return undefined;
-            })
-                .catch(err => {
-                if (err.response) {
-                    let response = err.response;
-                    if (response.status === 404) {
-                        console.debug(p, key, "not found");
-                        return undefined;
-                    }
+                catch (e) {
+                    console.warn("Parser failed to process response", response, e);
+                    throw e;
                 }
-                console.debug(p, "Failed to load", key, err === null || err === void 0 ? void 0 : err.message);
-                return undefined;
-            });
+            }
+            return undefined;
+        })
+            .catch(err => {
+            if (err.response) {
+                let response = err.response;
+                if (response.status === 404) {
+                    console.debug(p, key, "not found");
+                    return undefined;
+                }
+            }
+            console.debug(p, "Failed to load", key, err?.message);
+            return undefined;
         });
     }
     assetBasePath(key) {
-        var _a, _b;
-        return `${(_b = (_a = key.root) !== null && _a !== void 0 ? _a : this.root) !== null && _b !== void 0 ? _b : AssetLoader.ROOT}/${key.rootType !== undefined ? key.rootType + '/' : ''}${key.namespace !== undefined ? key.namespace + '/' : ''}${key.assetType !== undefined ? key.assetType + '/' : ''}`;
+        return `${key.root ?? this.root ?? AssetLoader.ROOT}/${key.rootType !== undefined ? key.rootType + '/' : ''}${key.namespace !== undefined ? key.namespace + '/' : ''}${key.assetType !== undefined ? key.assetType + '/' : ''}`;
     }
     constructor(root, options) {
         super();
         this._root = root;
-        this._options = merge({}, DEFAULT_OPTIONS, options !== null && options !== void 0 ? options : {});
+        this._options = merge({}, DEFAULT_OPTIONS, options ?? {});
     }
     get root() {
         return this._root;
@@ -151,10 +137,8 @@ HostedAssetSource.IMAGE = {
     config(request) {
         request.responseType = "arraybuffer";
     },
-    parse(response) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield ImageLoader.processResponse(response);
-        });
+    async parse(response) {
+        return await ImageLoader.processResponse(response);
     }
 };
 HostedAssetSource.LIST = {

package/dist/esm/assets/source/HostedAssetSource.js.map

@@ -1 +1 @@
-{"version":3,"file":"HostedAssetSource.js","sourceRoot":"src/","sources":["assets/source/HostedAssetSource.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"HostedAssetSource.js","sourceRoot":"src/","sources":["assets/source/HostedAssetSource.ts"],"names":[],"mappings":"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"}

package/dist/esm/assets/source/archive/ArchiveAssetSource.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 { AssetSource } from "../AssetSource";
 import { prefix } from "../../../util";
 import { Requests } from "../../../request";
@@ -22,97 +13,89 @@ export class ArchiveAssetSource extends AssetSource {
     static blob(blob) {
         return new ArchiveAssetSource(new BrowserArchiveProxy(blob));
     }
-    getEntries() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this._archiveProxy.getEntries();
-        });
+    async getEntries() {
+        return this._archiveProxy.getEntries();
     }
-    getEntry(path) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const entries = yield this.getEntries();
-            return entries.find(e => e.filename === path);
-        });
+    async getEntry(path) {
+        const entries = await this.getEntries();
+        return entries.find(e => e.filename === path);
     }
-    get(key, parser) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const responseParser = HostedAssetSource.PARSER_MAP.get(parser);
-            console.log("ArchiveAssetSource.get", key, parser);
-            let entries = (yield this.getEntries());
-            const path = `${this.assetBasePath(key)}${key.type !== undefined ? key.type + '/' : ''}${key.path}${key.extension}`;
-            console.log(path);
-            const entry = yield this.getEntry(path);
-            console.log(entry);
-            if (!entry) {
-                return undefined;
-            }
-            let blob = yield entry.getData();
-            const url = URL.createObjectURL(blob);
-            console.log(url);
-            let req = {
-                url: url,
-            };
-            responseParser.config(req);
-            return Requests.genericRequest(req)
-                .then(response => {
-                if (response && response.data) {
-                    try {
-                        return responseParser.parse(response);
-                    }
-                    catch (e) {
-                        console.warn("Parser failed to process response", response, e);
-                        throw e;
-                    }
+    async get(key, parser) {
+        const responseParser = HostedAssetSource.PARSER_MAP.get(parser);
+        console.log("ArchiveAssetSource.get", key, parser);
+        let entries = (await this.getEntries());
+        const path = `${this.assetBasePath(key)}${key.type !== undefined ? key.type + '/' : ''}${key.path}${key.extension}`;
+        console.log(path);
+        const entry = await this.getEntry(path);
+        console.log(entry);
+        if (!entry) {
+            return undefined;
+        }
+        let blob = await entry.getData();
+        const url = URL.createObjectURL(blob);
+        console.log(url);
+        let req = {
+            url: url,
+        };
+        responseParser.config(req);
+        return Requests.genericRequest(req)
+            .then(response => {
+            if (response && response.data) {
+                try {
+                    return responseParser.parse(response);
                 }
-                return undefined;
-            })
-                .catch(err => {
-                if (err.response) {
-                    let response = err.response;
-                    if (response.status === 404) {
-                        console.debug(p, key, "not found");
-                        return undefined;
-                    }
+                catch (e) {
+                    console.warn("Parser failed to process response", response, e);
+                    throw e;
+                }
+            }
+            return undefined;
+        })
+            .catch(err => {
+            if (err.response) {
+                let response = err.response;
+                if (response.status === 404) {
+                    console.debug(p, key, "not found");
+                    return undefined;
                 }
-                console.debug(p, "Failed to load", key, err === null || err === void 0 ? void 0 : err.message);
-                return undefined;
-            });
+            }
+            console.debug(p, "Failed to load", key, err?.message);
+            return undefined;
         });
     }
     //TODO: abstract this
-    load(key, parser) {
-        return __awaiter(this, void 0, void 0, function* () {
-            console.info(p, "Loading", key);
-            const url = `${this.assetBasePath(key)}${key.type !== undefined ? key.type + '/' : ''}${key.path}${key.extension}`;
-            console.debug(p, url);
-            let req = {
-                url: url
-            };
-            parser.config(req);
-            // @ts-ignore
-            return yield Requests.genericRequest(req)
-                .then(response => {
-                if (response && response.data) {
-                    try {
-                        return parser.parse(response);
-                    }
-                    catch (e) {
-                        console.warn("Parser failed to process response", response, e);
-                        throw e;
-                    }
+    async load(key, parser) {
+        console.info(p, "Loading", key);
+        const url = `${this.assetBasePath(key)}${key.type !== undefined ? key.type + '/' : ''}${key.path}${key.extension}`;
+        console.debug(p, url);
+        let req = {
+            url: url
+        };
+        parser.config(req);
+        // @ts-ignore
+        return await Requests.genericRequest(req)
+            .then(response => {
+            if (response && response.data) {
+                try {
+                    return parser.parse(response);
+                }
+                catch (e) {
+                    console.warn("Parser failed to process response", response, e);
+                    throw e;
                 }
-                return undefined;
-            })
-                .catch(err => {
-                if (err.response) {
-                    let response = err.response;
-                    if (response.status === 404) {
-                        console.debug(p, key, "not found");
-                        return undefined;
-                    }
+            }
+            return undefined;
+        })
+            .catch(err => {
+            if (err.response) {
+                let response = err.response;
+                if (response.status === 404) {
+                    console.debug(p, key, "not found");
+                    return undefined;
                 }
-                console.debug(p, "Failed to load", key, err === null || err === void 0 ? void 0 : err.message);
-                return undefined;
-            });
+            }
+            console.debug(p, "Failed to load", key, err?.message);
+            return undefined;
         });
     }
     assetBasePath(key) {