@loaders.gl/core 4.3.0-alpha.2 → 4.3.0-alpha.4

package/dist/index.d.ts

@@ -13,6 +13,8 @@ export { loadInBatches } from "./lib/api/load-in-batches.js";
 export { encodeTable, encodeTableAsText, encodeTableInBatches } from "./lib/api/encode-table.js";
 export { encode, encodeSync, encodeInBatches, encodeURLtoURL } from "./lib/api/encode.js";
 export { encodeText, encodeTextSync } from "./lib/api/encode.js";
+export { createDataSource } from "./lib/api/create-data-source.js";
+export { selectSource as _selectSource } from "./lib/api/select-source.js";
 export { setPathPrefix, getPathPrefix, resolvePath } from '@loaders.gl/loader-utils';
 export { RequestScheduler } from '@loaders.gl/loader-utils';
 export { makeIterator } from "./iterators/make-iterator/make-iterator.js";

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAKA,YAAY,EACV,MAAM,EACN,gBAAgB,EAChB,aAAa,EACb,aAAa,EACb,MAAM,EACN,aAAa,EACb,QAAQ,EACR,YAAY,EACZ,iBAAiB,EACjB,YAAY,EACZ,YAAY,EACZ,IAAI,EACJ,UAAU,EACV,sBAAsB,EACvB,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAAC,SAAS,EAAC,kCAA+B;AACjD,OAAO,EAAC,UAAU,EAAC,mCAAgC;AAEnD,OAAO,EAAC,eAAe,EAAC,yCAAsC;AAK9D,OAAO,EAAC,gBAAgB,EAAE,gBAAgB,EAAC,oCAAiC;AAC5E,OAAO,EAAC,eAAe,EAAC,sCAAmC;AAC3D,OAAO,EAAC,YAAY,EAAE,gBAAgB,EAAC,mCAAgC;AAGvE,OAAO,EAAC,KAAK,EAAC,2BAAwB;AACtC,OAAO,EAAC,SAAS,EAAC,gCAA6B;AAC/C,OAAO,EAAC,cAAc,EAAC,sCAAmC;AAE1D,OAAO,EAAC,IAAI,EAAC,0BAAuB;AACpC,OAAO,EAAC,aAAa,EAAC,qCAAkC;AAGxD,OAAO,EAAC,WAAW,EAAE,iBAAiB,EAAE,oBAAoB,EAAC,kCAA+B;AAC5F,OAAO,EAAC,MAAM,EAAE,UAAU,EAAE,eAAe,EAAE,cAAc,EAAC,4BAAyB;AACrF,OAAO,EAAC,UAAU,EAAE,cAAc,EAAC,4BAAyB;AAG5D,OAAO,EAAC,aAAa,EAAE,aAAa,EAAE,WAAW,EAAC,MAAM,0BAA0B,CAAC;AACnF,OAAO,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAG1D,OAAO,EAAC,YAAY,EAAC,mDAAgD;AACrE,OAAO,EAAC,UAAU,EAAC,+CAA4C;AAG/D,OAAO,EAAC,gBAAgB,EAAE,UAAU,EAAC,yBAAsB;AAC3D,OAAO,EAAC,UAAU,EAAC,MAAM,0BAA0B,CAAC;AAGpD,OAAO,EAAC,aAAa,IAAI,cAAc,EAAC,yCAAsC;AAC9E,OAAO,EAAC,iBAAiB,IAAI,kBAAkB,EAAC,gDAA6C;AAG7F,OAAO,EAAC,kBAAkB,EAAC,sCAAmC;AAM9D,OAAO,EAAC,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAC,MAAM,0BAA0B,CAAC;AAC7F,OAAO,EAAC,MAAM,EAAC,MAAM,0BAA0B,CAAC;AAChD,OAAO,EAAC,OAAO,EAAE,4BAA4B,EAAC,MAAM,0BAA0B,CAAC;AAE/E,OAAO,EACL,uBAAuB,EACvB,uBAAuB,EACvB,gBAAgB,EAChB,wBAAwB,EACzB,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EACL,YAAY,EACZ,SAAS,EACT,UAAU,EACV,eAAe,EACf,UAAU,EACV,UAAU,EACV,gBAAgB,EAChB,gBAAgB,EACjB,sCAAmC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAKA,YAAY,EACV,MAAM,EACN,gBAAgB,EAChB,aAAa,EACb,aAAa,EACb,MAAM,EACN,aAAa,EACb,QAAQ,EACR,YAAY,EACZ,iBAAiB,EACjB,YAAY,EACZ,YAAY,EACZ,IAAI,EACJ,UAAU,EACV,sBAAsB,EACvB,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAAC,SAAS,EAAC,kCAA+B;AACjD,OAAO,EAAC,UAAU,EAAC,mCAAgC;AAEnD,OAAO,EAAC,eAAe,EAAC,yCAAsC;AAK9D,OAAO,EAAC,gBAAgB,EAAE,gBAAgB,EAAC,oCAAiC;AAC5E,OAAO,EAAC,eAAe,EAAC,sCAAmC;AAC3D,OAAO,EAAC,YAAY,EAAE,gBAAgB,EAAC,mCAAgC;AAGvE,OAAO,EAAC,KAAK,EAAC,2BAAwB;AACtC,OAAO,EAAC,SAAS,EAAC,gCAA6B;AAC/C,OAAO,EAAC,cAAc,EAAC,sCAAmC;AAE1D,OAAO,EAAC,IAAI,EAAC,0BAAuB;AACpC,OAAO,EAAC,aAAa,EAAC,qCAAkC;AAGxD,OAAO,EAAC,WAAW,EAAE,iBAAiB,EAAE,oBAAoB,EAAC,kCAA+B;AAC5F,OAAO,EAAC,MAAM,EAAE,UAAU,EAAE,eAAe,EAAE,cAAc,EAAC,4BAAyB;AACrF,OAAO,EAAC,UAAU,EAAE,cAAc,EAAC,4BAAyB;AAG5D,OAAO,EAAC,gBAAgB,EAAC,wCAAqC;AAC9D,OAAO,EAAC,YAAY,IAAI,aAAa,EAAC,mCAAgC;AAGtE,OAAO,EAAC,aAAa,EAAE,aAAa,EAAE,WAAW,EAAC,MAAM,0BAA0B,CAAC;AACnF,OAAO,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAG1D,OAAO,EAAC,YAAY,EAAC,mDAAgD;AACrE,OAAO,EAAC,UAAU,EAAC,+CAA4C;AAG/D,OAAO,EAAC,gBAAgB,EAAE,UAAU,EAAC,yBAAsB;AAC3D,OAAO,EAAC,UAAU,EAAC,MAAM,0BAA0B,CAAC;AAGpD,OAAO,EAAC,aAAa,IAAI,cAAc,EAAC,yCAAsC;AAC9E,OAAO,EAAC,iBAAiB,IAAI,kBAAkB,EAAC,gDAA6C;AAG7F,OAAO,EAAC,kBAAkB,EAAC,sCAAmC;AAM9D,OAAO,EAAC,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAC,MAAM,0BAA0B,CAAC;AAC7F,OAAO,EAAC,MAAM,EAAC,MAAM,0BAA0B,CAAC;AAChD,OAAO,EAAC,OAAO,EAAE,4BAA4B,EAAC,MAAM,0BAA0B,CAAC;AAE/E,OAAO,EACL,uBAAuB,EACvB,uBAAuB,EACvB,gBAAgB,EAChB,wBAAwB,EACzB,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EACL,YAAY,EACZ,SAAS,EACT,UAAU,EACV,eAAe,EACf,UAAU,EACV,UAAU,EACV,gBAAgB,EAChB,gBAAgB,EACjB,sCAAmC"}

