@loaders.gl/images 4.0.0-beta.5 → 4.0.0-beta.6

package/dist/dist.dev.js

@@ -37,8 +37,7 @@ var __exports__ = (() => {
     getSupportedImageFormats: () => getSupportedImageFormats,
     isImage: () => isImage,
     isImageFormatSupported: () => isImageFormatSupported,
-    isImageTypeSupported: () => isImageTypeSupported,
-    loadImage: () => loadImage
+    isImageTypeSupported: () => isImageTypeSupported
   });
 
   // src/lib/utils/version.ts
@@ -66,22 +65,6 @@ var __exports__ = (() => {
   var matches = typeof process !== "undefined" && process.version && /v([0-9]*)/.exec(process.version);
   var nodeVersion = matches && parseFloat(matches[1]) || 0;
 
-  // ../loader-utils/src/lib/path-utils/file-aliases.ts
-  var pathPrefix = "";
-  var fileAliases = {};
-  function resolvePath(filename) {
-    for (const alias in fileAliases) {
-      if (filename.startsWith(alias)) {
-        const replacement = fileAliases[alias];
-        filename = filename.replace(alias, replacement);
-      }
-    }
-    if (!filename.startsWith("http://") && !filename.startsWith("https://")) {
-      filename = `${pathPrefix}${filename}`;
-    }
-    return filename;
-  }
-
   // src/lib/category-api/image-type.ts
   var parseImageNode = globalThis.loaders?.parseImageNode;
   var IMAGE_SUPPORTED = typeof Image !== "undefined";
@@ -571,8 +554,8 @@ var __exports__ = (() => {
   }
   function checkNodeImageFormatSupport(mimeType) {
     const NODE_FORMAT_SUPPORT = ["image/png", "image/jpeg", "image/gif"];
-    const parseImageNode2 = globalThis.loaders?.parseImageNode;
     const imageFormatsNode = globalThis.loaders?.imageFormatsNode || NODE_FORMAT_SUPPORT;
+    const parseImageNode2 = globalThis.loaders?.parseImageNode;
     return Boolean(parseImageNode2) && imageFormatsNode.includes(mimeType);
   }
   function checkBrowserImageFormatSupport(mimeType) {
@@ -609,112 +592,6 @@ var __exports__ = (() => {
       image.onerror = () => resolve(false);
     });
   }
-
-  // src/lib/texture-api/generate-url.ts
-  function generateUrl(getUrl, options, urlOptions) {
-    let url = getUrl;
-    if (typeof getUrl === "function") {
-      url = getUrl({
-        ...options,
-        ...urlOptions
-      });
-    }
-    assert(typeof url === "string");
-    const {
-      baseUrl
-    } = options;
-    if (baseUrl) {
-      url = baseUrl[baseUrl.length - 1] === "/" ? `${baseUrl}${url}` : `${baseUrl}/${url}`;
-    }
-    return resolvePath(url);
-  }
-
-  // src/lib/texture-api/async-deep-map.ts
-  var isObject = (value) => value && typeof value === "object";
-  async function asyncDeepMap(tree, func, options = {}) {
-    return await mapSubtree(tree, func, options);
-  }
-  async function mapSubtree(object, func, options) {
-    if (Array.isArray(object)) {
-      return await mapArray(object, func, options);
-    }
-    if (isObject(object)) {
-      return await mapObject(object, func, options);
-    }
-    const url = object;
-    return await func(url, options);
-  }
-  async function mapObject(object, func, options) {
-    const promises = [];
-    const values = {};
-    for (const key in object) {
-      const url = object[key];
-      const promise = mapSubtree(url, func, options).then((value) => {
-        values[key] = value;
-      });
-      promises.push(promise);
-    }
-    await Promise.all(promises);
-    return values;
-  }
-  async function mapArray(urlArray, func, options = {}) {
-    const promises = urlArray.map((url) => mapSubtree(url, func, options));
-    return await Promise.all(promises);
-  }
-
-  // src/lib/texture-api/deep-load.ts
-  async function deepLoad(urlTree, load, options) {
-    return await asyncDeepMap(urlTree, (url) => shallowLoad(url, load, options));
-  }
-  async function shallowLoad(url, load, options) {
-    const response = await fetch(url, options.fetch);
-    const arrayBuffer = await response.arrayBuffer();
-    return await load(arrayBuffer, options);
-  }
-
-  // src/lib/texture-api/load-image.ts
-  async function loadImage(getUrl, options = {}) {
-    const imageUrls = await getImageUrls(getUrl, options);
-    return await deepLoad(imageUrls, parseImage, options);
-  }
-  async function getImageUrls(getUrl, options, urlOptions = {}) {
-    const mipLevels = options && options.image && options.image.mipLevels || 0;
-    return mipLevels !== 0 ? await getMipmappedImageUrls(getUrl, mipLevels, options, urlOptions) : generateUrl(getUrl, options, urlOptions);
-  }
-  async function getMipmappedImageUrls(getUrl, mipLevels, options, urlOptions) {
-    const urls = [];
-    if (mipLevels === "auto") {
-      const url = generateUrl(getUrl, options, {
-        ...urlOptions,
-        lod: 0
-      });
-      const image = await shallowLoad(url, parseImage, options);
-      const {
-        width,
-        height
-      } = getImageSize(image);
-      mipLevels = getMipLevels({
-        width,
-        height
-      });
-      urls.push(url);
-    }
-    assert(mipLevels > 0);
-    for (let mipLevel = urls.length; mipLevel < mipLevels; ++mipLevel) {
-      const url = generateUrl(getUrl, options, {
-        ...urlOptions,
-        lod: mipLevel
-      });
-      urls.push(url);
-    }
-    return urls;
-  }
-  function getMipLevels({
-    width,
-    height
-  }) {
-    return 1 + Math.floor(Math.log2(Math.max(width, height)));
-  }
   return __toCommonJS(src_exports);
 })();
       return __exports__;

package/dist/index.cjs

@@ -30,8 +30,7 @@ __export(src_exports, {
   getSupportedImageFormats: () => getSupportedImageFormats,
   isImage: () => isImage,
   isImageFormatSupported: () => isImageFormatSupported,
-  isImageTypeSupported: () => isImageTypeSupported,
-  loadImage: () => loadImage
+  isImageTypeSupported: () => isImageTypeSupported
 });
 module.exports = __toCommonJS(src_exports);
 
@@ -560,8 +559,8 @@ function isImageFormatSupported(mimeType) {
 function checkNodeImageFormatSupport(mimeType) {
   var _a3, _b;
   const NODE_FORMAT_SUPPORT = ["image/png", "image/jpeg", "image/gif"];
-  const parseImageNode2 = (_a3 = globalThis.loaders) == null ? void 0 : _a3.parseImageNode;
-  const imageFormatsNode = ((_b = globalThis.loaders) == null ? void 0 : _b.imageFormatsNode) || NODE_FORMAT_SUPPORT;
+  const imageFormatsNode = ((_a3 = globalThis.loaders) == null ? void 0 : _a3.imageFormatsNode) || NODE_FORMAT_SUPPORT;
+  const parseImageNode2 = (_b = globalThis.loaders) == null ? void 0 : _b.parseImageNode;
   return Boolean(parseImageNode2) && imageFormatsNode.includes(mimeType);
 }
 function checkBrowserImageFormatSupport(mimeType) {
@@ -599,93 +598,3 @@ async function testBrowserImageFormatSupportAsync(testImageDataURL) {
     image.onerror = () => resolve(false);
   });
 }
-
-// src/lib/texture-api/load-image.ts
-var import_loader_utils6 = require("@loaders.gl/loader-utils");
-
-// src/lib/texture-api/generate-url.ts
-var import_loader_utils5 = require("@loaders.gl/loader-utils");
-function generateUrl(getUrl, options, urlOptions) {
-  let url = getUrl;
-  if (typeof getUrl === "function") {
-    url = getUrl({ ...options, ...urlOptions });
-  }
-  (0, import_loader_utils5.assert)(typeof url === "string");
-  const { baseUrl } = options;
-  if (baseUrl) {
-    url = baseUrl[baseUrl.length - 1] === "/" ? `${baseUrl}${url}` : `${baseUrl}/${url}`;
-  }
-  return (0, import_loader_utils5.resolvePath)(url);
-}
-
-// src/lib/texture-api/async-deep-map.ts
-var isObject = (value) => value && typeof value === "object";
-async function asyncDeepMap(tree, func, options = {}) {
-  return await mapSubtree(tree, func, options);
-}
-async function mapSubtree(object, func, options) {
-  if (Array.isArray(object)) {
-    return await mapArray(object, func, options);
-  }
-  if (isObject(object)) {
-    return await mapObject(object, func, options);
-  }
-  const url = object;
-  return await func(url, options);
-}
-async function mapObject(object, func, options) {
-  const promises = [];
-  const values = {};
-  for (const key in object) {
-    const url = object[key];
-    const promise = mapSubtree(url, func, options).then((value) => {
-      values[key] = value;
-    });
-    promises.push(promise);
-  }
-  await Promise.all(promises);
-  return values;
-}
-async function mapArray(urlArray, func, options = {}) {
-  const promises = urlArray.map((url) => mapSubtree(url, func, options));
-  return await Promise.all(promises);
-}
-
-// src/lib/texture-api/deep-load.ts
-async function deepLoad(urlTree, load, options) {
-  return await asyncDeepMap(urlTree, (url) => shallowLoad(url, load, options));
-}
-async function shallowLoad(url, load, options) {
-  const response = await fetch(url, options.fetch);
-  const arrayBuffer = await response.arrayBuffer();
-  return await load(arrayBuffer, options);
-}
-
-// src/lib/texture-api/load-image.ts
-async function loadImage(getUrl, options = {}) {
-  const imageUrls = await getImageUrls(getUrl, options);
-  return await deepLoad(imageUrls, parseImage, options);
-}
-async function getImageUrls(getUrl, options, urlOptions = {}) {
-  const mipLevels = options && options.image && options.image.mipLevels || 0;
-  return mipLevels !== 0 ? await getMipmappedImageUrls(getUrl, mipLevels, options, urlOptions) : generateUrl(getUrl, options, urlOptions);
-}
-async function getMipmappedImageUrls(getUrl, mipLevels, options, urlOptions) {
-  const urls = [];
-  if (mipLevels === "auto") {
-    const url = generateUrl(getUrl, options, { ...urlOptions, lod: 0 });
-    const image = await shallowLoad(url, parseImage, options);
-    const { width, height } = getImageSize(image);
-    mipLevels = getMipLevels({ width, height });
-    urls.push(url);
-  }
-  (0, import_loader_utils6.assert)(mipLevels > 0);
-  for (let mipLevel = urls.length; mipLevel < mipLevels; ++mipLevel) {
-    const url = generateUrl(getUrl, options, { ...urlOptions, lod: mipLevel });
-    urls.push(url);
-  }
-  return urls;
-}
-function getMipLevels({ width, height }) {
-  return 1 + Math.floor(Math.log2(Math.max(width, height)));
-}

package/dist/index.d.ts

@@ -7,5 +7,4 @@ export { isImageTypeSupported, getDefaultImageType } from './lib/category-api/im
 export { isImage, getImageType, getImageSize, getImageData } from './lib/category-api/parsed-image-api';
 export { getSupportedImageFormats } from './lib/category-api/image-format';
 export { isImageFormatSupported } from './lib/category-api/image-format';
-export { loadImage } from './lib/texture-api/load-image';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,YAAY,EAAC,aAAa,EAAE,SAAS,EAAE,aAAa,EAAC,MAAM,SAAS,CAAC;AACrE,YAAY,EAAC,kBAAkB,EAAC,MAAM,gBAAgB,CAAC;AAGvD,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAK3C,OAAO,EAAC,sBAAsB,EAAC,MAAM,qCAAqC,CAAC;AAG3E,OAAO,EAAC,oBAAoB,EAAE,mBAAmB,EAAC,MAAM,+BAA+B,CAAC;AAExF,OAAO,EACL,OAAO,EACP,YAAY,EACZ,YAAY,EACZ,YAAY,EACb,MAAM,qCAAqC,CAAC;AAG7C,OAAO,EAAC,wBAAwB,EAAC,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAC,sBAAsB,EAAC,MAAM,iCAAiC,CAAC;AAGvE,OAAO,EAAC,SAAS,EAAC,MAAM,8BAA8B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,YAAY,EAAC,aAAa,EAAE,SAAS,EAAE,aAAa,EAAC,MAAM,SAAS,CAAC;AACrE,YAAY,EAAC,kBAAkB,EAAC,MAAM,gBAAgB,CAAC;AAGvD,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAK3C,OAAO,EAAC,sBAAsB,EAAC,MAAM,qCAAqC,CAAC;AAG3E,OAAO,EAAC,oBAAoB,EAAE,mBAAmB,EAAC,MAAM,+BAA+B,CAAC;AAExF,OAAO,EACL,OAAO,EACP,YAAY,EACZ,YAAY,EACZ,YAAY,EACb,MAAM,qCAAqC,CAAC;AAG7C,OAAO,EAAC,wBAAwB,EAAC,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAC,sBAAsB,EAAC,MAAM,iCAAiC,CAAC"}

package/dist/index.js

@@ -5,5 +5,4 @@ export { isImageTypeSupported, getDefaultImageType } from "./lib/category-api/im
 export { isImage, getImageType, getImageSize, getImageData } from "./lib/category-api/parsed-image-api.js";
 export { getSupportedImageFormats } from "./lib/category-api/image-format.js";
 export { isImageFormatSupported } from "./lib/category-api/image-format.js";
-export { loadImage } from "./lib/texture-api/load-image.js";
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["ImageLoader","ImageWriter","getBinaryImageMetadata","isImageTypeSupported","getDefaultImageType","isImage","getImageType","getImageSize","getImageData","getSupportedImageFormats","isImageFormatSupported","loadImage"],"sources":["../src/index.ts"],"sourcesContent":["// TYPES\nexport type {ImageDataType, ImageType, ImageTypeEnum} from './types';\nexport type {ImageLoaderOptions} from './image-loader';\n\n// LOADERS AND WRITERS\nexport {ImageLoader} from './image-loader';\nexport {ImageWriter} from './image-writer';\n\n// IMAGE CATEGORY API\n\n// Binary Image API\nexport {getBinaryImageMetadata} from './lib/category-api/binary-image-api';\n\n// Parsed Image API\nexport {isImageTypeSupported, getDefaultImageType} from './lib/category-api/image-type';\n\nexport {\n  isImage,\n  getImageType,\n  getImageSize,\n  getImageData\n} from './lib/category-api/parsed-image-api';\n\n// EXPERIMENTAL\nexport {getSupportedImageFormats} from './lib/category-api/image-format';\nexport {isImageFormatSupported} from './lib/category-api/image-format';\n\n// DEPRECATED - Remove in V4 (fix dependency in luma.gl)\nexport {loadImage} from './lib/texture-api/load-image';\n"],"mappings":"SAKQA,WAAW;AAAA,SACXC,WAAW;AAAA,SAKXC,sBAAsB;AAAA,SAGtBC,oBAAoB,EAAEC,mBAAmB;AAAA,SAG/CC,OAAO,EACPC,YAAY,EACZC,YAAY,EACZC,YAAY;AAAA,SAINC,wBAAwB;AAAA,SACxBC,sBAAsB;AAAA,SAGtBC,SAAS"}
+{"version":3,"file":"index.js","names":["ImageLoader","ImageWriter","getBinaryImageMetadata","isImageTypeSupported","getDefaultImageType","isImage","getImageType","getImageSize","getImageData","getSupportedImageFormats","isImageFormatSupported"],"sources":["../src/index.ts"],"sourcesContent":["// TYPES\nexport type {ImageDataType, ImageType, ImageTypeEnum} from './types';\nexport type {ImageLoaderOptions} from './image-loader';\n\n// LOADERS AND WRITERS\nexport {ImageLoader} from './image-loader';\nexport {ImageWriter} from './image-writer';\n\n// IMAGE CATEGORY API\n\n// Binary Image API\nexport {getBinaryImageMetadata} from './lib/category-api/binary-image-api';\n\n// Parsed Image API\nexport {isImageTypeSupported, getDefaultImageType} from './lib/category-api/image-type';\n\nexport {\n  isImage,\n  getImageType,\n  getImageSize,\n  getImageData\n} from './lib/category-api/parsed-image-api';\n\n// EXPERIMENTAL\nexport {getSupportedImageFormats} from './lib/category-api/image-format';\nexport {isImageFormatSupported} from './lib/category-api/image-format';\n"],"mappings":"SAKQA,WAAW;AAAA,SACXC,WAAW;AAAA,SAKXC,sBAAsB;AAAA,SAGtBC,oBAAoB,EAAEC,mBAAmB;AAAA,SAG/CC,OAAO,EACPC,YAAY,EACZC,YAAY,EACZC,YAAY;AAAA,SAINC,wBAAwB;AAAA,SACxBC,sBAAsB"}

