@loaders.gl/core 4.2.0-alpha.5 → 4.2.0-beta.1

package/src/lib/utils/mime-type-utils.ts

@@ -8,6 +8,20 @@
 const DATA_URL_PATTERN = /^data:([-\w.]+\/[-\w.+]+)(;|,)/;
 const MIME_TYPE_PATTERN = /^([-\w.]+\/[-\w.+]+)/;
 
+/**
+ * Compare two MIME types, case insensitively etc.
+ * @param mimeType1
+ * @param mimeType2
+ * @returns true if the MIME types are equivalent
+ * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types#structure_of_a_mime_type
+ */
+export function compareMIMETypes(mimeType1: string, mimeType2: string): boolean {
+  if (mimeType1.toLowerCase() === mimeType2.toLowerCase()) {
+    return true;
+  }
+  return false;
+}
+
 /**
  * Remove extra data like `charset` from MIME types
  * @param mimeString

package/src/lib/utils/resource-utils.ts

@@ -31,7 +31,7 @@ export function getResourceUrl(resource: unknown): string {
     const blob = resource as Blob;
     // File objects have a "name" property. Blob objects don't have any
     // url (name) information
-    return blob.name || '';
+    return (blob as any).name || '';
   }
 
   if (typeof resource === 'string') {

package/src/lib/utils/response-utils.ts

@@ -3,7 +3,9 @@
 // Copyright (c) vis.gl contributors
 
 import {isResponse} from '../../javascript-utils/is-type';
+import {FetchError} from '../fetch/fetch-error';
 import {getResourceContentLength, getResourceUrl, getResourceMIMEType} from './resource-utils';
+import {shortenUrlForDisplay} from './url-utils';
 
 /**
  * Returns a Response object
@@ -58,8 +60,8 @@ export async function makeResponse(resource: unknown): Promise<Response> {
  */
 export async function checkResponse(response: Response): Promise<void> {
   if (!response.ok) {
-    const message = await getResponseError(response);
-    throw new Error(message);
+    const error = await getResponseError(response);
+    throw error;
   }
 }
 
@@ -77,20 +79,26 @@ export function checkResponseSync(response: Response): void {
 
 // HELPERS
 
-async function getResponseError(response: Response): Promise<string> {
-  let message = `Failed to fetch resource ${response.url} (${response.status}): `;
+async function getResponseError(response: Response): Promise<Error> {
+  const shortUrl = shortenUrlForDisplay(response.url);
+  let message = `Failed to fetch resource (${response.status}) ${response.statusText}: ${shortUrl}`;
+  message = message.length > 100 ? `${message.slice(0, 100)}...` : message;
+
+  const info = {
+    reason: response.statusText,
+    url: response.url,
+    response
+  };
+
   try {
     const contentType = response.headers.get('Content-Type');
-    let text = response.statusText;
-    if (contentType?.includes('application/json')) {
-      text += ` ${await response.text()}`;
-    }
-    message += text;
-    message = message.length > 60 ? `${message.slice(0, 60)}...` : message;
+    info.reason = contentType?.includes('application/json')
+      ? await response.json()
+      : response.text();
   } catch (error) {
     // eslint forbids return in a finally statement, so we just catch here
   }
-  return message;
+  return new FetchError(message, info);
 }
 
 async function getInitialDataUrl(

package/src/lib/utils/url-utils.ts

@@ -12,3 +12,12 @@ export function extractQueryString(url): string {
 export function stripQueryString(url): string {
   return url.replace(QUERY_STRING_PATTERN, '');
 }
+
+export function shortenUrlForDisplay(url: string): string {
+  if (url.length < 50) {
+    return url;
+  }
+  const urlEnd = url.slice(url.length - 15);
+  const urlStart = url.substr(0, 32);
+  return `${urlStart}...${urlEnd}`;
+}

package/src/null-loader.ts

@@ -16,7 +16,9 @@ export type NullLoaderOptions = LoaderOptions & {
 /**
  * Loads any data and returns null (or optionally passes through data unparsed)
  */
-export const NullWorkerLoader: Loader<null, never, NullLoaderOptions> = {
+export const NullWorkerLoader = {
+  dataType: null,
+  batchType: null as never,
   name: 'Null loader',
   id: 'null',
   module: 'core',
@@ -28,12 +30,15 @@ export const NullWorkerLoader: Loader<null, never, NullLoaderOptions> = {
   options: {
     null: {}
   }
-};
+} as const satisfies Loader<null, never, NullLoaderOptions>;
 
 /**
  * Loads any data and returns null (or optionally passes through data unparsed)
  */
-export const NullLoader: LoaderWithParser<null, null, NullLoaderOptions> = {
+export const NullLoader = {
+  dataType: null,
+  batchType: null,
+
   name: 'Null loader',
   id: 'null',
   module: 'core',
@@ -52,7 +57,7 @@ export const NullLoader: LoaderWithParser<null, null, NullLoaderOptions> = {
   options: {
     null: {}
   }
-};
+} as const satisfies LoaderWithParser<null, null, NullLoaderOptions>;
 
 /**
  * Returns arguments passed to the parse API in a format that can be transferred to a