package/dist/index.js

@@ -21,6 +21,9 @@ export { loadInBatches } from "./lib/api/load-in-batches.js";
 export { encodeTable, encodeTableAsText, encodeTableInBatches } from "./lib/api/encode-table.js";
 export { encode, encodeSync, encodeInBatches, encodeURLtoURL } from "./lib/api/encode.js";
 export { encodeText, encodeTextSync } from "./lib/api/encode.js";
+// SERVICES AND SOURCES
+export { createDataSource } from "./lib/api/create-data-source.js";
+export { selectSource as _selectSource } from "./lib/api/select-source.js";
 // CORE UTILS SHARED WITH LOADERS (RE-EXPORTED FROM LOADER-UTILS)
 export { setPathPrefix, getPathPrefix, resolvePath } from '@loaders.gl/loader-utils';
 export { RequestScheduler } from '@loaders.gl/loader-utils';

package/dist/lib/api/create-data-source.d.ts

@@ -0,0 +1,13 @@
+import type { DataSourceProps } from '@loaders.gl/loader-utils';
+import { DataSource, Source } from '@loaders.gl/loader-utils';
+/**
+ * Creates a source from a service
+ * If type is not supplied, will try to automatically detect the the
+ * @param url URL to the data source
+ * @param type type of source. if not known, set to 'auto'
+ * @returns an DataSource instance
+ */
+export declare function createDataSource<DataSourcePropsT extends DataSourceProps = DataSourceProps, DataSourceT extends DataSource = DataSource>(data: string | Blob, sources: Source[], props: DataSourcePropsT & {
+    type?: string;
+}): DataSourceT;
+//# sourceMappingURL=create-data-source.d.ts.map