package/dist/lib/category-api/image-format.js

@@ -25,8 +25,8 @@ export function isImageFormatSupported(mimeType) {
 function checkNodeImageFormatSupport(mimeType) {
   var _globalThis$loaders, _globalThis$loaders2;
   const NODE_FORMAT_SUPPORT = ['image/png', 'image/jpeg', 'image/gif'];
-  const parseImageNode = (_globalThis$loaders = globalThis.loaders) === null || _globalThis$loaders === void 0 ? void 0 : _globalThis$loaders.parseImageNode;
-  const imageFormatsNode = ((_globalThis$loaders2 = globalThis.loaders) === null || _globalThis$loaders2 === void 0 ? void 0 : _globalThis$loaders2.imageFormatsNode) || NODE_FORMAT_SUPPORT;
+  const imageFormatsNode = ((_globalThis$loaders = globalThis.loaders) === null || _globalThis$loaders === void 0 ? void 0 : _globalThis$loaders.imageFormatsNode) || NODE_FORMAT_SUPPORT;
+  const parseImageNode = (_globalThis$loaders2 = globalThis.loaders) === null || _globalThis$loaders2 === void 0 ? void 0 : _globalThis$loaders2.parseImageNode;
   return Boolean(parseImageNode) && imageFormatsNode.includes(mimeType);
 }
 function checkBrowserImageFormatSupport(mimeType) {

package/dist/lib/category-api/image-format.js.map

@@ -1 +1 @@
-{"version":3,"file":"image-format.js","names":["isBrowser","MIME_TYPES","mimeTypeSupportedPromise","getSupportedImageFormats","supportedMimeTypes","Set","mimeType","supported","checkBrowserImageFormatSupportAsync","checkNodeImageFormatSupport","add","mimeTypeSupportedSync","isImageFormatSupported","undefined","checkBrowserImageFormatSupport","_globalThis$loaders","_globalThis$loaders2","NODE_FORMAT_SUPPORT","parseImageNode","globalThis","loaders","imageFormatsNode","Boolean","includes","testBrowserImageFormatSupport","TEST_IMAGE","dataURL","testBrowserImageFormatSupportAsync","element","document","createElement","toDataURL","indexOf","testImageDataURL","Promise","resolve","image","Image","src","onload","height","onerror"],"sources":["../../../src/lib/category-api/image-format.ts"],"sourcesContent":["// loaders.gl, MIT license\n\nimport {isBrowser} from '@loaders.gl/loader-utils';\n\nconst MIME_TYPES = [\n  'image/png',\n  'image/jpeg',\n  'image/gif',\n  'image/webp',\n  'image/avif',\n  'image/tiff',\n  // TODO - what is the correct type for SVG\n  'image/svg',\n  'image/svg+xml',\n  'image/bmp',\n  'image/vnd.microsoft.icon'\n];\n\n/** Only one round of tests is performed */\nconst mimeTypeSupportedPromise: Promise<Set<string>> | null = null;\n\n/** Run-time browser detection of file formats requires async tests for most precise results */\nexport async function getSupportedImageFormats(): Promise<Set<string>> {\n  if (mimeTypeSupportedPromise) {\n    return await mimeTypeSupportedPromise;\n  }\n\n  const supportedMimeTypes = new Set<string>();\n  for (const mimeType of MIME_TYPES) {\n    const supported = isBrowser\n      ? await checkBrowserImageFormatSupportAsync(mimeType)\n      : checkNodeImageFormatSupport(mimeType);\n    if (supported) {\n      supportedMimeTypes.add(mimeType);\n    }\n  }\n\n  return supportedMimeTypes;\n}\n\n/** Cache sync values for speed */\nconst mimeTypeSupportedSync: {[mimeType: string]: boolean} = {};\n\n/**\n * Check if image MIME type is supported. Result is cached to avoid repeated tests.\n */\nexport function isImageFormatSupported(mimeType: string): boolean {\n  if (mimeTypeSupportedSync[mimeType] === undefined) {\n    const supported = isBrowser\n      ? checkBrowserImageFormatSupport(mimeType)\n      : checkNodeImageFormatSupport(mimeType);\n    mimeTypeSupportedSync[mimeType] = supported;\n  }\n  return mimeTypeSupportedSync[mimeType];\n}\n\n/**\n * Checks that polyfills are installed and that mimeType is supported by polyfills\n * @todo Ideally polyfills should declare what formats they support, instead of storing that data here.\n */\nfunction checkNodeImageFormatSupport(mimeType: string): boolean {\n  /** @deprecated Remove these in 4.0 and rely on polyfills to inject them */\n  const NODE_FORMAT_SUPPORT = ['image/png', 'image/jpeg', 'image/gif'];\n  const parseImageNode = globalThis.loaders?.parseImageNode;\n  const imageFormatsNode = globalThis.loaders?.imageFormatsNode || NODE_FORMAT_SUPPORT;\n  return Boolean(parseImageNode) && imageFormatsNode.includes(mimeType);\n}\n\n/** Checks image format support synchronously.\n * @note Unreliable, fails on AVIF\n */\nfunction checkBrowserImageFormatSupport(mimeType: string): boolean {\n  switch (mimeType) {\n    case 'image/avif': // Will fail\n    case 'image/webp':\n      return testBrowserImageFormatSupport(mimeType);\n    default:\n      return true;\n  }\n}\n\nconst TEST_IMAGE = {\n  'image/avif':\n    'data:image/avif;base64,AAAAIGZ0eXBhdmlmAAAAAGF2aWZtaWYxbWlhZk1BMUIAAADybWV0YQAAAAAAAAAoaGRscgAAAAAAAAAAcGljdAAAAAAAAAAAAAAAAGxpYmF2aWYAAAAADnBpdG0AAAAAAAEAAAAeaWxvYwAAAABEAAABAAEAAAABAAABGgAAAB0AAAAoaWluZgAAAAAAAQAAABppbmZlAgAAAAABAABhdjAxQ29sb3IAAAAAamlwcnAAAABLaXBjbwAAABRpc3BlAAAAAAAAAAIAAAACAAAAEHBpeGkAAAAAAwgICAAAAAxhdjFDgQ0MAAAAABNjb2xybmNseAACAAIAAYAAAAAXaXBtYQAAAAAAAAABAAEEAQKDBAAAACVtZGF0EgAKCBgANogQEAwgMg8f8D///8WfhwB8+ErK42A=',\n  // Lossy test image. Support for lossy images doesn't guarantee support for all WebP images.\n  'image/webp': 'data:image/webp;base64,UklGRiIAAABXRUJQVlA4IBYAAAAwAQCdASoBAAEADsD+JaQAA3AAAAAA'\n};\n\n/** Checks WebP and AVIF support asynchronously */\nasync function checkBrowserImageFormatSupportAsync(mimeType: string): Promise<boolean> {\n  const dataURL = TEST_IMAGE[mimeType];\n  return dataURL ? await testBrowserImageFormatSupportAsync(dataURL) : true;\n}\n\n/**\n * Checks browser synchronously\n * Checks if toDataURL supports the mimeType.\n * @note Imperfect testOn Chrome this is true for WebP but not for AVIF\n */\nfunction testBrowserImageFormatSupport(mimeType: string): boolean {\n  try {\n    const element = document.createElement('canvas');\n    const dataURL = element.toDataURL(mimeType);\n    return dataURL.indexOf(`data:${mimeType}`) === 0;\n  } catch {\n    // Probably Safari...\n    return false;\n  }\n}\n\n// Check WebPSupport asynchronously\nasync function testBrowserImageFormatSupportAsync(testImageDataURL: string): Promise<boolean> {\n  return new Promise((resolve) => {\n    const image = new Image();\n    image.src = testImageDataURL;\n    image.onload = () => resolve(image.height > 0);\n    image.onerror = () => resolve(false);\n  });\n}\n"],"mappings":"AAEA,SAAQA,SAAS,QAAO,0BAA0B;AAElD,MAAMC,UAAU,GAAG,CACjB,WAAW,EACX,YAAY,EACZ,WAAW,EACX,YAAY,EACZ,YAAY,EACZ,YAAY,EAEZ,WAAW,EACX,eAAe,EACf,WAAW,EACX,0BAA0B,CAC3B;AAGD,MAAMC,wBAAqD,GAAG,IAAI;AAGlE,OAAO,eAAeC,wBAAwBA,CAAA,EAAyB;EACrE,IAAID,wBAAwB,EAAE;IAC5B,OAAO,MAAMA,wBAAwB;EACvC;EAEA,MAAME,kBAAkB,GAAG,IAAIC,GAAG,CAAS,CAAC;EAC5C,KAAK,MAAMC,QAAQ,IAAIL,UAAU,EAAE;IACjC,MAAMM,SAAS,GAAGP,SAAS,GACvB,MAAMQ,mCAAmC,CAACF,QAAQ,CAAC,GACnDG,2BAA2B,CAACH,QAAQ,CAAC;IACzC,IAAIC,SAAS,EAAE;MACbH,kBAAkB,CAACM,GAAG,CAACJ,QAAQ,CAAC;IAClC;EACF;EAEA,OAAOF,kBAAkB;AAC3B;AAGA,MAAMO,qBAAoD,GAAG,CAAC,CAAC;AAK/D,OAAO,SAASC,sBAAsBA,CAACN,QAAgB,EAAW;EAChE,IAAIK,qBAAqB,CAACL,QAAQ,CAAC,KAAKO,SAAS,EAAE;IACjD,MAAMN,SAAS,GAAGP,SAAS,GACvBc,8BAA8B,CAACR,QAAQ,CAAC,GACxCG,2BAA2B,CAACH,QAAQ,CAAC;IACzCK,qBAAqB,CAACL,QAAQ,CAAC,GAAGC,SAAS;EAC7C;EACA,OAAOI,qBAAqB,CAACL,QAAQ,CAAC;AACxC;AAMA,SAASG,2BAA2BA,CAACH,QAAgB,EAAW;EAAA,IAAAS,mBAAA,EAAAC,oBAAA;EAE9D,MAAMC,mBAAmB,GAAG,CAAC,WAAW,EAAE,YAAY,EAAE,WAAW,CAAC;EACpE,MAAMC,cAAc,IAAAH,mBAAA,GAAGI,UAAU,CAACC,OAAO,cAAAL,mBAAA,uBAAlBA,mBAAA,CAAoBG,cAAc;EACzD,MAAMG,gBAAgB,GAAG,EAAAL,oBAAA,GAAAG,UAAU,CAACC,OAAO,cAAAJ,oBAAA,uBAAlBA,oBAAA,CAAoBK,gBAAgB,KAAIJ,mBAAmB;EACpF,OAAOK,OAAO,CAACJ,cAAc,CAAC,IAAIG,gBAAgB,CAACE,QAAQ,CAACjB,QAAQ,CAAC;AACvE;AAKA,SAASQ,8BAA8BA,CAACR,QAAgB,EAAW;EACjE,QAAQA,QAAQ;IACd,KAAK,YAAY;IACjB,KAAK,YAAY;MACf,OAAOkB,6BAA6B,CAAClB,QAAQ,CAAC;IAChD;MACE,OAAO,IAAI;EACf;AACF;AAEA,MAAMmB,UAAU,GAAG;EACjB,YAAY,EACV,ybAAyb;EAE3b,YAAY,EAAE;AAChB,CAAC;AAGD,eAAejB,mCAAmCA,CAACF,QAAgB,EAAoB;EACrF,MAAMoB,OAAO,GAAGD,UAAU,CAACnB,QAAQ,CAAC;EACpC,OAAOoB,OAAO,GAAG,MAAMC,kCAAkC,CAACD,OAAO,CAAC,GAAG,IAAI;AAC3E;AAOA,SAASF,6BAA6BA,CAAClB,QAAgB,EAAW;EAChE,IAAI;IACF,MAAMsB,OAAO,GAAGC,QAAQ,CAACC,aAAa,CAAC,QAAQ,CAAC;IAChD,MAAMJ,OAAO,GAAGE,OAAO,CAACG,SAAS,CAACzB,QAAQ,CAAC;IAC3C,OAAOoB,OAAO,CAACM,OAAO,CAAE,QAAO1B,QAAS,EAAC,CAAC,KAAK,CAAC;EAClD,CAAC,CAAC,MAAM;IAEN,OAAO,KAAK;EACd;AACF;AAGA,eAAeqB,kCAAkCA,CAACM,gBAAwB,EAAoB;EAC5F,OAAO,IAAIC,OAAO,CAAEC,OAAO,IAAK;IAC9B,MAAMC,KAAK,GAAG,IAAIC,KAAK,CAAC,CAAC;IACzBD,KAAK,CAACE,GAAG,GAAGL,gBAAgB;IAC5BG,KAAK,CAACG,MAAM,GAAG,MAAMJ,OAAO,CAACC,KAAK,CAACI,MAAM,GAAG,CAAC,CAAC;IAC9CJ,KAAK,CAACK,OAAO,GAAG,MAAMN,OAAO,CAAC,KAAK,CAAC;EACtC,CAAC,CAAC;AACJ"}
+{"version":3,"file":"image-format.js","names":["isBrowser","MIME_TYPES","mimeTypeSupportedPromise","getSupportedImageFormats","supportedMimeTypes","Set","mimeType","supported","checkBrowserImageFormatSupportAsync","checkNodeImageFormatSupport","add","mimeTypeSupportedSync","isImageFormatSupported","undefined","checkBrowserImageFormatSupport","_globalThis$loaders","_globalThis$loaders2","NODE_FORMAT_SUPPORT","imageFormatsNode","globalThis","loaders","parseImageNode","Boolean","includes","testBrowserImageFormatSupport","TEST_IMAGE","dataURL","testBrowserImageFormatSupportAsync","element","document","createElement","toDataURL","indexOf","testImageDataURL","Promise","resolve","image","Image","src","onload","height","onerror"],"sources":["../../../src/lib/category-api/image-format.ts"],"sourcesContent":["// loaders.gl, MIT license\n\nimport {isBrowser} from '@loaders.gl/loader-utils';\n\nconst MIME_TYPES = [\n  'image/png',\n  'image/jpeg',\n  'image/gif',\n  'image/webp',\n  'image/avif',\n  'image/tiff',\n  // TODO - what is the correct type for SVG\n  'image/svg',\n  'image/svg+xml',\n  'image/bmp',\n  'image/vnd.microsoft.icon'\n];\n\n/** Only one round of tests is performed */\nconst mimeTypeSupportedPromise: Promise<Set<string>> | null = null;\n\n/** Run-time browser detection of file formats requires async tests for most precise results */\nexport async function getSupportedImageFormats(): Promise<Set<string>> {\n  if (mimeTypeSupportedPromise) {\n    return await mimeTypeSupportedPromise;\n  }\n\n  const supportedMimeTypes = new Set<string>();\n  for (const mimeType of MIME_TYPES) {\n    const supported = isBrowser\n      ? await checkBrowserImageFormatSupportAsync(mimeType)\n      : checkNodeImageFormatSupport(mimeType);\n    if (supported) {\n      supportedMimeTypes.add(mimeType);\n    }\n  }\n\n  return supportedMimeTypes;\n}\n\n/** Cache sync values for speed */\nconst mimeTypeSupportedSync: {[mimeType: string]: boolean} = {};\n\n/**\n * Check if image MIME type is supported. Result is cached to avoid repeated tests.\n */\nexport function isImageFormatSupported(mimeType: string): boolean {\n  if (mimeTypeSupportedSync[mimeType] === undefined) {\n    const supported = isBrowser\n      ? checkBrowserImageFormatSupport(mimeType)\n      : checkNodeImageFormatSupport(mimeType);\n    mimeTypeSupportedSync[mimeType] = supported;\n  }\n  return mimeTypeSupportedSync[mimeType];\n}\n\n/**\n * Checks that polyfills are installed and that mimeType is supported by polyfills\n * @todo Ideally polyfills should declare what formats they support, instead of storing that data here.\n */\nfunction checkNodeImageFormatSupport(mimeType: string): boolean {\n  const NODE_FORMAT_SUPPORT = ['image/png', 'image/jpeg', 'image/gif'];\n  const imageFormatsNode = globalThis.loaders?.imageFormatsNode || NODE_FORMAT_SUPPORT;\n  const parseImageNode = globalThis.loaders?.parseImageNode;\n  return Boolean(parseImageNode) && imageFormatsNode.includes(mimeType);\n}\n\n/** Checks image format support synchronously.\n * @note Unreliable, fails on AVIF\n */\nfunction checkBrowserImageFormatSupport(mimeType: string): boolean {\n  switch (mimeType) {\n    case 'image/avif': // Will fail\n    case 'image/webp':\n      return testBrowserImageFormatSupport(mimeType);\n    default:\n      return true;\n  }\n}\n\nconst TEST_IMAGE = {\n  'image/avif':\n    'data:image/avif;base64,AAAAIGZ0eXBhdmlmAAAAAGF2aWZtaWYxbWlhZk1BMUIAAADybWV0YQAAAAAAAAAoaGRscgAAAAAAAAAAcGljdAAAAAAAAAAAAAAAAGxpYmF2aWYAAAAADnBpdG0AAAAAAAEAAAAeaWxvYwAAAABEAAABAAEAAAABAAABGgAAAB0AAAAoaWluZgAAAAAAAQAAABppbmZlAgAAAAABAABhdjAxQ29sb3IAAAAAamlwcnAAAABLaXBjbwAAABRpc3BlAAAAAAAAAAIAAAACAAAAEHBpeGkAAAAAAwgICAAAAAxhdjFDgQ0MAAAAABNjb2xybmNseAACAAIAAYAAAAAXaXBtYQAAAAAAAAABAAEEAQKDBAAAACVtZGF0EgAKCBgANogQEAwgMg8f8D///8WfhwB8+ErK42A=',\n  // Lossy test image. Support for lossy images doesn't guarantee support for all WebP images.\n  'image/webp': 'data:image/webp;base64,UklGRiIAAABXRUJQVlA4IBYAAAAwAQCdASoBAAEADsD+JaQAA3AAAAAA'\n};\n\n/** Checks WebP and AVIF support asynchronously */\nasync function checkBrowserImageFormatSupportAsync(mimeType: string): Promise<boolean> {\n  const dataURL = TEST_IMAGE[mimeType];\n  return dataURL ? await testBrowserImageFormatSupportAsync(dataURL) : true;\n}\n\n/**\n * Checks browser synchronously\n * Checks if toDataURL supports the mimeType.\n * @note Imperfect testOn Chrome this is true for WebP but not for AVIF\n */\nfunction testBrowserImageFormatSupport(mimeType: string): boolean {\n  try {\n    const element = document.createElement('canvas');\n    const dataURL = element.toDataURL(mimeType);\n    return dataURL.indexOf(`data:${mimeType}`) === 0;\n  } catch {\n    // Probably Safari...\n    return false;\n  }\n}\n\n// Check WebPSupport asynchronously\nasync function testBrowserImageFormatSupportAsync(testImageDataURL: string): Promise<boolean> {\n  return new Promise((resolve) => {\n    const image = new Image();\n    image.src = testImageDataURL;\n    image.onload = () => resolve(image.height > 0);\n    image.onerror = () => resolve(false);\n  });\n}\n"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/images",
-  "version": "4.0.0-beta.5",
+  "version": "4.0.0-beta.6",
   "description": "Framework-independent loaders and writers for images (PNG, JPG, ...)",
   "license": "MIT",
   "type": "module",
@@ -40,9 +40,9 @@
     "build-bundle": "ocular-bundle ./src/index.ts"
   },
   "dependencies": {
-    "@loaders.gl/loader-utils": "4.0.0-beta.5"
+    "@loaders.gl/loader-utils": "4.0.0-beta.6"
   },
-  "gitHead": "a6f5a0d1a316cc22396e5a4d480c14329d1ef146",
+  "gitHead": "2840f605b7a551e2ffef5f960231d989a0414c50",
   "devDependencies": {
     "@types/get-pixels": "^3.3.2"
   }

package/src/index.ts

@@ -24,6 +24,3 @@ export {
 // EXPERIMENTAL
 export {getSupportedImageFormats} from './lib/category-api/image-format';
 export {isImageFormatSupported} from './lib/category-api/image-format';
-
-// DEPRECATED - Remove in V4 (fix dependency in luma.gl)
-export {loadImage} from './lib/texture-api/load-image';

package/src/lib/category-api/image-format.ts

@@ -59,10 +59,9 @@ export function isImageFormatSupported(mimeType: string): boolean {
  * @todo Ideally polyfills should declare what formats they support, instead of storing that data here.
  */
 function checkNodeImageFormatSupport(mimeType: string): boolean {
-  /** @deprecated Remove these in 4.0 and rely on polyfills to inject them */
   const NODE_FORMAT_SUPPORT = ['image/png', 'image/jpeg', 'image/gif'];
-  const parseImageNode = globalThis.loaders?.parseImageNode;
   const imageFormatsNode = globalThis.loaders?.imageFormatsNode || NODE_FORMAT_SUPPORT;
+  const parseImageNode = globalThis.loaders?.parseImageNode;
   return Boolean(parseImageNode) && imageFormatsNode.includes(mimeType);
 }
 

package/dist/lib/texture-api/async-deep-map.d.ts

@@ -1,3 +0,0 @@
-export declare function asyncDeepMap(tree: any, func: any, options?: {}): Promise<any>;
-export declare function mapSubtree(object: any, func: any, options: any): Promise<any>;
-//# sourceMappingURL=async-deep-map.d.ts.map

package/dist/lib/texture-api/async-deep-map.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"async-deep-map.d.ts","sourceRoot":"","sources":["../../../src/lib/texture-api/async-deep-map.ts"],"names":[],"mappings":"AAqBA,wBAAsB,YAAY,CAAC,IAAI,KAAA,EAAE,IAAI,KAAA,EAAE,OAAO,KAAK,gBAE1D;AAED,wBAAsB,UAAU,CAAC,MAAM,KAAA,EAAE,IAAI,KAAA,EAAE,OAAO,KAAA,gBAYrD"}

package/dist/lib/texture-api/async-deep-map.js

@@ -1,34 +0,0 @@
-const isObject = value => value && typeof value === 'object';
-export async function asyncDeepMap(tree, func) {
-  let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-  return await mapSubtree(tree, func, options);
-}
-export async function mapSubtree(object, func, options) {
-  if (Array.isArray(object)) {
-    return await mapArray(object, func, options);
-  }
-  if (isObject(object)) {
-    return await mapObject(object, func, options);
-  }
-  const url = object;
-  return await func(url, options);
-}
-async function mapObject(object, func, options) {
-  const promises = [];
-  const values = {};
-  for (const key in object) {
-    const url = object[key];
-    const promise = mapSubtree(url, func, options).then(value => {
-      values[key] = value;
-    });
-    promises.push(promise);
-  }
-  await Promise.all(promises);
-  return values;
-}
-async function mapArray(urlArray, func) {
-  let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-  const promises = urlArray.map(url => mapSubtree(url, func, options));
-  return await Promise.all(promises);
-}
-//# sourceMappingURL=async-deep-map.js.map

package/dist/lib/texture-api/async-deep-map.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"async-deep-map.js","names":["isObject","value","asyncDeepMap","tree","func","options","arguments","length","undefined","mapSubtree","object","Array","isArray","mapArray","mapObject","url","promises","values","key","promise","then","push","Promise","all","urlArray","map"],"sources":["../../../src/lib/texture-api/async-deep-map.ts"],"sourcesContent":["/*\nAsynchronously maps a deep structure of values (e.g. objects and arrays of urls).\n\nE.g. a mipmapped cubemap\n{\n  [CUBE_FACE_FRONT]: [\n    \"image-front-0.jpg\",\n    \"image-front-1.jpg\",\n    \"image-front-2.jpg\",\n  ],\n  [CUBE_MAP_BACK]: [\n    ...\n  ]\n}\n*/\n\nconst isObject = (value) => value && typeof value === 'object';\n\n// Loads a deep structure of urls (objects and arrays of urls)\n// Returns an object with six key-value pairs containing the images (or image mip arrays)\n// for each cube face\nexport async function asyncDeepMap(tree, func, options = {}) {\n  return await mapSubtree(tree, func, options);\n}\n\nexport async function mapSubtree(object, func, options) {\n  if (Array.isArray(object)) {\n    return await mapArray(object, func, options);\n  }\n\n  if (isObject(object)) {\n    return await mapObject(object, func, options);\n  }\n\n  // TODO - ignore non-urls, non-arraybuffers?\n  const url = object;\n  return await func(url, options);\n}\n\n// HELPERS\n\nasync function mapObject(object, func, options) {\n  const promises: Promise<any>[] = [];\n  const values = {};\n\n  for (const key in object) {\n    const url = object[key];\n    const promise = mapSubtree(url, func, options).then((value) => {\n      values[key] = value;\n    });\n    promises.push(promise);\n  }\n\n  await Promise.all(promises);\n\n  return values;\n}\n\nasync function mapArray(urlArray, func, options = {}) {\n  const promises = urlArray.map((url) => mapSubtree(url, func, options));\n  return await Promise.all(promises);\n}\n"],"mappings":"AAgBA,MAAMA,QAAQ,GAAIC,KAAK,IAAKA,KAAK,IAAI,OAAOA,KAAK,KAAK,QAAQ;AAK9D,OAAO,eAAeC,YAAYA,CAACC,IAAI,EAAEC,IAAI,EAAgB;EAAA,IAAdC,OAAO,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,CAAC,CAAC;EACzD,OAAO,MAAMG,UAAU,CAACN,IAAI,EAAEC,IAAI,EAAEC,OAAO,CAAC;AAC9C;AAEA,OAAO,eAAeI,UAAUA,CAACC,MAAM,EAAEN,IAAI,EAAEC,OAAO,EAAE;EACtD,IAAIM,KAAK,CAACC,OAAO,CAACF,MAAM,CAAC,EAAE;IACzB,OAAO,MAAMG,QAAQ,CAACH,MAAM,EAAEN,IAAI,EAAEC,OAAO,CAAC;EAC9C;EAEA,IAAIL,QAAQ,CAACU,MAAM,CAAC,EAAE;IACpB,OAAO,MAAMI,SAAS,CAACJ,MAAM,EAAEN,IAAI,EAAEC,OAAO,CAAC;EAC/C;EAGA,MAAMU,GAAG,GAAGL,MAAM;EAClB,OAAO,MAAMN,IAAI,CAACW,GAAG,EAAEV,OAAO,CAAC;AACjC;AAIA,eAAeS,SAASA,CAACJ,MAAM,EAAEN,IAAI,EAAEC,OAAO,EAAE;EAC9C,MAAMW,QAAwB,GAAG,EAAE;EACnC,MAAMC,MAAM,GAAG,CAAC,CAAC;EAEjB,KAAK,MAAMC,GAAG,IAAIR,MAAM,EAAE;IACxB,MAAMK,GAAG,GAAGL,MAAM,CAACQ,GAAG,CAAC;IACvB,MAAMC,OAAO,GAAGV,UAAU,CAACM,GAAG,EAAEX,IAAI,EAAEC,OAAO,CAAC,CAACe,IAAI,CAAEnB,KAAK,IAAK;MAC7DgB,MAAM,CAACC,GAAG,CAAC,GAAGjB,KAAK;IACrB,CAAC,CAAC;IACFe,QAAQ,CAACK,IAAI,CAACF,OAAO,CAAC;EACxB;EAEA,MAAMG,OAAO,CAACC,GAAG,CAACP,QAAQ,CAAC;EAE3B,OAAOC,MAAM;AACf;AAEA,eAAeJ,QAAQA,CAACW,QAAQ,EAAEpB,IAAI,EAAgB;EAAA,IAAdC,OAAO,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,CAAC,CAAC;EAClD,MAAMU,QAAQ,GAAGQ,QAAQ,CAACC,GAAG,CAAEV,GAAG,IAAKN,UAAU,CAACM,GAAG,EAAEX,IAAI,EAAEC,OAAO,CAAC,CAAC;EACtE,OAAO,MAAMiB,OAAO,CAACC,GAAG,CAACP,QAAQ,CAAC;AACpC"}

package/dist/lib/texture-api/deep-load.d.ts

@@ -1,3 +0,0 @@
-export declare function deepLoad(urlTree: any, load: any, options: any): Promise<any>;
-export declare function shallowLoad(url: any, load: any, options: any): Promise<any>;
-//# sourceMappingURL=deep-load.d.ts.map

package/dist/lib/texture-api/deep-load.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"deep-load.d.ts","sourceRoot":"","sources":["../../../src/lib/texture-api/deep-load.ts"],"names":[],"mappings":"AAEA,wBAAsB,QAAQ,CAAC,OAAO,KAAA,EAAE,IAAI,KAAA,EAAE,OAAO,KAAA,gBAEpD;AAED,wBAAsB,WAAW,CAAC,GAAG,KAAA,EAAE,IAAI,KAAA,EAAE,OAAO,KAAA,gBAInD"}

package/dist/lib/texture-api/deep-load.js

@@ -1,10 +0,0 @@
-import { asyncDeepMap } from "./async-deep-map.js";
-export async function deepLoad(urlTree, load, options) {
-  return await asyncDeepMap(urlTree, url => shallowLoad(url, load, options));
-}
-export async function shallowLoad(url, load, options) {
-  const response = await fetch(url, options.fetch);
-  const arrayBuffer = await response.arrayBuffer();
-  return await load(arrayBuffer, options);
-}
-//# sourceMappingURL=deep-load.js.map

package/dist/lib/texture-api/deep-load.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"deep-load.js","names":["asyncDeepMap","deepLoad","urlTree","load","options","url","shallowLoad","response","fetch","arrayBuffer"],"sources":["../../../src/lib/texture-api/deep-load.ts"],"sourcesContent":["import {asyncDeepMap} from './async-deep-map';\n\nexport async function deepLoad(urlTree, load, options) {\n  return await asyncDeepMap(urlTree, (url) => shallowLoad(url, load, options));\n}\n\nexport async function shallowLoad(url, load, options) {\n  const response = await fetch(url, options.fetch);\n  const arrayBuffer = await response.arrayBuffer();\n  return await load(arrayBuffer, options);\n}\n"],"mappings":"SAAQA,YAAY;AAEpB,OAAO,eAAeC,QAAQA,CAACC,OAAO,EAAEC,IAAI,EAAEC,OAAO,EAAE;EACrD,OAAO,MAAMJ,YAAY,CAACE,OAAO,EAAGG,GAAG,IAAKC,WAAW,CAACD,GAAG,EAAEF,IAAI,EAAEC,OAAO,CAAC,CAAC;AAC9E;AAEA,OAAO,eAAeE,WAAWA,CAACD,GAAG,EAAEF,IAAI,EAAEC,OAAO,EAAE;EACpD,MAAMG,QAAQ,GAAG,MAAMC,KAAK,CAACH,GAAG,EAAED,OAAO,CAACI,KAAK,CAAC;EAChD,MAAMC,WAAW,GAAG,MAAMF,QAAQ,CAACE,WAAW,CAAC,CAAC;EAChD,OAAO,MAAMN,IAAI,CAACM,WAAW,EAAEL,OAAO,CAAC;AACzC"}

package/dist/lib/texture-api/generate-url.d.ts

@@ -1,2 +0,0 @@
-export declare function generateUrl(getUrl: any, options: any, urlOptions: any): string;
-//# sourceMappingURL=generate-url.d.ts.map

package/dist/lib/texture-api/generate-url.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"generate-url.d.ts","sourceRoot":"","sources":["../../../src/lib/texture-api/generate-url.ts"],"names":[],"mappings":"AAGA,wBAAgB,WAAW,CAAC,MAAM,KAAA,EAAE,OAAO,KAAA,EAAE,UAAU,KAAA,UAetD"}

