@galacean/engine-loader 0.0.0-experimental-2.0-migrate.4 → 0.0.0-experimental-2.0-migrate.6

package/dist/main.js

@@ -643,6 +643,39 @@ function float32ArrayToVector2(float32Array, vertexCount) {
     return array;
 }
 
+function _is_native_reflect_construct() {
+    // Since Reflect.construct can't be properly polyfilled, some
+    // implementations (e.g. core-js@2) don't set the correct internal slots.
+    // Those polyfills don't allow us to subclass built-ins, so we need to
+    // use our fallback implementation.
+    try {
+        // If the internal slots aren't set, this throws an error similar to
+        //   TypeError: this is not a Boolean object.
+        var result = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function() {}));
+    } catch (_) {}
+    return (_is_native_reflect_construct = function() {
+        return !!result;
+    })();
+}
+
+function _construct(Parent, args, Class) {
+    if (_is_native_reflect_construct()) _construct = Reflect.construct;
+    else {
+        _construct = function construct(Parent, args, Class) {
+            var a = [null];
+            a.push.apply(a, args);
+            var Constructor = Function.bind.apply(Parent, a);
+            var instance = new Constructor();
+
+            if (Class) _set_prototype_of(instance, Class.prototype);
+
+            return instance;
+        };
+    }
+
+    return _construct.apply(null, arguments);
+}
+
 function _object_without_properties_loose(source, excluded) {
     if (source == null) return {};
 
@@ -659,6 +692,45 @@ function _object_without_properties_loose(source, excluded) {
     return target;
 }
 
+function _array_like_to_array(arr, len) {
+    if (len == null || len > arr.length) len = arr.length;
+
+    for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
+
+    return arr2;
+}
+
+function _unsupported_iterable_to_array(o, minLen) {
+    if (!o) return;
+    if (typeof o === "string") return _array_like_to_array(o, minLen);
+
+    var n = Object.prototype.toString.call(o).slice(8, -1);
+
+    if (n === "Object" && o.constructor) n = o.constructor.name;
+    if (n === "Map" || n === "Set") return Array.from(n);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
+}
+
+function _create_for_of_iterator_helper_loose(o, allowArrayLike) {
+    var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"];
+
+    if (it) return (it = it.call(o)).next.bind(it);
+    // Fallback for engines without symbol support
+    if (Array.isArray(o) || (it = _unsupported_iterable_to_array(o)) || allowArrayLike && o && typeof o.length === "number") {
+        if (it) o = it;
+
+        var i = 0;
+
+        return function() {
+            if (i >= o.length) return { done: true };
+
+            return { done: false, value: o[i++] };
+        };
+    }
+
+    throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+
 function resolveRefItem(refs, index, owner, label) {
     if (!Number.isInteger(index) || index < 0 || index >= refs.length) {
         throw new Error(owner + ": invalid ref index " + index + " for " + label);
@@ -709,7 +781,7 @@ var ReflectionParser = /*#__PURE__*/ function() {
     var _proto = ReflectionParser.prototype;
     /**
    * Apply v2 props to a component/object instance.
-   * Each prop value is resolved recursively (handling $ref, $type, $class, $entity, $component, $signal).
+   * Each prop value is resolved recursively (handling $ref, $number, $type, $class, $entity, $component, $signal).
    */ _proto.parseProps = function parseProps(instance, props) {
         var promises = [];
         if (props) {
@@ -732,15 +804,29 @@ var ReflectionParser = /*#__PURE__*/ function() {
         var _loop = function(i, n) {
             var call = calls[i];
             chain = chain.then(function() {
-                var method = instance == null ? void 0 : instance[call.method];
+                var target = instance;
+                if (call.target !== undefined) {
+                    if (!Array.isArray(call.target) || call.target.some(function(key) {
+                        return typeof key !== "string" || key.length === 0;
+                    })) {
+                        return Promise.reject(new Error('Call "' + call.method + '" target must be an array of non-empty strings'));
+                    }
+                    for(var _iterator = _create_for_of_iterator_helper_loose(call.target), _step; !(_step = _iterator()).done;){
+                        var key = _step.value;
+                        target = target == null ? void 0 : target[key];
+                    }
+                }
+                var method = target == null ? void 0 : target[call.method];
                 if (typeof method !== "function") {
-                    return Promise.reject(new Error('Call target does not have method "' + call.method + '"'));
+                    var _call_target;
+                    var path = ((_call_target = call.target) == null ? void 0 : _call_target.length) ? "" + call.target.join(".") + "." : "";
+                    return Promise.reject(new Error('Call target does not have method "' + path + call.method + '"'));
                 }
                 var _call_args;
                 return Promise.all(((_call_args = call.args) != null ? _call_args : []).map(function(arg) {
                     return _this._resolveValue(arg);
                 })).then(function(resolvedArgs) {
-                    return Promise.resolve(method.apply(instance, resolvedArgs));
+                    return Promise.resolve(method.apply(target, resolvedArgs));
                 }).then(function(result) {
                     if (!call.result) return result;
                     if (result == null || (typeof result === "undefined" ? "undefined" : _type_of(result)) !== "object" && typeof result !== "function") {
@@ -759,13 +845,13 @@ var ReflectionParser = /*#__PURE__*/ function() {
         });
     };
     /**
-   * Apply props and calls from the same mutation block without imposing ordering between them.
+   * Apply props before executing calls from the same mutation block.
    */ _proto.parseMutationBlock = function parseMutationBlock(target, block) {
+        var _this = this;
         if (!block) return Promise.resolve(target);
-        return Promise.all([
-            this.parseProps(target, block.props),
-            this.parseCalls(target, block.calls)
-        ]).then(function() {
+        return this.parseProps(target, block.props).then(function() {
+            return _this.parseCalls(target, block.calls);
+        }).then(function() {
             return target;
         });
     };
@@ -776,12 +862,13 @@ var ReflectionParser = /*#__PURE__*/ function() {
    * 1. null/undefined/primitive → passthrough
    * 2. Array → recurse each element
    * 3. { $ref }       → asset reference
-   * 4. { $type }      → polymorphic type construct
-   * 5. { $class }     → registered class constructor
-   * 6. { $entity }    → entity reference by path (flat index + optional children descent)
-   * 7. { $component } → component reference
-   * 8. { $signal }    → signal binding
-   * 9. plain object   → recurse values (modify originValue in place if exists)
+   * 4. { $number }    → JSON-safe special number
+   * 5. { $type, $args? } → polymorphic type construct
+   * 6. { $class }     → registered class constructor
+   * 7. { $entity }    → entity reference by path (flat index + optional children descent)
+   * 8. { $component } → component reference
+   * 9. { $signal }    → signal binding
+   * 10. plain object  → recurse values (modify originValue in place if exists)
    */ _proto._resolveValue = function _resolveValue(value, originValue) {
         var _this, _loop = function(key) {
             promises.push(_this._resolveValue(obj[key], target[key]).then(function(v) {
@@ -794,6 +881,9 @@ var ReflectionParser = /*#__PURE__*/ function() {
             return _this1._resolveValue(v);
         }));
         var obj = value;
+        if ("$args" in obj && !("$type" in obj)) {
+            return Promise.reject(new Error("$args requires $type"));
+        }
         // $ref — asset reference (index into refs array)
         if ("$ref" in obj) {
             var _this2 = this, context = _this2._context;
@@ -812,14 +902,29 @@ var ReflectionParser = /*#__PURE__*/ function() {
                 return resource;
             });
         }
-        // $type — polymorphic type: construct instance and apply remaining props
+        if ("$number" in obj) {
+            if (Object.keys(obj).length !== 1 || obj.$number !== "Infinity") {
+                return Promise.reject(new Error('$number must be exactly "Infinity"'));
+            }
+            return Promise.resolve(Infinity);
+        }
+        // $type — polymorphic type: resolve constructor args, construct instance, then apply remaining props
         if ("$type" in obj) {
-            var $type = obj.$type, rest = _object_without_properties_loose(obj, [
-                "$type"
+            var $type = obj.$type, $args = obj.$args, rest = _object_without_properties_loose(obj, [
+                "$type",
+                "$args"
             ]);
+            if ($args !== undefined && !Array.isArray($args)) {
+                return Promise.reject(new Error("$args must be an array when used with $type"));
+            }
+            var constructorArgs = Array.isArray($args) ? $args : [];
             return this._resolveRegisteredClass($type, "$type").then(function(Class) {
-                var instance = new Class();
-                return Object.keys(rest).length > 0 ? _this1.parseProps(instance, rest) : instance;
+                return Promise.all(constructorArgs.map(function(arg) {
+                    return _this1._resolveValue(arg);
+                })).then(function(args) {
+                    var instance = _construct(Class, [].concat(args));
+                    return Object.keys(rest).length > 0 ? _this1.parseProps(instance, rest) : instance;
+                });
             });
         }
         // $class — registered class constructor for factory-style methods.
@@ -1301,45 +1406,6 @@ function _instanceof(left, right) {
     return GLTFResource;
 }(engineCore.ReferResource);
 
-function _array_like_to_array(arr, len) {
-    if (len == null || len > arr.length) len = arr.length;
-
-    for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
-
-    return arr2;
-}
-
-function _unsupported_iterable_to_array(o, minLen) {
-    if (!o) return;
-    if (typeof o === "string") return _array_like_to_array(o, minLen);
-
-    var n = Object.prototype.toString.call(o).slice(8, -1);
-
-    if (n === "Object" && o.constructor) n = o.constructor.name;
-    if (n === "Map" || n === "Set") return Array.from(n);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
-}
-
-function _create_for_of_iterator_helper_loose(o, allowArrayLike) {
-    var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"];
-
-    if (it) return (it = it.call(o)).next.bind(it);
-    // Fallback for engines without symbol support
-    if (Array.isArray(o) || (it = _unsupported_iterable_to_array(o)) || allowArrayLike && o && typeof o.length === "number") {
-        if (it) o = it;
-
-        var i = 0;
-
-        return function() {
-            if (i >= o.length) return { done: true };
-
-            return { done: false, value: o[i++] };
-        };
-    }
-
-    throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
-
 var DFDTransferFunction = /*#__PURE__*/ function(DFDTransferFunction) {
     DFDTransferFunction[DFDTransferFunction["linear"] = 1] = "linear";
     DFDTransferFunction[DFDTransferFunction["sRGB"] = 2] = "sRGB";
@@ -6461,8 +6527,7 @@ var ProjectLoader = /*#__PURE__*/ function(Loader) {
             ._request(item.url, _extends({}, item, {
                 type: "json"
             })).then(function(data) {
-                // @ts-ignore
-                engine.resourceManager.initVirtualResources(data.files);
+                engine.resourceManager.registerVirtualResources(data.files);
                 return resourceManager.load({
                     type: engineCore.AssetType.Scene,
                     url: data.scene
@@ -6542,10 +6607,6 @@ var SpriteAtlasLoader = /*#__PURE__*/ function(Loader) {
     _proto.load = function load(item, resourceManager) {
         var _this = this;
         return new engineCore.AssetPromise(function(resolve, reject, _, __, onCancel) {
-            var _item_resolvedUrl;
-            // Atlas pages are runtime files addressed relative to the encoded atlas,
-            // not to the editor-facing virtual resource identity.
-            var atlasUrl = (_item_resolvedUrl = item.resolvedUrl) != null ? _item_resolvedUrl : item.url;
             var chainPromises = [];
             onCancel(function() {
                 for(var i = 0; i < chainPromises.length; i++){
@@ -6553,7 +6614,7 @@ var SpriteAtlasLoader = /*#__PURE__*/ function(Loader) {
                 }
             });
             // @ts-ignore
-            var configPromise = resourceManager._request(atlasUrl, _extends({}, item, {
+            var configPromise = resourceManager._request(item.url, _extends({}, item, {
                 type: "json"
             }));
             chainPromises.push(configPromise);
@@ -6563,7 +6624,7 @@ var SpriteAtlasLoader = /*#__PURE__*/ function(Loader) {
                     if (atlasItem.img) {
                         var _atlasItem_type;
                         chainPromises.push(resourceManager.load({
-                            url: engineCore.Utils.resolveAbsoluteUrl(atlasUrl, atlasItem.img),
+                            url: engineCore.Utils.resolveAbsoluteUrl(item.url, atlasItem.img),
                             type: (_atlasItem_type = atlasItem.type) != null ? _atlasItem_type : engineCore.AssetType.Texture,
                             params: {
                                 format: format,
@@ -6755,29 +6816,17 @@ var TextureLoader = /*#__PURE__*/ function(Loader) {
     };
     _proto._decodeImage = function _decodeImage(buffer, item, resourceManager) {
         var _this = this;
-        return new engineCore.AssetPromise(function(resolve, reject) {
-            var blob = new Blob([
-                buffer
-            ]);
-            var img = new Image();
-            img.onload = function() {
-                URL.revokeObjectURL(img.src);
-                var _item_params;
-                var _ref = (_item_params = item.params) != null ? _item_params : {}, _ref_format = _ref.format, format = _ref_format === void 0 ? engineCore.TextureFormat.R8G8B8A8 : _ref_format, _ref_isSRGBColorSpace = _ref.isSRGBColorSpace, isSRGBColorSpace = _ref_isSRGBColorSpace === void 0 ? true : _ref_isSRGBColorSpace, _ref_mipmap = _ref.mipmap, mipmap = _ref_mipmap === void 0 ? true : _ref_mipmap;
-                var engine = resourceManager.engine;
-                var width = img.width, height = img.height;
-                var generateMipmap = engineCore.TextureUtils.supportGenerateMipmapsWithCorrection(engine, width, height, format, mipmap, isSRGBColorSpace);
-                var texture = new engineCore.Texture2D(engine, width, height, format, generateMipmap, isSRGBColorSpace);
-                texture.setImageSource(img);
-                generateMipmap && texture.generateMipmaps();
-                _this._applyParams(texture, item);
-                resolve(texture);
-            };
-            img.onerror = function(e) {
-                URL.revokeObjectURL(img.src);
-                reject(e);
-            };
-            img.src = URL.createObjectURL(blob);
+        return decodeImage(buffer, item.url).then(function(img) {
+            var _item_params;
+            var _ref = (_item_params = item.params) != null ? _item_params : {}, _ref_format = _ref.format, format = _ref_format === void 0 ? engineCore.TextureFormat.R8G8B8A8 : _ref_format, _ref_isSRGBColorSpace = _ref.isSRGBColorSpace, isSRGBColorSpace = _ref_isSRGBColorSpace === void 0 ? true : _ref_isSRGBColorSpace, _ref_mipmap = _ref.mipmap, mipmap = _ref_mipmap === void 0 ? true : _ref_mipmap;
+            var engine = resourceManager.engine;
+            var width = img.width, height = img.height;
+            var generateMipmap = engineCore.TextureUtils.supportGenerateMipmapsWithCorrection(engine, width, height, format, mipmap, isSRGBColorSpace);
+            var texture = new engineCore.Texture2D(engine, width, height, format, generateMipmap, isSRGBColorSpace);
+            texture.setImageSource(img);
+            generateMipmap && texture.generateMipmaps();
+            _this._applyParams(texture, item);
+            return texture;
         });
     };
     _proto._applyParams = function _applyParams(texture, item) {
@@ -6827,27 +6876,35 @@ var TextureContentRestorer = /*#__PURE__*/ function(ContentRestorer) {
                 texture.mipmapCount > 1 && texture.generateMipmaps();
                 return texture;
             }
-            return new engineCore.AssetPromise(function(resolve, reject) {
-                var blob = new Blob([
-                    buffer
-                ]);
-                var img = new Image();
-                img.onload = function() {
-                    URL.revokeObjectURL(img.src);
-                    texture.setImageSource(img);
-                    texture.mipmapCount > 1 && texture.generateMipmaps();
-                    resolve(texture);
-                };
-                img.onerror = function(e) {
-                    URL.revokeObjectURL(img.src);
-                    reject(e);
-                };
-                img.src = URL.createObjectURL(blob);
+            return decodeImage(buffer, _this.url).then(function(img) {
+                texture.setImageSource(img);
+                texture.mipmapCount > 1 && texture.generateMipmaps();
+                return texture;
             });
         });
     };
     return TextureContentRestorer;
 }(engineCore.ContentRestorer);
+function decodeImage(buffer, url) {
+    return new engineCore.AssetPromise(function(resolve, reject) {
+        var objectUrl = URL.createObjectURL(new Blob([
+            buffer
+        ]));
+        var image = new Image();
+        var releaseObjectUrl = function() {
+            return URL.revokeObjectURL(objectUrl);
+        };
+        image.onload = function() {
+            releaseObjectUrl();
+            resolve(image);
+        };
+        image.onerror = function() {
+            releaseObjectUrl();
+            reject(new Error('TextureLoader: failed to decode texture "' + url + '" (' + buffer.byteLength + " bytes)."));
+        };
+        image.src = objectUrl;
+    });
+}
 
 var AudioLoader = /*#__PURE__*/ function(Loader) {
     _inherits(AudioLoader, Loader);
@@ -6906,23 +6963,16 @@ var ShaderLoader = /*#__PURE__*/ function(Loader) {
     }
     var _proto = ShaderLoader.prototype;
     _proto.load = function load(item, resourceManager) {
-        var _item_resolvedUrl;
-        // Virtual paths preserve source identity (for example `.shader`), while
-        // the physical path determines how this file is encoded (`.shaderc`).
-        var url = (_item_resolvedUrl = item.resolvedUrl) != null ? _item_resolvedUrl : item.url;
-        if (url.endsWith(".shaderc")) {
-            // @ts-ignore
-            return resourceManager._request(url, _extends({}, item, {
-                type: "json"
-            })).then(function(data) {
-                // @ts-ignore - _createFromPrecompiled is @internal
-                return engineCore.Shader._createFromPrecompiled(data);
-            });
-        }
-        // @ts-ignore
+        var url = item.url;
+        // @ts-expect-error _request is @internal
         return resourceManager._request(url, _extends({}, item, {
             type: "text"
         })).then(function(code) {
+            var source = code.trimStart();
+            if (source.startsWith("{")) {
+                // @ts-expect-error _createFromPrecompiled is @internal
+                return engineCore.Shader._createFromPrecompiled(JSON.parse(source));
+            }
             return engineCore.Shader.create(code, undefined, url);
         });
     };