package/dist/lib/api/create-data-source.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"create-data-source.d.ts","sourceRoot":"","sources":["../../../src/lib/api/create-data-source.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAC,UAAU,EAAE,MAAM,EAAC,MAAM,0BAA0B,CAAC;AAE5D;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,gBAAgB,SAAS,eAAe,GAAG,eAAe,EAC1D,WAAW,SAAS,UAAU,GAAG,UAAU,EAC3C,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,gBAAgB,GAAG;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAC,GAAG,WAAW,CAQhG"}

package/dist/lib/api/create-data-source.js

@@ -0,0 +1,38 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+/**
+ * Creates a source from a service
+ * If type is not supplied, will try to automatically detect the the
+ * @param url URL to the data source
+ * @param type type of source. if not known, set to 'auto'
+ * @returns an DataSource instance
+ */
+export function createDataSource(data, sources, props) {
+    const { type = 'auto' } = props;
+    const source = type === 'auto' ? selectSource(data, sources) : getSourceOfType(type, sources);
+    if (!source) {
+        throw new Error('Not a valid image source type');
+    }
+    return source.createDataSource(data, props);
+}
+// TODO - use selectSource...
+/** Guess service type from URL */
+function selectSource(url, sources) {
+    for (const service of sources) {
+        // @ts-expect-error
+        if (service.testURL && service.testURL(url)) {
+            return service;
+        }
+    }
+    return null;
+}
+/** Guess service type from URL */
+function getSourceOfType(type, sources) {
+    for (const service of sources) {
+        if (service.type === type) {
+            return service;
+        }
+    }
+    return null;
+}

package/dist/lib/api/select-source.d.ts

@@ -0,0 +1,8 @@
+import type { Source } from '@loaders.gl/loader-utils';
+/** Guess service type from URL */
+export declare function selectSource(url: string | Blob, sources: Source[], options?: {
+    /** Provide id of a source to select that source. Omit or provide 'auto' to test the source*/
+    type?: string;
+    nothrow?: boolean;
+}): Source | null;
+//# sourceMappingURL=select-source.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"select-source.d.ts","sourceRoot":"","sources":["../../../src/lib/api/select-source.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,0BAA0B,CAAC;AAErD,kCAAkC;AAClC,wBAAgB,YAAY,CAC1B,GAAG,EAAE,MAAM,GAAG,IAAI,EAClB,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,CAAC,EAAE;IACR,6FAA6F;IAC7F,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,GACA,MAAM,GAAG,IAAI,CAkBf"}

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