package/dist/lib/texture-api/generate-url.js

@@ -1,19 +0,0 @@
-import { resolvePath, assert } from '@loaders.gl/loader-utils';
-export function generateUrl(getUrl, options, urlOptions) {
-  let url = getUrl;
-  if (typeof getUrl === 'function') {
-    url = getUrl({
-      ...options,
-      ...urlOptions
-    });
-  }
-  assert(typeof url === 'string');
-  const {
-    baseUrl
-  } = options;
-  if (baseUrl) {
-    url = baseUrl[baseUrl.length - 1] === '/' ? `${baseUrl}${url}` : `${baseUrl}/${url}`;
-  }
-  return resolvePath(url);
-}
-//# sourceMappingURL=generate-url.js.map

package/dist/lib/texture-api/generate-url.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"generate-url.js","names":["resolvePath","assert","generateUrl","getUrl","options","urlOptions","url","baseUrl","length"],"sources":["../../../src/lib/texture-api/generate-url.ts"],"sourcesContent":["import {resolvePath, assert} from '@loaders.gl/loader-utils';\n\n// Generate a url by calling getUrl with mix of options, applying options.baseUrl\nexport function generateUrl(getUrl, options, urlOptions) {\n  // Get url\n  let url = getUrl;\n  if (typeof getUrl === 'function') {\n    url = getUrl({...options, ...urlOptions});\n  }\n  assert(typeof url === 'string');\n\n  // Apply options.baseUrl\n  const {baseUrl} = options;\n  if (baseUrl) {\n    url = baseUrl[baseUrl.length - 1] === '/' ? `${baseUrl}${url}` : `${baseUrl}/${url}`;\n  }\n\n  return resolvePath(url);\n}\n"],"mappings":"AAAA,SAAQA,WAAW,EAAEC,MAAM,QAAO,0BAA0B;AAG5D,OAAO,SAASC,WAAWA,CAACC,MAAM,EAAEC,OAAO,EAAEC,UAAU,EAAE;EAEvD,IAAIC,GAAG,GAAGH,MAAM;EAChB,IAAI,OAAOA,MAAM,KAAK,UAAU,EAAE;IAChCG,GAAG,GAAGH,MAAM,CAAC;MAAC,GAAGC,OAAO;MAAE,GAAGC;IAAU,CAAC,CAAC;EAC3C;EACAJ,MAAM,CAAC,OAAOK,GAAG,KAAK,QAAQ,CAAC;EAG/B,MAAM;IAACC;EAAO,CAAC,GAAGH,OAAO;EACzB,IAAIG,OAAO,EAAE;IACXD,GAAG,GAAGC,OAAO,CAACA,OAAO,CAACC,MAAM,GAAG,CAAC,CAAC,KAAK,GAAG,GAAI,GAAED,OAAQ,GAAED,GAAI,EAAC,GAAI,GAAEC,OAAQ,IAAGD,GAAI,EAAC;EACtF;EAEA,OAAON,WAAW,CAACM,GAAG,CAAC;AACzB"}

