@loaders.gl/core 3.4.0-alpha.3 → 3.4.0-alpha.5

package/dist/esm/lib/utils/resource-utils.js

@@ -1,38 +1,44 @@
 import { isResponse, isBlob } from '../../javascript-utils/is-type';
 import { parseMIMEType, parseMIMETypeFromURL } from './mime-type-utils';
-const QUERY_STRING_PATTERN = /\?.*/;
-export function getResourceUrlAndType(resource) {
+import { stripQueryString } from './url-utils';
+export function getResourceUrl(resource) {
   if (isResponse(resource)) {
-    const url = stripQueryString(resource.url || '');
-    const contentTypeHeader = resource.headers.get('content-type') || '';
-    return {
-      url,
-      type: parseMIMEType(contentTypeHeader) || parseMIMETypeFromURL(url)
-    };
+    const response = resource;
+    return response.url;
   }
   if (isBlob(resource)) {
-    return {
-      url: stripQueryString(resource.name || ''),
-      type: resource.type || ''
-    };
+    const blob = resource;
+    return blob.name || '';
   }
   if (typeof resource === 'string') {
-    return {
-      url: stripQueryString(resource),
-      type: parseMIMETypeFromURL(resource)
-    };
-  }
-  return {
-    url: '',
-    type: ''
-  };
+    return resource;
+  }
+  return '';
+}
+export function getResourceMIMEType(resource) {
+  if (isResponse(resource)) {
+    const response = resource;
+    const contentTypeHeader = response.headers.get('content-type') || '';
+    const noQueryUrl = stripQueryString(response.url);
+    return parseMIMEType(contentTypeHeader) || parseMIMETypeFromURL(noQueryUrl);
+  }
+  if (isBlob(resource)) {
+    const blob = resource;
+    return blob.type || '';
+  }
+  if (typeof resource === 'string') {
+    return parseMIMETypeFromURL(resource);
+  }
+  return '';
 }
 export function getResourceContentLength(resource) {
   if (isResponse(resource)) {
-    return resource.headers['content-length'] || -1;
+    const response = resource;
+    return response.headers['content-length'] || -1;
   }
   if (isBlob(resource)) {
-    return resource.size;
+    const blob = resource;
+    return blob.size;
   }
   if (typeof resource === 'string') {
     return resource.length;
@@ -45,7 +51,4 @@ export function getResourceContentLength(resource) {
   }
   return -1;
 }
-function stripQueryString(url) {
-  return url.replace(QUERY_STRING_PATTERN, '');
-}
 //# sourceMappingURL=resource-utils.js.map

package/dist/esm/lib/utils/resource-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"resource-utils.js","names":["isResponse","isBlob","parseMIMEType","parseMIMETypeFromURL","QUERY_STRING_PATTERN","getResourceUrlAndType","resource","url","stripQueryString","contentTypeHeader","headers","get","type","name","getResourceContentLength","size","length","ArrayBuffer","byteLength","isView","replace"],"sources":["../../../../src/lib/utils/resource-utils.ts"],"sourcesContent":["import {isResponse, isBlob} from '../../javascript-utils/is-type';\nimport {parseMIMEType, parseMIMETypeFromURL} from './mime-type-utils';\n\nconst QUERY_STRING_PATTERN = /\\?.*/;\n\n/**\n * Returns an object with `url` and (MIME) `type` fields\n * If it cannot determine url or type, the corresponding value will be an empty string\n *\n * @param resource Any type, but only Responses, string URLs and data URLs are processed\n *\n * @todo string parameters are assumed to be URLs\n */\nexport function getResourceUrlAndType(resource: any): {url: string; type: string} {\n  // If resource is a response, it contains the information directly\n  if (isResponse(resource)) {\n    const url = stripQueryString(resource.url || '');\n    const contentTypeHeader = resource.headers.get('content-type') || '';\n    return {\n      url,\n      type: parseMIMEType(contentTypeHeader) || parseMIMETypeFromURL(url)\n    };\n  }\n\n  // If the resource is a Blob or a File (subclass of Blob)\n  if (isBlob(resource)) {\n    return {\n      // File objects have a \"name\" property. Blob objects don't have any\n      // url (name) information\n      url: stripQueryString(resource.name || ''),\n      type: resource.type || ''\n    };\n  }\n\n  if (typeof resource === 'string') {\n    return {\n      // TODO this could mess up data URL but it doesn't matter as it is just used for inference\n      url: stripQueryString(resource),\n      // If a data url\n      type: parseMIMETypeFromURL(resource)\n    };\n  }\n\n  // Unknown\n  return {\n    url: '',\n    type: ''\n  };\n}\n\n/**\n  * Returns (approximate) content length for a resource if it can be determined.\n  * Returns -1 if content length cannot be determined.\n  * @param resource\n\n  * @note string parameters are NOT assumed to be URLs\n  */\nexport function getResourceContentLength(resource: any): number {\n  if (isResponse(resource)) {\n    return resource.headers['content-length'] || -1;\n  }\n  if (isBlob(resource)) {\n    return resource.size;\n  }\n  if (typeof resource === 'string') {\n    // TODO - handle data URL?\n    return resource.length;\n  }\n  if (resource instanceof ArrayBuffer) {\n    return resource.byteLength;\n  }\n  if (ArrayBuffer.isView(resource)) {\n    return resource.byteLength;\n  }\n  return -1;\n}\n\nfunction stripQueryString(url) {\n  return url.replace(QUERY_STRING_PATTERN, '');\n}\n"],"mappings":"AAAA,SAAQA,UAAU,EAAEC,MAAM,QAAO,gCAAgC;AACjE,SAAQC,aAAa,EAAEC,oBAAoB,QAAO,mBAAmB;AAErE,MAAMC,oBAAoB,GAAG,MAAM;AAUnC,OAAO,SAASC,qBAAqBA,CAACC,QAAa,EAA+B;EAEhF,IAAIN,UAAU,CAACM,QAAQ,CAAC,EAAE;IACxB,MAAMC,GAAG,GAAGC,gBAAgB,CAACF,QAAQ,CAACC,GAAG,IAAI,EAAE,CAAC;IAChD,MAAME,iBAAiB,GAAGH,QAAQ,CAACI,OAAO,CAACC,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE;IACpE,OAAO;MACLJ,GAAG;MACHK,IAAI,EAAEV,aAAa,CAACO,iBAAiB,CAAC,IAAIN,oBAAoB,CAACI,GAAG;IACpE,CAAC;EACH;EAGA,IAAIN,MAAM,CAACK,QAAQ,CAAC,EAAE;IACpB,OAAO;MAGLC,GAAG,EAAEC,gBAAgB,CAACF,QAAQ,CAACO,IAAI,IAAI,EAAE,CAAC;MAC1CD,IAAI,EAAEN,QAAQ,CAACM,IAAI,IAAI;IACzB,CAAC;EACH;EAEA,IAAI,OAAON,QAAQ,KAAK,QAAQ,EAAE;IAChC,OAAO;MAELC,GAAG,EAAEC,gBAAgB,CAACF,QAAQ,CAAC;MAE/BM,IAAI,EAAET,oBAAoB,CAACG,QAAQ;IACrC,CAAC;EACH;EAGA,OAAO;IACLC,GAAG,EAAE,EAAE;IACPK,IAAI,EAAE;EACR,CAAC;AACH;AASA,OAAO,SAASE,wBAAwBA,CAACR,QAAa,EAAU;EAC9D,IAAIN,UAAU,CAACM,QAAQ,CAAC,EAAE;IACxB,OAAOA,QAAQ,CAACI,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;EACjD;EACA,IAAIT,MAAM,CAACK,QAAQ,CAAC,EAAE;IACpB,OAAOA,QAAQ,CAACS,IAAI;EACtB;EACA,IAAI,OAAOT,QAAQ,KAAK,QAAQ,EAAE;IAEhC,OAAOA,QAAQ,CAACU,MAAM;EACxB;EACA,IAAIV,QAAQ,YAAYW,WAAW,EAAE;IACnC,OAAOX,QAAQ,CAACY,UAAU;EAC5B;EACA,IAAID,WAAW,CAACE,MAAM,CAACb,QAAQ,CAAC,EAAE;IAChC,OAAOA,QAAQ,CAACY,UAAU;EAC5B;EACA,OAAO,CAAC,CAAC;AACX;AAEA,SAASV,gBAAgBA,CAACD,GAAG,EAAE;EAC7B,OAAOA,GAAG,CAACa,OAAO,CAAChB,oBAAoB,EAAE,EAAE,CAAC;AAC9C"}
+{"version":3,"file":"resource-utils.js","names":["isResponse","isBlob","parseMIMEType","parseMIMETypeFromURL","stripQueryString","getResourceUrl","resource","response","url","blob","name","getResourceMIMEType","contentTypeHeader","headers","get","noQueryUrl","type","getResourceContentLength","size","length","ArrayBuffer","byteLength","isView"],"sources":["../../../../src/lib/utils/resource-utils.ts"],"sourcesContent":["// loaders.gl, MIT license\n\nimport {isResponse, isBlob} from '../../javascript-utils/is-type';\nimport {parseMIMEType, parseMIMETypeFromURL} from './mime-type-utils';\nimport {stripQueryString} from './url-utils';\n\n/**\n * A loadable resource. Includes:\n * `Response`, `Blob` (`File` is a subclass), string URLs and data URLs\n */\nexport type Resource = Response | Blob | string;\n\n/**\n * Returns the URL associated with this resource.\n * The returned value may include a query string and need further processing.\n * If it cannot determine url, the corresponding value will be an empty string\n *\n * @todo string parameters are assumed to be URLs\n */\nexport function getResourceUrl(resource: unknown): string {\n  // If resource is a `Response`, it contains the information directly as a field\n  if (isResponse(resource)) {\n    const response = resource as Response;\n    return response.url;\n  }\n\n  // If the resource is a Blob or a File (subclass of Blob)\n  if (isBlob(resource)) {\n    const blob = resource as Blob;\n    // File objects have a \"name\" property. Blob objects don't have any\n    // url (name) information\n    return blob.name || '';\n  }\n\n  if (typeof resource === 'string') {\n    return resource;\n  }\n\n  // Unknown\n  return '';\n}\n\n/**\n * Returns the URL associated with this resource.\n * The returned value may include a query string and need further processing.\n * If it cannot determine url, the corresponding value will be an empty string\n *\n * @todo string parameters are assumed to be URLs\n */\nexport function getResourceMIMEType(resource: unknown): string {\n  // If resource is a response, it contains the information directly\n  if (isResponse(resource)) {\n    const response = resource as Response;\n    const contentTypeHeader = response.headers.get('content-type') || '';\n    const noQueryUrl = stripQueryString(response.url);\n    return parseMIMEType(contentTypeHeader) || parseMIMETypeFromURL(noQueryUrl);\n  }\n\n  // If the resource is a Blob or a File (subclass of Blob)\n  if (isBlob(resource)) {\n    const blob = resource as Blob;\n    return blob.type || '';\n  }\n\n  if (typeof resource === 'string') {\n    return parseMIMETypeFromURL(resource);\n  }\n\n  // Unknown\n  return '';\n}\n\n/**\n  * Returns (approximate) content length for a resource if it can be determined.\n  * Returns -1 if content length cannot be determined.\n  * @param resource\n\n  * @note string parameters are NOT assumed to be URLs\n  */\nexport function getResourceContentLength(resource: unknown): number {\n  if (isResponse(resource)) {\n    const response = resource as Response;\n    return response.headers['content-length'] || -1;\n  }\n  if (isBlob(resource)) {\n    const blob = resource as Blob;\n    return blob.size;\n  }\n  if (typeof resource === 'string') {\n    // TODO - handle data URL?\n    return resource.length;\n  }\n  if (resource instanceof ArrayBuffer) {\n    return resource.byteLength;\n  }\n  if (ArrayBuffer.isView(resource)) {\n    return resource.byteLength;\n  }\n  return -1;\n}\n"],"mappings":"AAEA,SAAQA,UAAU,EAAEC,MAAM,QAAO,gCAAgC;AACjE,SAAQC,aAAa,EAAEC,oBAAoB,QAAO,mBAAmB;AACrE,SAAQC,gBAAgB,QAAO,aAAa;AAe5C,OAAO,SAASC,cAAcA,CAACC,QAAiB,EAAU;EAExD,IAAIN,UAAU,CAACM,QAAQ,CAAC,EAAE;IACxB,MAAMC,QAAQ,GAAGD,QAAoB;IACrC,OAAOC,QAAQ,CAACC,GAAG;EACrB;EAGA,IAAIP,MAAM,CAACK,QAAQ,CAAC,EAAE;IACpB,MAAMG,IAAI,GAAGH,QAAgB;IAG7B,OAAOG,IAAI,CAACC,IAAI,IAAI,EAAE;EACxB;EAEA,IAAI,OAAOJ,QAAQ,KAAK,QAAQ,EAAE;IAChC,OAAOA,QAAQ;EACjB;EAGA,OAAO,EAAE;AACX;AASA,OAAO,SAASK,mBAAmBA,CAACL,QAAiB,EAAU;EAE7D,IAAIN,UAAU,CAACM,QAAQ,CAAC,EAAE;IACxB,MAAMC,QAAQ,GAAGD,QAAoB;IACrC,MAAMM,iBAAiB,GAAGL,QAAQ,CAACM,OAAO,CAACC,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE;IACpE,MAAMC,UAAU,GAAGX,gBAAgB,CAACG,QAAQ,CAACC,GAAG,CAAC;IACjD,OAAON,aAAa,CAACU,iBAAiB,CAAC,IAAIT,oBAAoB,CAACY,UAAU,CAAC;EAC7E;EAGA,IAAId,MAAM,CAACK,QAAQ,CAAC,EAAE;IACpB,MAAMG,IAAI,GAAGH,QAAgB;IAC7B,OAAOG,IAAI,CAACO,IAAI,IAAI,EAAE;EACxB;EAEA,IAAI,OAAOV,QAAQ,KAAK,QAAQ,EAAE;IAChC,OAAOH,oBAAoB,CAACG,QAAQ,CAAC;EACvC;EAGA,OAAO,EAAE;AACX;AASA,OAAO,SAASW,wBAAwBA,CAACX,QAAiB,EAAU;EAClE,IAAIN,UAAU,CAACM,QAAQ,CAAC,EAAE;IACxB,MAAMC,QAAQ,GAAGD,QAAoB;IACrC,OAAOC,QAAQ,CAACM,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;EACjD;EACA,IAAIZ,MAAM,CAACK,QAAQ,CAAC,EAAE;IACpB,MAAMG,IAAI,GAAGH,QAAgB;IAC7B,OAAOG,IAAI,CAACS,IAAI;EAClB;EACA,IAAI,OAAOZ,QAAQ,KAAK,QAAQ,EAAE;IAEhC,OAAOA,QAAQ,CAACa,MAAM;EACxB;EACA,IAAIb,QAAQ,YAAYc,WAAW,EAAE;IACnC,OAAOd,QAAQ,CAACe,UAAU;EAC5B;EACA,IAAID,WAAW,CAACE,MAAM,CAAChB,QAAQ,CAAC,EAAE;IAChC,OAAOA,QAAQ,CAACe,UAAU;EAC5B;EACA,OAAO,CAAC,CAAC;AACX"}