@@ -0,0 +1,31 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+/** Guess service type from URL */
+export function selectSource(url, sources, options) {
+    const type = options?.type || 'auto';
+    let selectedSource = null;
+    if (type === 'auto') {
+        for (const source of sources) {
+            if (typeof url === 'string' && source.testURL && source.testURL(url)) {
+                return source;
+            }
+        }
+    }
+    else {
+        selectedSource = getSourceOfType(type, sources);
+    }
+    if (!selectedSource && !options?.nothrow) {
+        throw new Error('Not a valid image source type');
+    }
+    return selectedSource;
+}
+/** Guess service type from URL */
+function getSourceOfType(type, sources) {
+    for (const service of sources) {
+        if (service.type === type) {
+            return service;
+        }
+    }
+    return null;
+}

package/dist/lib/init.js

@@ -3,7 +3,7 @@
 // Copyright (c) vis.gl contributors
 import { log } from '@loaders.gl/loader-utils';
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
-const version = typeof "4.3.0-alpha.1" !== 'undefined' ? "4.3.0-alpha.1" : '';
+const version = typeof "4.3.0-alpha.3" !== 'undefined' ? "4.3.0-alpha.3" : '';
 // @ts-ignore
 if (!globalThis.loaders) {
     log.log(1, `loaders.gl ${version}`)();

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

@@ -76,11 +76,13 @@ async function getResponseError(response) {
         url: response.url,
         response
     };
+    // See if we got an error message in the body
     try {
         const contentType = response.headers.get('Content-Type');
-        info.reason = contentType?.includes('application/json')
-            ? await response.json()
-            : response.text();
+        info.reason =
+            !response.bodyUsed && contentType?.includes('application/json')
+                ? await response.json()
+                : await response.text();
     }
     catch (error) {
         // eslint forbids return in a finally statement, so we just catch here

package/dist/null-loader.js

@@ -3,7 +3,7 @@
 // Copyright (c) vis.gl contributors
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
-const VERSION = typeof "4.3.0-alpha.1" !== 'undefined' ? "4.3.0-alpha.1" : 'latest';
+const VERSION = typeof "4.3.0-alpha.3" !== 'undefined' ? "4.3.0-alpha.3" : 'latest';
 /**
  * Loads any data and returns null (or optionally passes through data unparsed)
  */

package/dist/null-worker-node.js

@@ -235,7 +235,7 @@ async function parseData({
 }
 
 // src/null-loader.ts
-var VERSION = true ? "4.3.0-alpha.1" : "latest";
+var VERSION = true ? "4.3.0-alpha.3" : "latest";
 var NullLoader = {
   dataType: null,
   batchType: null,

package/dist/null-worker.js

@@ -200,7 +200,7 @@
   }
 
   // src/null-loader.ts
-  var VERSION = true ? "4.3.0-alpha.1" : "latest";
+  var VERSION = true ? "4.3.0-alpha.3" : "latest";
   var NullLoader = {
     dataType: null,
     batchType: null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/core",
-  "version": "4.3.0-alpha.2",
+  "version": "4.3.0-alpha.4",
   "description": "The core API for working with loaders.gl loaders and writers",
   "license": "MIT",
   "type": "module",
@@ -55,10 +55,10 @@
     "build-worker-node": "esbuild src/workers/null-worker.ts --outfile=dist/null-worker-node.js --bundle --platform=node --target=node16 --define:__VERSION__=\\\"$npm_package_version\\\""
   },
   "dependencies": {
-    "@loaders.gl/loader-utils": "4.3.0-alpha.2",
-    "@loaders.gl/schema": "4.3.0-alpha.2",
-    "@loaders.gl/worker-utils": "4.3.0-alpha.2",
+    "@loaders.gl/loader-utils": "4.3.0-alpha.4",
+    "@loaders.gl/schema": "4.3.0-alpha.4",
+    "@loaders.gl/worker-utils": "4.3.0-alpha.4",
     "@probe.gl/log": "^4.0.2"
   },
-  "gitHead": "77a3cb538ab7a1fbf74245f25590210451689f5c"
+  "gitHead": "4900ac4c4de20366c050b80cef04dc5b52d167af"
 }

package/src/index.ts

@@ -46,6 +46,10 @@ export {encodeTable, encodeTableAsText, encodeTableInBatches} from './lib/api/en
 export {encode, encodeSync, encodeInBatches, encodeURLtoURL} from './lib/api/encode';
 export {encodeText, encodeTextSync} from './lib/api/encode';
 
+// SERVICES AND SOURCES
+export {createDataSource} from './lib/api/create-data-source';
+export {selectSource as _selectSource} from './lib/api/select-source';
+
 // CORE UTILS SHARED WITH LOADERS (RE-EXPORTED FROM LOADER-UTILS)
 export {setPathPrefix, getPathPrefix, resolvePath} from '@loaders.gl/loader-utils';
 export {RequestScheduler} from '@loaders.gl/loader-utils';

package/src/lib/api/create-data-source.ts

@@ -0,0 +1,50 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
+import type {DataSourceProps} from '@loaders.gl/loader-utils';
+import {DataSource, Source} from '@loaders.gl/loader-utils';
+
+/**
+ * Creates a source from a service
+ * If type is not supplied, will try to automatically detect the the
+ * @param url URL to the data source
+ * @param type type of source. if not known, set to 'auto'
+ * @returns an DataSource instance
+ */
+export function createDataSource<
+  DataSourcePropsT extends DataSourceProps = DataSourceProps,
+  DataSourceT extends DataSource = DataSource
+>(data: string | Blob, sources: Source[], props: DataSourcePropsT & {type?: string}): DataSourceT {
+  const {type = 'auto'} = props;
+  const source = type === 'auto' ? selectSource(data, sources) : getSourceOfType(type, sources);
+
+  if (!source) {
+    throw new Error('Not a valid image source type');
+  }
+  return source.createDataSource(data, props) as DataSourceT;
+}
+
+// TODO - use selectSource...
+
+/** Guess service type from URL */
+function selectSource(url: string | Blob, sources: Source[]): Source | null {
+  for (const service of sources) {
+    // @ts-expect-error
+    if (service.testURL && service.testURL(url)) {
+      return service;
+    }
+  }
+
+  return null;
+}
+
+/** Guess service type from URL */
+function getSourceOfType(type: string, sources: Source[]): Source | null {
+  for (const service of sources) {
+    if (service.type === type) {
+      return service;
+    }
+  }
+  return null;
+}

package/src/lib/api/select-source.ts

@@ -0,0 +1,44 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
+import type {Source} from '@loaders.gl/loader-utils';
+
+/** Guess service type from URL */
+export function selectSource(
+  url: string | Blob,
+  sources: Source[],
+  options?: {
+    /** Provide id of a source to select that source. Omit or provide 'auto' to test the source*/
+    type?: string;
+    nothrow?: boolean;
+  }
+): Source | null {
+  const type = options?.type || 'auto';
+  let selectedSource: Source | null = null;
+  if (type === 'auto') {
+    for (const source of sources) {
+      if (typeof url === 'string' && source.testURL && source.testURL(url)) {
+        return source;
+      }
+    }
+  } else {
+    selectedSource = getSourceOfType(type, sources);
+  }
+
+  if (!selectedSource && !options?.nothrow) {
+    throw new Error('Not a valid image source type');
+  }
+
+  return selectedSource;
+}
+
+/** Guess service type from URL */
+function getSourceOfType(type: string, sources: Source[]): Source | null {
+  for (const service of sources) {
+    if (service.type === type) {
+      return service;
+    }
+  }
+  return null;
+}

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

@@ -90,11 +90,13 @@ async function getResponseError(response: Response): Promise<Error> {
     response
   };
 
+  // See if we got an error message in the body
   try {
     const contentType = response.headers.get('Content-Type');
-    info.reason = contentType?.includes('application/json')
-      ? await response.json()
-      : response.text();
+    info.reason =
+      !response.bodyUsed && contentType?.includes('application/json')
+        ? await response.json()
+        : await response.text();
   } catch (error) {
     // eslint forbids return in a finally statement, so we just catch here
   }