package/dist/lib/texture-api/load-image.d.ts

@@ -1,7 +0,0 @@
-export declare function loadImage(getUrl: any, options?: {}): Promise<any>;
-export declare function getImageUrls(getUrl: any, options: any, urlOptions?: {}): Promise<string | string[]>;
-export declare function getMipLevels({ width, height }: {
-    width: any;
-    height: any;
-}): number;
-//# sourceMappingURL=load-image.d.ts.map

package/dist/lib/texture-api/load-image.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"load-image.d.ts","sourceRoot":"","sources":["../../../src/lib/texture-api/load-image.ts"],"names":[],"mappings":"AAMA,wBAAsB,SAAS,CAAC,MAAM,KAAA,EAAE,OAAO,KAAK,gBAGnD;AAED,wBAAsB,YAAY,CAAC,MAAM,KAAA,EAAE,OAAO,KAAA,EAAE,UAAU,KAAK,8BAKlE;AA6BD,wBAAgB,YAAY,CAAC,EAAC,KAAK,EAAE,MAAM,EAAC;;;CAAA,UAE3C"}

package/dist/lib/texture-api/load-image.js

@@ -1,51 +0,0 @@
-import { assert } from '@loaders.gl/loader-utils';
-import { parseImage } from "../parsers/parse-image.js";
-import { getImageSize } from "../category-api/parsed-image-api.js";
-import { generateUrl } from "./generate-url.js";
-import { deepLoad, shallowLoad } from "./deep-load.js";
-export async function loadImage(getUrl) {
-  let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  const imageUrls = await getImageUrls(getUrl, options);
-  return await deepLoad(imageUrls, parseImage, options);
-}
-export async function getImageUrls(getUrl, options) {
-  let urlOptions = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-  const mipLevels = options && options.image && options.image.mipLevels || 0;
-  return mipLevels !== 0 ? await getMipmappedImageUrls(getUrl, mipLevels, options, urlOptions) : generateUrl(getUrl, options, urlOptions);
-}
-async function getMipmappedImageUrls(getUrl, mipLevels, options, urlOptions) {
-  const urls = [];
-  if (mipLevels === 'auto') {
-    const url = generateUrl(getUrl, options, {
-      ...urlOptions,
-      lod: 0
-    });
-    const image = await shallowLoad(url, parseImage, options);
-    const {
-      width,
-      height
-    } = getImageSize(image);
-    mipLevels = getMipLevels({
-      width,
-      height
-    });
-    urls.push(url);
-  }
-  assert(mipLevels > 0);
-  for (let mipLevel = urls.length; mipLevel < mipLevels; ++mipLevel) {
-    const url = generateUrl(getUrl, options, {
-      ...urlOptions,
-      lod: mipLevel
-    });
-    urls.push(url);
-  }
-  return urls;
-}
-export function getMipLevels(_ref) {
-  let {
-    width,
-    height
-  } = _ref;
-  return 1 + Math.floor(Math.log2(Math.max(width, height)));
-}
-//# sourceMappingURL=load-image.js.map