package/dist/esm/lib/utils/response-utils.js

@@ -1,5 +1,5 @@
 import { isResponse } from '../../javascript-utils/is-type';
-import { getResourceContentLength, getResourceUrlAndType } from './resource-utils';
+import { getResourceContentLength, getResourceUrl, getResourceMIMEType } from './resource-utils';
 export async function makeResponse(resource) {
   if (isResponse(resource)) {
     return resource;
@@ -9,10 +9,8 @@ export async function makeResponse(resource) {
   if (contentLength >= 0) {
     headers['content-length'] = String(contentLength);
   }
-  const {
-    url,
-    type
-  } = getResourceUrlAndType(resource);
+  const url = getResourceUrl(resource);
+  const type = getResourceMIMEType(resource);
   if (type) {
     headers['content-type'] = type;
   }

package/dist/esm/lib/utils/response-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"response-utils.js","names":["isResponse","getResourceContentLength","getResourceUrlAndType","makeResponse","resource","headers","contentLength","String","url","type","initialDataUrl","getInitialDataUrl","TextEncoder","encode","response","Response","Object","defineProperty","value","checkResponse","ok","message","getResponseError","Error","checkResponseSync","concat","status","statusText","length","slice","contentType","get","text","includes","error","INITIAL_DATA_LENGTH","Blob","blobSlice","Promise","resolve","reader","FileReader","onload","event","_event$target","target","result","readAsDataURL","ArrayBuffer","base64","arrayBufferToBase64","buffer","binary","bytes","Uint8Array","i","byteLength","fromCharCode","btoa"],"sources":["../../../../src/lib/utils/response-utils.ts"],"sourcesContent":["import {isResponse} from '../../javascript-utils/is-type';\nimport {getResourceContentLength, getResourceUrlAndType} from './resource-utils';\n\n/**\n * Returns a Response object\n * Adds content-length header when possible\n *\n * @param resource\n */\nexport async function makeResponse(resource: any): Promise<Response> {\n  if (isResponse(resource)) {\n    return resource;\n  }\n\n  // Add content-length header if possible\n  const headers: {[header: string]: string} = {};\n\n  const contentLength = getResourceContentLength(resource);\n  if (contentLength >= 0) {\n    headers['content-length'] = String(contentLength);\n  }\n\n  // `new Response(File)` does not preserve content-type and URL\n  // so we add them here\n  const {url, type} = getResourceUrlAndType(resource);\n  if (type) {\n    headers['content-type'] = type;\n  }\n\n  // Add a custom header with initial bytes if available\n  const initialDataUrl = await getInitialDataUrl(resource);\n  if (initialDataUrl) {\n    headers['x-first-bytes'] = initialDataUrl;\n  }\n\n  // TODO - is this the best way of handling strings?\n  // Maybe package as data URL instead?\n  if (typeof resource === 'string') {\n    // Convert to ArrayBuffer to avoid Response treating it as a URL\n    resource = new TextEncoder().encode(resource);\n  }\n\n  // Attempt to create a Response from the resource, adding headers and setting url\n  const response = new Response(resource, {headers});\n  // We can't control `Response.url` via constructor, use a property override to record URL.\n  Object.defineProperty(response, 'url', {value: url});\n  return response;\n}\n\n/**\n * Checks response status (async) and throws a helpful error message if status is not OK.\n * @param response\n */\nexport async function checkResponse(response: Response): Promise<void> {\n  if (!response.ok) {\n    const message = await getResponseError(response);\n    throw new Error(message);\n  }\n}\n\n/**\n * Checks response status (sync) and throws a helpful error message if status is not OK.\n * @param response\n */\nexport function checkResponseSync(response: Response): void {\n  if (!response.ok) {\n    let message = `${response.status} ${response.statusText}`;\n    message = message.length > 60 ? `${message.slice(0, 60)}...` : message;\n    throw new Error(message);\n  }\n}\n\n// HELPERS\n\nasync function getResponseError(response): Promise<string> {\n  let message = `Failed to fetch resource ${response.url} (${response.status}): `;\n  try {\n    const contentType = response.headers.get('Content-Type');\n    let text = response.statusText;\n    if (contentType.includes('application/json')) {\n      text += ` ${await response.text()}`;\n    }\n    message += text;\n    message = message.length > 60 ? `${message.slice(0, 60)}...` : message;\n  } catch (error) {\n    // eslint forbids return in a finally statement, so we just catch here\n  }\n  return message;\n}\n\nasync function getInitialDataUrl(resource): Promise<string | null> {\n  const INITIAL_DATA_LENGTH = 5;\n  if (typeof resource === 'string') {\n    return `data:,${resource.slice(0, INITIAL_DATA_LENGTH)}`;\n  }\n  if (resource instanceof Blob) {\n    const blobSlice = resource.slice(0, 5);\n    return await new Promise((resolve) => {\n      const reader = new FileReader();\n      reader.onload = (event) => resolve(event?.target?.result as string);\n      reader.readAsDataURL(blobSlice);\n    });\n  }\n  if (resource instanceof ArrayBuffer) {\n    const slice = resource.slice(0, INITIAL_DATA_LENGTH);\n    const base64 = arrayBufferToBase64(slice);\n    return `data:base64,${base64}`;\n  }\n  return null;\n}\n\n// https://stackoverflow.com/questions/9267899/arraybuffer-to-base64-encoded-string\nfunction arrayBufferToBase64(buffer) {\n  let binary = '';\n  const bytes = new Uint8Array(buffer);\n  for (let i = 0; i < bytes.byteLength; i++) {\n    binary += String.fromCharCode(bytes[i]);\n  }\n  return btoa(binary);\n}\n"],"mappings":"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"}
+{"version":3,"file":"response-utils.js","names":["isResponse","getResourceContentLength","getResourceUrl","getResourceMIMEType","makeResponse","resource","headers","contentLength","String","url","type","initialDataUrl","getInitialDataUrl","TextEncoder","encode","response","Response","Object","defineProperty","value","checkResponse","ok","message","getResponseError","Error","checkResponseSync","concat","status","statusText","length","slice","contentType","get","text","includes","error","INITIAL_DATA_LENGTH","Blob","blobSlice","Promise","resolve","reader","FileReader","onload","event","_event$target","target","result","readAsDataURL","ArrayBuffer","base64","arrayBufferToBase64","buffer","binary","bytes","Uint8Array","i","byteLength","fromCharCode","btoa"],"sources":["../../../../src/lib/utils/response-utils.ts"],"sourcesContent":["import {isResponse} from '../../javascript-utils/is-type';\nimport {getResourceContentLength, getResourceUrl, getResourceMIMEType} from './resource-utils';\n\n/**\n * Returns a Response object\n * Adds content-length header when possible\n *\n * @param resource\n */\nexport async function makeResponse(resource: any): Promise<Response> {\n  if (isResponse(resource)) {\n    return resource;\n  }\n\n  // Add content-length header if possible\n  const headers: {[header: string]: string} = {};\n\n  const contentLength = getResourceContentLength(resource);\n  if (contentLength >= 0) {\n    headers['content-length'] = String(contentLength);\n  }\n\n  // `new Response(File)` does not preserve content-type and URL\n  // so we add them here\n  const url = getResourceUrl(resource);\n  const type = getResourceMIMEType(resource);\n  if (type) {\n    headers['content-type'] = type;\n  }\n\n  // Add a custom header with initial bytes if available\n  const initialDataUrl = await getInitialDataUrl(resource);\n  if (initialDataUrl) {\n    headers['x-first-bytes'] = initialDataUrl;\n  }\n\n  // TODO - is this the best way of handling strings?\n  // Maybe package as data URL instead?\n  if (typeof resource === 'string') {\n    // Convert to ArrayBuffer to avoid Response treating it as a URL\n    resource = new TextEncoder().encode(resource);\n  }\n\n  // Attempt to create a Response from the resource, adding headers and setting url\n  const response = new Response(resource, {headers});\n  // We can't control `Response.url` via constructor, use a property override to record URL.\n  Object.defineProperty(response, 'url', {value: url});\n  return response;\n}\n\n/**\n * Checks response status (async) and throws a helpful error message if status is not OK.\n * @param response\n */\nexport async function checkResponse(response: Response): Promise<void> {\n  if (!response.ok) {\n    const message = await getResponseError(response);\n    throw new Error(message);\n  }\n}\n\n/**\n * Checks response status (sync) and throws a helpful error message if status is not OK.\n * @param response\n */\nexport function checkResponseSync(response: Response): void {\n  if (!response.ok) {\n    let message = `${response.status} ${response.statusText}`;\n    message = message.length > 60 ? `${message.slice(0, 60)}...` : message;\n    throw new Error(message);\n  }\n}\n\n// HELPERS\n\nasync function getResponseError(response): Promise<string> {\n  let message = `Failed to fetch resource ${response.url} (${response.status}): `;\n  try {\n    const contentType = response.headers.get('Content-Type');\n    let text = response.statusText;\n    if (contentType.includes('application/json')) {\n      text += ` ${await response.text()}`;\n    }\n    message += text;\n    message = message.length > 60 ? `${message.slice(0, 60)}...` : message;\n  } catch (error) {\n    // eslint forbids return in a finally statement, so we just catch here\n  }\n  return message;\n}\n\nasync function getInitialDataUrl(resource): Promise<string | null> {\n  const INITIAL_DATA_LENGTH = 5;\n  if (typeof resource === 'string') {\n    return `data:,${resource.slice(0, INITIAL_DATA_LENGTH)}`;\n  }\n  if (resource instanceof Blob) {\n    const blobSlice = resource.slice(0, 5);\n    return await new Promise((resolve) => {\n      const reader = new FileReader();\n      reader.onload = (event) => resolve(event?.target?.result as string);\n      reader.readAsDataURL(blobSlice);\n    });\n  }\n  if (resource instanceof ArrayBuffer) {\n    const slice = resource.slice(0, INITIAL_DATA_LENGTH);\n    const base64 = arrayBufferToBase64(slice);\n    return `data:base64,${base64}`;\n  }\n  return null;\n}\n\n// https://stackoverflow.com/questions/9267899/arraybuffer-to-base64-encoded-string\nfunction arrayBufferToBase64(buffer) {\n  let binary = '';\n  const bytes = new Uint8Array(buffer);\n  for (let i = 0; i < bytes.byteLength; i++) {\n    binary += String.fromCharCode(bytes[i]);\n  }\n  return btoa(binary);\n}\n"],"mappings":"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"}

package/dist/esm/lib/utils/url-utils.js

@@ -0,0 +1,9 @@
+const QUERY_STRING_PATTERN = /\?.*/;
+export function extractQueryString(url) {
+  const matches = url.match(QUERY_STRING_PATTERN);
+  return matches && matches[0];
+}
+export function stripQueryString(url) {
+  return url.replace(QUERY_STRING_PATTERN, '');
+}
+//# sourceMappingURL=url-utils.js.map

package/dist/esm/lib/utils/url-utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"url-utils.js","names":["QUERY_STRING_PATTERN","extractQueryString","url","matches","match","stripQueryString","replace"],"sources":["../../../../src/lib/utils/url-utils.ts"],"sourcesContent":["// loaders.gl, MIT license\n\nconst QUERY_STRING_PATTERN = /\\?.*/;\n\nexport function extractQueryString(url): string {\n  const matches = url.match(QUERY_STRING_PATTERN);\n  return matches && matches[0];\n}\n\nexport function stripQueryString(url): string {\n  return url.replace(QUERY_STRING_PATTERN, '');\n}\n"],"mappings":"AAEA,MAAMA,oBAAoB,GAAG,MAAM;AAEnC,OAAO,SAASC,kBAAkBA,CAACC,GAAG,EAAU;EAC9C,MAAMC,OAAO,GAAGD,GAAG,CAACE,KAAK,CAACJ,oBAAoB,CAAC;EAC/C,OAAOG,OAAO,IAAIA,OAAO,CAAC,CAAC,CAAC;AAC9B;AAEA,OAAO,SAASE,gBAAgBA,CAACH,GAAG,EAAU;EAC5C,OAAOA,GAAG,CAACI,OAAO,CAACN,oBAAoB,EAAE,EAAE,CAAC;AAC9C"}

package/dist/esm/null-loader.js

@@ -1,4 +1,4 @@
-const VERSION = typeof "3.4.0-alpha.3" !== 'undefined' ? "3.4.0-alpha.3" : 'latest';
+const VERSION = typeof "3.4.0-alpha.5" !== 'undefined' ? "3.4.0-alpha.5" : 'latest';
 export const NullWorkerLoader = {
   name: 'Null loader',
   id: 'null',

package/dist/lib/api/parse-in-batches.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse-in-batches.d.ts","sourceRoot":"","sources":["../../../src/lib/api/parse-in-batches.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,iBAAiB,EACjB,MAAM,EAEN,aAAa,EACb,aAAa,EACd,MAAM,0BAA0B,CAAC;AAYlC;;;;;;GAMG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,iBAAiB,EACvB,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,aAAa,EAC3C,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAqC7B"}
+{"version":3,"file":"parse-in-batches.d.ts","sourceRoot":"","sources":["../../../src/lib/api/parse-in-batches.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,iBAAiB,EACjB,MAAM,EAEN,aAAa,EACb,aAAa,EACd,MAAM,0BAA0B,CAAC;AAYlC;;;;;;GAMG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,iBAAiB,EACvB,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,aAAa,EAC3C,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAoC7B"}

package/dist/lib/api/parse-in-batches.js

@@ -19,6 +19,7 @@ const parse_1 = require("./parse");
  */
 async function parseInBatches(data, loaders, options, context) {
     (0, loader_utils_1.assert)(!context || typeof context === 'object'); // parseInBatches no longer accepts final url
+    const loaderArray = Array.isArray(loaders) ? loaders : undefined;
     // Signature: parseInBatches(data, options, url) - Uses registered loaders
     if (!Array.isArray(loaders) && !(0, normalize_loader_1.isLoaderObject)(loaders)) {
         context = undefined; // context not supported in short signature
@@ -28,7 +29,7 @@ async function parseInBatches(data, loaders, options, context) {
     data = await data; // Resolve any promise
     options = options || {};
     // Extract a url for auto detection
-    const { url } = (0, resource_utils_1.getResourceUrlAndType)(data);
+    const url = (0, resource_utils_1.getResourceUrl)(data);
     // Chooses a loader and normalizes it
     // Note - only uses URL and contentType for streams and iterator inputs
     const loader = await (0, select_loader_1.selectLoader)(data, loaders, options);
@@ -38,12 +39,8 @@ async function parseInBatches(data, loaders, options, context) {
         return null;
     }
     // Normalize options
-    // @ts-ignore
-    options = (0, option_utils_1.normalizeOptions)(options, loader, loaders, url);
-    // @ts-ignore
-    context = (0, loader_context_1.getLoaderContext)(
-    // @ts-ignore
-    { url, parseInBatches, parse: parse_1.parse, loaders: loaders }, options, context);
+    options = (0, option_utils_1.normalizeOptions)(options, loader, loaderArray, url);
+    context = (0, loader_context_1.getLoaderContext)({ url, parseInBatches, parse: parse_1.parse, loaders: loaderArray }, options, context || null);
     return await parseWithLoaderInBatches(loader, data, options, context);
 }
 exports.parseInBatches = parseInBatches;

package/dist/lib/api/parse-sync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse-sync.d.ts","sourceRoot":"","sources":["../../../src/lib/api/parse-sync.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EACZ,MAAM,EAEN,aAAa,EACb,aAAa,EACd,MAAM,0BAA0B,CAAC;AASlC;;;;;;GAMG;AACH,wBAAgB,SAAS,CACvB,IAAI,EAAE,YAAY,EAClB,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,aAAa,EAC3C,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,GACtB,GAAG,CAmCL"}
+{"version":3,"file":"parse-sync.d.ts","sourceRoot":"","sources":["../../../src/lib/api/parse-sync.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EACZ,MAAM,EAEN,aAAa,EACb,aAAa,EACd,MAAM,0BAA0B,CAAC;AASlC;;;;;;GAMG;AACH,wBAAgB,SAAS,CACvB,IAAI,EAAE,YAAY,EAClB,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,aAAa,EAC3C,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,GACtB,GAAG,CAuCL"}

package/dist/lib/api/parse-sync.js

@@ -37,11 +37,11 @@ function parseSync(data, loaders, options, context) {
     // Normalize options
     options = (0, option_utils_1.normalizeOptions)(options, loader, candidateLoaders);
     // Extract a url for auto detection
-    const { url } = (0, resource_utils_1.getResourceUrlAndType)(data);
+    const url = (0, resource_utils_1.getResourceUrl)(data);
     const parse = () => {
-        throw new Error('parseSync called parse');
+        throw new Error('parseSync called parse (which is async');
     };
-    context = (0, loader_context_1.getLoaderContext)({ url, parseSync, parse, loaders: loaders }, options);
+    context = (0, loader_context_1.getLoaderContext)({ url, parseSync, parse, loaders: loaders }, options, context || null);
     return parseWithLoaderSync(loader, data, options, context);
 }
 exports.parseSync = parseSync;

package/dist/lib/api/parse.js

@@ -29,7 +29,7 @@ async function parse(data, loaders, options, context) {
     data = await data; // Resolve any promise
     options = options || {};
     // Extract a url for auto detection
-    const { url } = (0, resource_utils_1.getResourceUrlAndType)(data);
+    const url = (0, resource_utils_1.getResourceUrl)(data);
     // Chooses a loader (and normalizes it)
     // Also use any loaders in the context, new loaders take priority
     const typedLoaders = loaders;
@@ -43,7 +43,7 @@ async function parse(data, loaders, options, context) {
     // Normalize options
     options = (0, option_utils_1.normalizeOptions)(options, loader, candidateLoaders, url);
     // Get a context (if already present, will be unchanged)
-    context = (0, loader_context_1.getLoaderContext)({ url, parse, loaders: candidateLoaders }, options, context);
+    context = (0, loader_context_1.getLoaderContext)({ url, parse, loaders: candidateLoaders }, options, context || null);
     return await parseWithLoader(loader, data, options, context);
 }
 exports.parse = parse;

package/dist/lib/api/select-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"select-loader.d.ts","sourceRoot":"","sources":["../../../src/lib/api/select-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,aAAa,EAAE,aAAa,EAAE,MAAM,EAAC,MAAM,0BAA0B,CAAC;AAcnF;;;;;;;;GAQG;AACH,wBAAsB,YAAY,CAChC,IAAI,EAAE,QAAQ,GAAG,IAAI,GAAG,WAAW,GAAG,MAAM,EAC5C,OAAO,GAAE,MAAM,EAAE,GAAG,MAAW,EAC/B,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAwBxB;AAED;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,QAAQ,GAAG,IAAI,GAAG,WAAW,GAAG,MAAM,EAC5C,OAAO,GAAE,MAAM,EAAE,GAAG,MAAW,EAC/B,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,GACtB,MAAM,GAAG,IAAI,CAmCf"}
+{"version":3,"file":"select-loader.d.ts","sourceRoot":"","sources":["../../../src/lib/api/select-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,aAAa,EAAE,aAAa,EAAE,MAAM,EAAC,MAAM,0BAA0B,CAAC;AAenF;;;;;;;;GAQG;AACH,wBAAsB,YAAY,CAChC,IAAI,EAAE,QAAQ,GAAG,IAAI,GAAG,WAAW,GAAG,MAAM,EAC5C,OAAO,GAAE,MAAM,EAAE,GAAG,MAAW,EAC/B,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAwBxB;AAED;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,QAAQ,GAAG,IAAI,GAAG,WAAW,GAAG,MAAM,EAC5C,OAAO,GAAE,MAAM,EAAE,GAAG,MAAW,EAC/B,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,GACtB,MAAM,GAAG,IAAI,CAmCf"}

package/dist/lib/api/select-loader.js

@@ -7,6 +7,7 @@ const log_1 = require("../utils/log");
 const resource_utils_1 = require("../utils/resource-utils");
 const register_loaders_1 = require("./register-loaders");
 const is_type_1 = require("../../javascript-utils/is-type");
+const url_utils_1 = require("../utils/url-utils");
 const EXT_PATTERN = /\.([^.]+)$/;
 // TODO - Need a variant that peeks at streams for parseInBatches
 // TODO - Detect multiple matching loaders? Use heuristics to grade matches?
@@ -85,8 +86,9 @@ exports.selectLoaderSync = selectLoaderSync;
 /** Implements loaders selection logic */
 // eslint-disable-next-line complexity
 function selectLoaderInternal(data, loaders, options, context) {
-    const { url, type } = (0, resource_utils_1.getResourceUrlAndType)(data);
-    const testUrl = url || context?.url;
+    const url = (0, resource_utils_1.getResourceUrl)(data);
+    const type = (0, resource_utils_1.getResourceMIMEType)(data);
+    const testUrl = (0, url_utils_1.stripQueryString)(url) || context?.url;
     let loader = null;
     let reason = '';
     // if options.mimeType is supplied, it takes precedence
@@ -124,7 +126,8 @@ function validHTTPResponse(data) {
 }
 /** Generate a helpful message to help explain why loader selection failed. */
 function getNoValidLoaderMessage(data) {
-    const { url, type } = (0, resource_utils_1.getResourceUrlAndType)(data);
+    const url = (0, resource_utils_1.getResourceUrl)(data);
+    const type = (0, resource_utils_1.getResourceMIMEType)(data);
     let message = 'No valid loader found (';
     message += url ? `${loader_utils_1.path.filename(url)}, ` : 'no url provided, ';
     message += `MIME type: ${type ? `"${type}"` : 'not provided'}, `;

package/dist/lib/loader-utils/loader-context.d.ts

@@ -8,6 +8,6 @@ import type { Loader, LoaderOptions, LoaderContext } from '@loaders.gl/loader-ut
  * @param options
  * @param previousContext
  */
-export declare function getLoaderContext(context: Omit<LoaderContext, 'fetch'> & Partial<Pick<LoaderContext, 'fetch'>>, options?: LoaderOptions, previousContext?: LoaderContext | null): LoaderContext;
+export declare function getLoaderContext(context: Omit<LoaderContext, 'fetch'> & Partial<Pick<LoaderContext, 'fetch'>>, options: LoaderOptions, parentContext: LoaderContext | null): LoaderContext;
 export declare function getLoadersFromContext(loaders: Loader[] | Loader | undefined, context?: LoaderContext): any;
 //# sourceMappingURL=loader-context.d.ts.map

package/dist/lib/loader-utils/loader-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loader-context.d.ts","sourceRoot":"","sources":["../../../src/lib/loader-utils/loader-context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAE,aAAa,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAGnF;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC,EAC7E,OAAO,CAAC,EAAE,aAAa,EACvB,eAAe,GAAE,aAAa,GAAG,IAAW,GAC3C,aAAa,CAkBf;AAGD,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,SAAS,EACtC,OAAO,CAAC,EAAE,aAAa,OAkBxB"}
+{"version":3,"file":"loader-context.d.ts","sourceRoot":"","sources":["../../../src/lib/loader-utils/loader-context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAE,aAAa,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAKnF;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC,EAC7E,OAAO,EAAE,aAAa,EACtB,aAAa,EAAE,aAAa,GAAG,IAAI,GAClC,aAAa,CA2Bf;AAGD,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,SAAS,EACtC,OAAO,CAAC,EAAE,aAAa,OAkBxB"}

package/dist/lib/loader-utils/loader-context.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLoadersFromContext = exports.getLoaderContext = void 0;
 const get_fetch_function_1 = require("./get-fetch-function");
+const url_utils_1 = require("../utils/url-utils");
+const loader_utils_1 = require("@loaders.gl/loader-utils");
 /**
  * "sub" loaders invoked by other loaders get a "context" injected on `this`
  * The context will inject core methods like `parse` and contain information
@@ -11,21 +13,29 @@ const get_fetch_function_1 = require("./get-fetch-function");
  * @param options
  * @param previousContext
  */
-function getLoaderContext(context, options, previousContext = null) {
+function getLoaderContext(context, options, parentContext) {
     // For recursive calls, we already have a context
     // TODO - add any additional loaders to context?
-    if (previousContext) {
-        return previousContext;
+    if (parentContext) {
+        return parentContext;
     }
-    const resolvedContext = {
+    const newContext = {
         fetch: (0, get_fetch_function_1.getFetchFunction)(options, context),
         ...context
     };
+    // Parse URLs so that subloaders can easily generate correct strings
+    if (newContext.url) {
+        const baseUrl = (0, url_utils_1.stripQueryString)(newContext.url);
+        newContext.baseUrl = baseUrl;
+        newContext.queryString = (0, url_utils_1.extractQueryString)(newContext.url);
+        newContext.filename = loader_utils_1.path.filename(baseUrl);
+        newContext.baseUrl = loader_utils_1.path.dirname(baseUrl);
+    }
     // Recursive loading does not use single loader
-    if (!Array.isArray(resolvedContext.loaders)) {
-        resolvedContext.loaders = null;
+    if (!Array.isArray(newContext.loaders)) {
+        newContext.loaders = null;
     }
-    return resolvedContext;
+    return newContext;
 }
 exports.getLoaderContext = getLoaderContext;
 // eslint-disable-next-line complexity

package/dist/lib/utils/resource-utils.d.ts

@@ -1,15 +1,24 @@
 /**
- * Returns an object with `url` and (MIME) `type` fields
- * If it cannot determine url or type, the corresponding value will be an empty string
+ * A loadable resource. Includes:
+ * `Response`, `Blob` (`File` is a subclass), string URLs and data URLs
+ */
+export type Resource = Response | Blob | string;
+/**
+ * Returns the URL associated with this resource.
+ * The returned value may include a query string and need further processing.
+ * If it cannot determine url, the corresponding value will be an empty string
  *
- * @param resource Any type, but only Responses, string URLs and data URLs are processed
+ * @todo string parameters are assumed to be URLs
+ */
+export declare function getResourceUrl(resource: unknown): string;
+/**
+ * Returns the URL associated with this resource.
+ * The returned value may include a query string and need further processing.
+ * If it cannot determine url, the corresponding value will be an empty string
  *
  * @todo string parameters are assumed to be URLs
  */
-export declare function getResourceUrlAndType(resource: any): {
-    url: string;
-    type: string;
-};
+export declare function getResourceMIMEType(resource: unknown): string;
 /**
   * Returns (approximate) content length for a resource if it can be determined.
   * Returns -1 if content length cannot be determined.
@@ -17,5 +26,5 @@ export declare function getResourceUrlAndType(resource: any): {
 
   * @note string parameters are NOT assumed to be URLs
   */
-export declare function getResourceContentLength(resource: any): number;
+export declare function getResourceContentLength(resource: unknown): number;
 //# sourceMappingURL=resource-utils.d.ts.map

package/dist/lib/utils/resource-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resource-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/resource-utils.ts"],"names":[],"mappings":"AAKA;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,GAAG,GAAG;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAC,CAmChF;AAED;;;;;;IAMI;AACJ,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,GAAG,GAAG,MAAM,CAkB9D"}
+{"version":3,"file":"resource-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/resource-utils.ts"],"names":[],"mappings":"AAMA;;;GAGG;AACH,MAAM,MAAM,QAAQ,GAAG,QAAQ,GAAG,IAAI,GAAG,MAAM,CAAC;AAEhD;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,OAAO,GAAG,MAAM,CAqBxD;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,OAAO,GAAG,MAAM,CAqB7D;AAED;;;;;;IAMI;AACJ,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,OAAO,GAAG,MAAM,CAoBlE"}

package/dist/lib/utils/resource-utils.js

@@ -1,51 +1,64 @@
 "use strict";
+// loaders.gl, MIT license
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getResourceContentLength = exports.getResourceUrlAndType = void 0;
+exports.getResourceContentLength = exports.getResourceMIMEType = exports.getResourceUrl = void 0;
 const is_type_1 = require("../../javascript-utils/is-type");
 const mime_type_utils_1 = require("./mime-type-utils");
-const QUERY_STRING_PATTERN = /\?.*/;
+const url_utils_1 = require("./url-utils");
 /**
- * Returns an object with `url` and (MIME) `type` fields
- * If it cannot determine url or type, the corresponding value will be an empty string
+ * Returns the URL associated with this resource.
+ * The returned value may include a query string and need further processing.
+ * If it cannot determine url, the corresponding value will be an empty string
  *
- * @param resource Any type, but only Responses, string URLs and data URLs are processed
+ * @todo string parameters are assumed to be URLs
+ */
+function getResourceUrl(resource) {
+    // If resource is a `Response`, it contains the information directly as a field
+    if ((0, is_type_1.isResponse)(resource)) {
+        const response = resource;
+        return response.url;
+    }
+    // If the resource is a Blob or a File (subclass of Blob)
+    if ((0, is_type_1.isBlob)(resource)) {
+        const blob = resource;
+        // File objects have a "name" property. Blob objects don't have any
+        // url (name) information
+        return blob.name || '';
+    }
+    if (typeof resource === 'string') {
+        return resource;
+    }
+    // Unknown
+    return '';
+}
+exports.getResourceUrl = getResourceUrl;
+/**
+ * Returns the URL associated with this resource.
+ * The returned value may include a query string and need further processing.
+ * If it cannot determine url, the corresponding value will be an empty string
  *
  * @todo string parameters are assumed to be URLs
  */
-function getResourceUrlAndType(resource) {
+function getResourceMIMEType(resource) {
     // If resource is a response, it contains the information directly
     if ((0, is_type_1.isResponse)(resource)) {
-        const url = stripQueryString(resource.url || '');
-        const contentTypeHeader = resource.headers.get('content-type') || '';
-        return {
-            url,
-            type: (0, mime_type_utils_1.parseMIMEType)(contentTypeHeader) || (0, mime_type_utils_1.parseMIMETypeFromURL)(url)
-        };
+        const response = resource;
+        const contentTypeHeader = response.headers.get('content-type') || '';
+        const noQueryUrl = (0, url_utils_1.stripQueryString)(response.url);
+        return (0, mime_type_utils_1.parseMIMEType)(contentTypeHeader) || (0, mime_type_utils_1.parseMIMETypeFromURL)(noQueryUrl);
     }
     // If the resource is a Blob or a File (subclass of Blob)
     if ((0, is_type_1.isBlob)(resource)) {
-        return {
-            // File objects have a "name" property. Blob objects don't have any
-            // url (name) information
-            url: stripQueryString(resource.name || ''),
-            type: resource.type || ''
-        };
+        const blob = resource;
+        return blob.type || '';
     }
     if (typeof resource === 'string') {
-        return {
-            // TODO this could mess up data URL but it doesn't matter as it is just used for inference
-            url: stripQueryString(resource),
-            // If a data url
-            type: (0, mime_type_utils_1.parseMIMETypeFromURL)(resource)
-        };
+        return (0, mime_type_utils_1.parseMIMETypeFromURL)(resource);
     }
     // Unknown
-    return {
-        url: '',
-        type: ''
-    };
+    return '';
 }
-exports.getResourceUrlAndType = getResourceUrlAndType;
+exports.getResourceMIMEType = getResourceMIMEType;
 /**
   * Returns (approximate) content length for a resource if it can be determined.
   * Returns -1 if content length cannot be determined.
@@ -55,10 +68,12 @@ exports.getResourceUrlAndType = getResourceUrlAndType;
   */
 function getResourceContentLength(resource) {
     if ((0, is_type_1.isResponse)(resource)) {
-        return resource.headers['content-length'] || -1;
+        const response = resource;
+        return response.headers['content-length'] || -1;
     }
     if ((0, is_type_1.isBlob)(resource)) {
-        return resource.size;
+        const blob = resource;
+        return blob.size;
     }
     if (typeof resource === 'string') {
         // TODO - handle data URL?
@@ -73,6 +88,3 @@ function getResourceContentLength(resource) {
     return -1;
 }
 exports.getResourceContentLength = getResourceContentLength;
-function stripQueryString(url) {
-    return url.replace(QUERY_STRING_PATTERN, '');
-}

package/dist/lib/utils/response-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"response-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/response-utils.ts"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,wBAAsB,YAAY,CAAC,QAAQ,EAAE,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC,CAsCnE;AAED;;;GAGG;AACH,wBAAsB,aAAa,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAKrE;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAM1D"}
+{"version":3,"file":"response-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/response-utils.ts"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,wBAAsB,YAAY,CAAC,QAAQ,EAAE,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC,CAuCnE;AAED;;;GAGG;AACH,wBAAsB,aAAa,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAKrE;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAM1D"}

package/dist/lib/utils/response-utils.js

@@ -21,7 +21,8 @@ async function makeResponse(resource) {
     }
     // `new Response(File)` does not preserve content-type and URL
     // so we add them here
-    const { url, type } = (0, resource_utils_1.getResourceUrlAndType)(resource);
+    const url = (0, resource_utils_1.getResourceUrl)(resource);
+    const type = (0, resource_utils_1.getResourceMIMEType)(resource);
     if (type) {
         headers['content-type'] = type;
     }

package/dist/lib/utils/url-utils.d.ts

@@ -0,0 +1,3 @@
+export declare function extractQueryString(url: any): string;
+export declare function stripQueryString(url: any): string;
+//# sourceMappingURL=url-utils.d.ts.map

package/dist/lib/utils/url-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"url-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/url-utils.ts"],"names":[],"mappings":"AAIA,wBAAgB,kBAAkB,CAAC,GAAG,KAAA,GAAG,MAAM,CAG9C;AAED,wBAAgB,gBAAgB,CAAC,GAAG,KAAA,GAAG,MAAM,CAE5C"}

package/dist/lib/utils/url-utils.js

@@ -0,0 +1,14 @@
+"use strict";
+// loaders.gl, MIT license
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.stripQueryString = exports.extractQueryString = void 0;
+const QUERY_STRING_PATTERN = /\?.*/;
+function extractQueryString(url) {
+    const matches = url.match(QUERY_STRING_PATTERN);
+    return matches && matches[0];
+}
+exports.extractQueryString = extractQueryString;
+function stripQueryString(url) {
+    return url.replace(QUERY_STRING_PATTERN, '');
+}
+exports.stripQueryString = stripQueryString;

package/dist/null-worker.js

@@ -184,7 +184,7 @@
   }
 
   // src/null-loader.ts
-  var VERSION = true ? "3.4.0-alpha.3" : "latest";
+  var VERSION = true ? "3.4.0-alpha.5" : "latest";
   function parseSync(arrayBuffer, options, context) {
     if (!options.null.echoParameters)
       return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/core",
-  "version": "3.4.0-alpha.3",
+  "version": "3.4.0-alpha.5",
   "description": "The core API for working with loaders.gl loaders and writers",
   "license": "MIT",
   "publishConfig": {
@@ -42,9 +42,9 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.3.1",
-    "@loaders.gl/loader-utils": "3.4.0-alpha.3",
-    "@loaders.gl/worker-utils": "3.4.0-alpha.3",
+    "@loaders.gl/loader-utils": "3.4.0-alpha.5",
+    "@loaders.gl/worker-utils": "3.4.0-alpha.5",
     "@probe.gl/log": "^4.0.1"
   },
-  "gitHead": "a954528dd1d78a1f128d8f6b07e4baeb7a296924"
+  "gitHead": "686929f85b3420c15df051eab769942b260dd242"
 }