package/dist/lib/texture-api/load-image.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"load-image.js","names":["assert","parseImage","getImageSize","generateUrl","deepLoad","shallowLoad","loadImage","getUrl","options","arguments","length","undefined","imageUrls","getImageUrls","urlOptions","mipLevels","image","getMipmappedImageUrls","urls","url","lod","width","height","getMipLevels","push","mipLevel","_ref","Math","floor","log2","max"],"sources":["../../../src/lib/texture-api/load-image.ts"],"sourcesContent":["import {assert} from '@loaders.gl/loader-utils';\nimport {parseImage} from '../parsers/parse-image';\nimport {getImageSize} from '../category-api/parsed-image-api';\nimport {generateUrl} from './generate-url';\nimport {deepLoad, shallowLoad} from './deep-load';\n\nexport async function loadImage(getUrl, options = {}) {\n  const imageUrls = await getImageUrls(getUrl, options);\n  return await deepLoad(imageUrls, parseImage, options);\n}\n\nexport async function getImageUrls(getUrl, options, urlOptions = {}) {\n  const mipLevels = (options && options.image && options.image.mipLevels) || 0;\n  return mipLevels !== 0\n    ? await getMipmappedImageUrls(getUrl, mipLevels, options, urlOptions)\n    : generateUrl(getUrl, options, urlOptions);\n}\n\nasync function getMipmappedImageUrls(getUrl, mipLevels, options, urlOptions) {\n  const urls: string[] = [];\n\n  // If no mip levels supplied, we need to load the level 0 image and calculate based on size\n  if (mipLevels === 'auto') {\n    const url = generateUrl(getUrl, options, {...urlOptions, lod: 0});\n    const image = await shallowLoad(url, parseImage, options);\n\n    const {width, height} = getImageSize(image);\n    mipLevels = getMipLevels({width, height});\n\n    // TODO - push image and make `deepLoad` pass through non-url values, avoid loading twice?\n    urls.push(url);\n  }\n\n  // We now know how many mipLevels we need, remaining image urls can now be constructed\n  assert(mipLevels > 0);\n\n  for (let mipLevel = urls.length; mipLevel < mipLevels; ++mipLevel) {\n    const url = generateUrl(getUrl, options, {...urlOptions, lod: mipLevel});\n    urls.push(url);\n  }\n\n  return urls;\n}\n\n// Calculates number of mipmaps based on texture size (log2)\nexport function getMipLevels({width, height}) {\n  return 1 + Math.floor(Math.log2(Math.max(width, height)));\n}\n"],"mappings":"AAAA,SAAQA,MAAM,QAAO,0BAA0B;AAAC,SACxCC,UAAU;AAAA,SACVC,YAAY;AAAA,SACZC,WAAW;AAAA,SACXC,QAAQ,EAAEC,WAAW;AAE7B,OAAO,eAAeC,SAASA,CAACC,MAAM,EAAgB;EAAA,IAAdC,OAAO,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,CAAC,CAAC;EAClD,MAAMG,SAAS,GAAG,MAAMC,YAAY,CAACN,MAAM,EAAEC,OAAO,CAAC;EACrD,OAAO,MAAMJ,QAAQ,CAACQ,SAAS,EAAEX,UAAU,EAAEO,OAAO,CAAC;AACvD;AAEA,OAAO,eAAeK,YAAYA,CAACN,MAAM,EAAEC,OAAO,EAAmB;EAAA,IAAjBM,UAAU,GAAAL,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,CAAC,CAAC;EACjE,MAAMM,SAAS,GAAIP,OAAO,IAAIA,OAAO,CAACQ,KAAK,IAAIR,OAAO,CAACQ,KAAK,CAACD,SAAS,IAAK,CAAC;EAC5E,OAAOA,SAAS,KAAK,CAAC,GAClB,MAAME,qBAAqB,CAACV,MAAM,EAAEQ,SAAS,EAAEP,OAAO,EAAEM,UAAU,CAAC,GACnEX,WAAW,CAACI,MAAM,EAAEC,OAAO,EAAEM,UAAU,CAAC;AAC9C;AAEA,eAAeG,qBAAqBA,CAACV,MAAM,EAAEQ,SAAS,EAAEP,OAAO,EAAEM,UAAU,EAAE;EAC3E,MAAMI,IAAc,GAAG,EAAE;EAGzB,IAAIH,SAAS,KAAK,MAAM,EAAE;IACxB,MAAMI,GAAG,GAAGhB,WAAW,CAACI,MAAM,EAAEC,OAAO,EAAE;MAAC,GAAGM,UAAU;MAAEM,GAAG,EAAE;IAAC,CAAC,CAAC;IACjE,MAAMJ,KAAK,GAAG,MAAMX,WAAW,CAACc,GAAG,EAAElB,UAAU,EAAEO,OAAO,CAAC;IAEzD,MAAM;MAACa,KAAK;MAAEC;IAAM,CAAC,GAAGpB,YAAY,CAACc,KAAK,CAAC;IAC3CD,SAAS,GAAGQ,YAAY,CAAC;MAACF,KAAK;MAAEC;IAAM,CAAC,CAAC;IAGzCJ,IAAI,CAACM,IAAI,CAACL,GAAG,CAAC;EAChB;EAGAnB,MAAM,CAACe,SAAS,GAAG,CAAC,CAAC;EAErB,KAAK,IAAIU,QAAQ,GAAGP,IAAI,CAACR,MAAM,EAAEe,QAAQ,GAAGV,SAAS,EAAE,EAAEU,QAAQ,EAAE;IACjE,MAAMN,GAAG,GAAGhB,WAAW,CAACI,MAAM,EAAEC,OAAO,EAAE;MAAC,GAAGM,UAAU;MAAEM,GAAG,EAAEK;IAAQ,CAAC,CAAC;IACxEP,IAAI,CAACM,IAAI,CAACL,GAAG,CAAC;EAChB;EAEA,OAAOD,IAAI;AACb;AAGA,OAAO,SAASK,YAAYA,CAAAG,IAAA,EAAkB;EAAA,IAAjB;IAACL,KAAK;IAAEC;EAAM,CAAC,GAAAI,IAAA;EAC1C,OAAO,CAAC,GAAGC,IAAI,CAACC,KAAK,CAACD,IAAI,CAACE,IAAI,CAACF,IAAI,CAACG,GAAG,CAACT,KAAK,EAAEC,MAAM,CAAC,CAAC,CAAC;AAC3D"}

package/src/lib/texture-api/async-deep-map.ts

@@ -1,62 +0,0 @@
-/*
-Asynchronously maps a deep structure of values (e.g. objects and arrays of urls).
-
-E.g. a mipmapped cubemap
-{
-  [CUBE_FACE_FRONT]: [
-    "image-front-0.jpg",
-    "image-front-1.jpg",
-    "image-front-2.jpg",
-  ],
-  [CUBE_MAP_BACK]: [
-    ...
-  ]
-}
-*/
-
-const isObject = (value) => value && typeof value === 'object';
-
-// Loads a deep structure of urls (objects and arrays of urls)
-// Returns an object with six key-value pairs containing the images (or image mip arrays)
-// for each cube face
-export async function asyncDeepMap(tree, func, options = {}) {
-  return await mapSubtree(tree, func, options);
-}
-
-export async function mapSubtree(object, func, options) {
-  if (Array.isArray(object)) {
-    return await mapArray(object, func, options);
-  }
-
-  if (isObject(object)) {
-    return await mapObject(object, func, options);
-  }
-
-  // TODO - ignore non-urls, non-arraybuffers?
-  const url = object;
-  return await func(url, options);
-}
-
-// HELPERS
-
-async function mapObject(object, func, options) {
-  const promises: Promise<any>[] = [];
-  const values = {};
-
-  for (const key in object) {
-    const url = object[key];
-    const promise = mapSubtree(url, func, options).then((value) => {
-      values[key] = value;
-    });
-    promises.push(promise);
-  }
-
-  await Promise.all(promises);
-
-  return values;
-}
-
-async function mapArray(urlArray, func, options = {}) {
-  const promises = urlArray.map((url) => mapSubtree(url, func, options));
-  return await Promise.all(promises);
-}

package/src/lib/texture-api/deep-load.ts

@@ -1,11 +0,0 @@
-import {asyncDeepMap} from './async-deep-map';
-
-export async function deepLoad(urlTree, load, options) {
-  return await asyncDeepMap(urlTree, (url) => shallowLoad(url, load, options));
-}
-
-export async function shallowLoad(url, load, options) {
-  const response = await fetch(url, options.fetch);
-  const arrayBuffer = await response.arrayBuffer();
-  return await load(arrayBuffer, options);
-}

package/src/lib/texture-api/generate-url.ts

@@ -1,19 +0,0 @@
-import {resolvePath, assert} from '@loaders.gl/loader-utils';
-
-// Generate a url by calling getUrl with mix of options, applying options.baseUrl
-export function generateUrl(getUrl, options, urlOptions) {
-  // Get url
-  let url = getUrl;
-  if (typeof getUrl === 'function') {
-    url = getUrl({...options, ...urlOptions});
-  }
-  assert(typeof url === 'string');
-
-  // Apply options.baseUrl
-  const {baseUrl} = options;
-  if (baseUrl) {
-    url = baseUrl[baseUrl.length - 1] === '/' ? `${baseUrl}${url}` : `${baseUrl}/${url}`;
-  }
-
-  return resolvePath(url);
-}

package/src/lib/texture-api/load-image.ts

@@ -1,48 +0,0 @@
-import {assert} from '@loaders.gl/loader-utils';
-import {parseImage} from '../parsers/parse-image';
-import {getImageSize} from '../category-api/parsed-image-api';
-import {generateUrl} from './generate-url';
-import {deepLoad, shallowLoad} from './deep-load';
-
-export async function loadImage(getUrl, options = {}) {
-  const imageUrls = await getImageUrls(getUrl, options);
-  return await deepLoad(imageUrls, parseImage, options);
-}
-
-export async function getImageUrls(getUrl, options, urlOptions = {}) {
-  const mipLevels = (options && options.image && options.image.mipLevels) || 0;
-  return mipLevels !== 0
-    ? await getMipmappedImageUrls(getUrl, mipLevels, options, urlOptions)
-    : generateUrl(getUrl, options, urlOptions);
-}
-
-async function getMipmappedImageUrls(getUrl, mipLevels, options, urlOptions) {
-  const urls: string[] = [];
-
-  // If no mip levels supplied, we need to load the level 0 image and calculate based on size
-  if (mipLevels === 'auto') {
-    const url = generateUrl(getUrl, options, {...urlOptions, lod: 0});
-    const image = await shallowLoad(url, parseImage, options);
-
-    const {width, height} = getImageSize(image);
-    mipLevels = getMipLevels({width, height});
-
-    // TODO - push image and make `deepLoad` pass through non-url values, avoid loading twice?
-    urls.push(url);
-  }
-
-  // We now know how many mipLevels we need, remaining image urls can now be constructed
-  assert(mipLevels > 0);
-
-  for (let mipLevel = urls.length; mipLevel < mipLevels; ++mipLevel) {
-    const url = generateUrl(getUrl, options, {...urlOptions, lod: mipLevel});
-    urls.push(url);
-  }
-
-  return urls;
-}
-
-// Calculates number of mipmaps based on texture size (log2)
-export function getMipLevels({width, height}) {
-  return 1 + Math.floor(Math.log2(Math.max(width, height)));
-}