@loaders.gl/core 4.3.2 → 4.4.0-alpha.2

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

@@ -1,5 +1,4 @@
-import type { DataSourceProps } from '@loaders.gl/loader-utils';
-import { DataSource, Source } from '@loaders.gl/loader-utils';
+import { Source, SourceArrayOptionsType, SourceArrayDataSourceType } from '@loaders.gl/loader-utils';
 /**
  * Creates a source from a service
  * If type is not supplied, will try to automatically detect the the
@@ -7,7 +6,5 @@ import { DataSource, Source } from '@loaders.gl/loader-utils';
  * @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;
+export declare function createDataSource<SourceArrayT extends Source[]>(data: string | Blob, sources: Readonly<SourceArrayT>, options: Readonly<SourceArrayOptionsType<SourceArrayT>>): SourceArrayDataSourceType<SourceArrayT>;
 //# sourceMappingURL=create-data-source.d.ts.map

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

@@ -1 +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"}
+{"version":3,"file":"create-data-source.d.ts","sourceRoot":"","sources":["../../../src/lib/api/create-data-source.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,MAAM,EAAE,sBAAsB,EAAE,yBAAyB,EAAC,MAAM,0BAA0B,CAAC;AAEnG;;;;;;GAMG;AAGH,wBAAgB,gBAAgB,CAAC,YAAY,SAAS,MAAM,EAAE,EAC5D,IAAI,EAAE,MAAM,GAAG,IAAI,EACnB,OAAO,EAAE,QAAQ,CAAC,YAAY,CAAC,EAC/B,OAAO,EAAE,QAAQ,CAAC,sBAAsB,CAAC,YAAY,CAAC,CAAC,GACtD,yBAAyB,CAAC,YAAY,CAAC,CAQzC"}

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

@@ -8,13 +8,15 @@
  * @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;
+// DataSourceOptionsT extends DataSourceOptions = DataSourceOptions,
+// DataSourceT extends DataSource = DataSource
+export function createDataSource(data, sources, options) {
+    const type = options?.core?.type || options.type || 'auto';
     const source = type === 'auto' ? selectSource(data, sources) : getSourceOfType(type, sources);
     if (!source) {
-        throw new Error('Not a valid image source type');
+        throw new Error('Not a valid source type');
     }
-    return source.createDataSource(data, props);
+    return source.createDataSource(data, options);
 }
 // TODO - use selectSource...
 /** Guess service type from URL */

package/dist/lib/api/encode-table.d.ts

@@ -1,5 +1,5 @@
 import { WriterOptionsType, WriterWithEncoder } from '@loaders.gl/loader-utils';
-import { Table } from '@loaders.gl/schema';
+import type { Table } from '@loaders.gl/schema';
 export declare function encodeTable<WriterT extends WriterWithEncoder = WriterWithEncoder>(data: Table, writer: WriterT, options?: WriterOptionsType<WriterT>): Promise<ArrayBuffer>;
 export declare function encodeTableAsText<WriterT extends WriterWithEncoder = WriterWithEncoder>(data: Table, writer: WriterT, options?: WriterOptionsType<WriterT>): Promise<string>;
 export declare function encodeTableInBatches<WriterT extends WriterWithEncoder = WriterWithEncoder>(data: Table, writer: WriterT, options?: WriterOptionsType<WriterT>): AsyncIterable<ArrayBuffer>;

package/dist/lib/api/encode-table.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"encode-table.d.ts","sourceRoot":"","sources":["../../../src/lib/api/encode-table.ts"],"names":[],"mappings":"AAMA,OAAO,EAEL,iBAAiB,EACjB,iBAAiB,EAClB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAC,KAAK,EAAC,MAAM,oBAAoB,CAAC;AAEzC,wBAAsB,WAAW,CAAC,OAAO,SAAS,iBAAiB,GAAG,iBAAiB,EACrF,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,EACf,OAAO,CAAC,EAAE,iBAAiB,CAAC,OAAO,CAAC,GACnC,OAAO,CAAC,WAAW,CAAC,CAwBtB;AAED,wBAAsB,iBAAiB,CAAC,OAAO,SAAS,iBAAiB,GAAG,iBAAiB,EAC3F,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,EACf,OAAO,CAAC,EAAE,iBAAiB,CAAC,OAAO,CAAC,GACnC,OAAO,CAAC,MAAM,CAAC,CAUjB;AAED,wBAAgB,oBAAoB,CAAC,OAAO,SAAS,iBAAiB,GAAG,iBAAiB,EACxF,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,EACf,OAAO,CAAC,EAAE,iBAAiB,CAAC,OAAO,CAAC,GACnC,aAAa,CAAC,WAAW,CAAC,CAQ5B"}
+{"version":3,"file":"encode-table.d.ts","sourceRoot":"","sources":["../../../src/lib/api/encode-table.ts"],"names":[],"mappings":"AAMA,OAAO,EAEL,iBAAiB,EACjB,iBAAiB,EAClB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,oBAAoB,CAAC;AAE9C,wBAAsB,WAAW,CAAC,OAAO,SAAS,iBAAiB,GAAG,iBAAiB,EACrF,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,EACf,OAAO,CAAC,EAAE,iBAAiB,CAAC,OAAO,CAAC,GACnC,OAAO,CAAC,WAAW,CAAC,CAwBtB;AAED,wBAAsB,iBAAiB,CAAC,OAAO,SAAS,iBAAiB,GAAG,iBAAiB,EAC3F,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,EACf,OAAO,CAAC,EAAE,iBAAiB,CAAC,OAAO,CAAC,GACnC,OAAO,CAAC,MAAM,CAAC,CAUjB;AAED,wBAAgB,oBAAoB,CAAC,OAAO,SAAS,iBAAiB,GAAG,iBAAiB,EACxF,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,EACf,OAAO,CAAC,EAAE,iBAAiB,CAAC,OAAO,CAAC,GACnC,aAAa,CAAC,WAAW,CAAC,CAQ5B"}

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":"AAKA,OAAO,KAAK,EACV,MAAM,EAEN,aAAa,EACb,aAAa,EACb,iBAAiB,EACjB,iBAAiB,EACjB,eAAe,EACf,sBAAsB,EACtB,oBAAoB,EACrB,MAAM,0BAA0B,CAAC;AAYlC;;GAEG;AACH,wBAAsB,cAAc,CAClC,OAAO,SAAS,MAAM,EACtB,QAAQ,SAAS,aAAa,GAAG,iBAAiB,CAAC,OAAO,CAAC,EAE3D,IAAI,EAAE,iBAAiB,EACvB,MAAM,EAAE,OAAO,EACf,OAAO,CAAC,EAAE,QAAQ,EAClB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,aAAa,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;AAEpD;;GAEG;AACH,wBAAsB,cAAc,CAClC,YAAY,SAAS,MAAM,EAAE,EAC7B,QAAQ,SAAS,aAAa,GAAG,sBAAsB,CAAC,YAAY,CAAC,EAErE,IAAI,EAAE,iBAAiB,EACvB,OAAO,EAAE,YAAY,EACrB,OAAO,CAAC,EAAE,QAAQ,EAClB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC,CAAC;AAE/C;;;GAGG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,iBAAiB,EACvB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC"}
+{"version":3,"file":"parse-in-batches.d.ts","sourceRoot":"","sources":["../../../src/lib/api/parse-in-batches.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,MAAM,EAEN,aAAa,EACb,aAAa,EACb,iBAAiB,EACjB,iBAAiB,EACjB,eAAe,EACf,sBAAsB,EACtB,oBAAoB,EACrB,MAAM,0BAA0B,CAAC;AAYlC;;GAEG;AACH,wBAAsB,cAAc,CAClC,OAAO,SAAS,MAAM,EACtB,QAAQ,SAAS,aAAa,GAAG,iBAAiB,CAAC,OAAO,CAAC,EAE3D,IAAI,EAAE,iBAAiB,EACvB,MAAM,EAAE,OAAO,EACf,OAAO,CAAC,EAAE,QAAQ,EAClB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,aAAa,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;AAEpD;;GAEG;AACH,wBAAsB,cAAc,CAClC,YAAY,SAAS,MAAM,EAAE,EAC7B,QAAQ,SAAS,aAAa,GAAG,sBAAsB,CAAC,YAAY,CAAC,EAErE,IAAI,EAAE,iBAAiB,EACvB,OAAO,EAAE,YAAY,EACrB,OAAO,CAAC,EAAE,QAAQ,EAClB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC,CAAC;AAE/C;;;GAGG;AAEH,wBAAsB,cAAc,CAClC,IAAI,EAAE,iBAAiB,EACvB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC"}

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

@@ -1,7 +1,7 @@
 // loaders.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
-import { isTable, makeBatchFromTable } from '@loaders.gl/schema';
+import { isTable, makeBatchFromTable } from '@loaders.gl/schema-utils';
 import { concatenateArrayBuffersAsync } from '@loaders.gl/loader-utils';
 import { isLoaderObject } from "../loader-utils/normalize-loader.js";
 import { normalizeOptions } from "../loader-utils/option-utils.js";
@@ -18,7 +18,9 @@ import { parse } from "./parse.js";
  * @param options
  * @param context
  */
-export async function parseInBatches(data, loaders, options, context) {
+export async function parseInBatches(data, loaders, // LoaderOptions
+options, // LoaderContext
+context) {
     const loaderArray = Array.isArray(loaders) ? loaders : undefined;
     // Signature: parseInBatches(data, options, url) - Uses registered loaders
     if (!Array.isArray(loaders) && !isLoaderObject(loaders)) {

package/dist/lib/api/parse.js

@@ -1,7 +1,7 @@
 // loaders.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
-import { parseWithWorker, canParseWithWorker, mergeLoaderOptions } from '@loaders.gl/loader-utils';
+import { parseWithWorker, canParseWithWorker, mergeOptions } from '@loaders.gl/loader-utils';
 import { assert, validateWorkerVersion } from '@loaders.gl/worker-utils';
 import { isLoaderObject } from "../loader-utils/normalize-loader.js";
 import { isResponse } from "../../javascript-utils/is-type.js";
@@ -53,7 +53,7 @@ export async function parse(data, loaders, options, context) {
 // TODO - should accept loader.parseAsyncIterator and concatenate.
 async function parseWithLoader(loader, data, options, context) {
     validateWorkerVersion(loader);
-    options = mergeLoaderOptions(loader.options, options);
+    options = mergeOptions(loader.options, options);
     if (isResponse(data)) {
         // Serialize to support passing the response to web worker
         const response = data;

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.1" !== 'undefined' ? "4.3.1" : '';
+const version = typeof "4.4.0-alpha.1" !== 'undefined' ? "4.4.0-alpha.1" : '';
 // @ts-ignore
 if (!globalThis.loaders) {
     log.log(1, `loaders.gl ${version}`)();

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.1" !== 'undefined' ? "4.3.1" : 'latest';
+const VERSION = typeof "4.4.0-alpha.1" !== 'undefined' ? "4.4.0-alpha.1" : '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.1" : "latest";
+var VERSION = true ? "4.4.0-alpha.1" : "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.1" : "latest";
+  var VERSION = true ? "4.4.0-alpha.1" : "latest";
   var NullLoader = {
     dataType: null,
     batchType: null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/core",
-  "version": "4.3.2",
+  "version": "4.4.0-alpha.2",
   "description": "The core API for working with loaders.gl loaders and writers",
   "license": "MIT",
   "type": "module",
@@ -55,10 +55,11 @@
     "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.2",
-    "@loaders.gl/schema": "4.3.2",
-    "@loaders.gl/worker-utils": "4.3.2",
+    "@loaders.gl/loader-utils": "4.4.0-alpha.2",
+    "@loaders.gl/schema": "4.4.0-alpha.2",
+    "@loaders.gl/schema-utils": "4.4.0-alpha.2",
+    "@loaders.gl/worker-utils": "4.4.0-alpha.2",
     "@probe.gl/log": "^4.0.2"
   },
-  "gitHead": "b4203b8703f64a38d6f79a3113bc7bb51d45c93a"
+  "gitHead": "3d9fed050eabdc0812ddf2f4d5fb9914a34ee0c2"
 }

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

@@ -2,8 +2,7 @@
 // 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';
+import {Source, SourceArrayOptionsType, SourceArrayDataSourceType} from '@loaders.gl/loader-utils';
 
 /**
  * Creates a source from a service
@@ -12,23 +11,29 @@ import {DataSource, Source} from '@loaders.gl/loader-utils';
  * @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;
+// DataSourceOptionsT extends DataSourceOptions = DataSourceOptions,
+// DataSourceT extends DataSource = DataSource
+export function createDataSource<SourceArrayT extends Source[]>(
+  data: string | Blob,
+  sources: Readonly<SourceArrayT>,
+  options: Readonly<SourceArrayOptionsType<SourceArrayT>>
+): SourceArrayDataSourceType<SourceArrayT> {
+  const type = options?.core?.type || (options.type as unknown as string) || 'auto';
   const source = type === 'auto' ? selectSource(data, sources) : getSourceOfType(type, sources);
 
   if (!source) {
-    throw new Error('Not a valid image source type');
+    throw new Error('Not a valid source type');
   }
-  return source.createDataSource(data, props) as DataSourceT;
+  return source.createDataSource(data, options);
 }
 
 // TODO - use selectSource...
 
 /** Guess service type from URL */
-function selectSource(url: string | Blob, sources: Source[]): Source | null {
+function selectSource<SourceArrayT extends Source[]>(
+  url: string | Blob,
+  sources: Readonly<SourceArrayT>
+): SourceArrayT[number] | null {
   for (const service of sources) {
     // @ts-expect-error
     if (service.testURL && service.testURL(url)) {
@@ -40,7 +45,7 @@ function selectSource(url: string | Blob, sources: Source[]): Source | null {
 }
 
 /** Guess service type from URL */
-function getSourceOfType(type: string, sources: Source[]): Source | null {
+function getSourceOfType(type: string, sources: Readonly<Source[]>): Source | null {
   for (const service of sources) {
     if (service.type === type) {
       return service;

package/src/lib/api/encode-table.ts

@@ -9,7 +9,7 @@ import {
   WriterOptionsType,
   WriterWithEncoder
 } from '@loaders.gl/loader-utils';
-import {Table} from '@loaders.gl/schema';
+import type {Table} from '@loaders.gl/schema';
 
 export async function encodeTable<WriterT extends WriterWithEncoder = WriterWithEncoder>(
   data: Table,

package/src/lib/api/parse-in-batches.ts

@@ -2,7 +2,8 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {isTable, makeBatchFromTable, type Batch} from '@loaders.gl/schema';
+import type {Batch} from '@loaders.gl/schema';
+import {isTable, makeBatchFromTable} from '@loaders.gl/schema-utils';
 import type {
   Loader,
   LoaderWithParser,
@@ -55,6 +56,7 @@ export async function parseInBatches<
  * Parses `data` in batches by selecting a pre-registered loader
  * @deprecated Loader registration is deprecated, use parseInBatches(data, loaders, options) instead
  */
+// @ts-expect-error
 export async function parseInBatches(
   data: BatchableDataType,
   options?: LoaderOptions
@@ -69,8 +71,8 @@ export async function parseInBatches(
  */
 export async function parseInBatches(
   data: BatchableDataType,
-  loaders?: Loader | Loader[] | LoaderOptions,
-  options?: LoaderOptions,
+  loaders?: Loader | Loader[], // LoaderOptions
+  options?: LoaderOptions, // LoaderContext
   context?: LoaderContext
 ): Promise<AsyncIterable<unknown> | Iterable<unknown>> {
   const loaderArray = Array.isArray(loaders) ? loaders : undefined;
@@ -90,7 +92,7 @@ export async function parseInBatches(
 
   // Chooses a loader and normalizes it
   // Note - only uses URL and contentType for streams and iterator inputs
-  const loader = await selectLoader(data as ArrayBuffer, loaders as Loader | Loader[], options);
+  const loader = await selectLoader(data as ArrayBuffer, loaders, options);
   // Note: if options.nothrow was set, it is possible that no loader was found, if so just return null
   if (!loader) {
     return [];

package/src/lib/api/parse.ts

@@ -13,7 +13,7 @@ import type {
   LoaderArrayOptionsType,
   LoaderArrayReturnType
 } from '@loaders.gl/loader-utils';
-import {parseWithWorker, canParseWithWorker, mergeLoaderOptions} from '@loaders.gl/loader-utils';
+import {parseWithWorker, canParseWithWorker, mergeOptions} from '@loaders.gl/loader-utils';
 import {assert, validateWorkerVersion} from '@loaders.gl/worker-utils';
 import {isLoaderObject} from '../loader-utils/normalize-loader';
 import {isResponse} from '../../javascript-utils/is-type';
@@ -124,7 +124,7 @@ async function parseWithLoader(
 ): Promise<unknown> {
   validateWorkerVersion(loader);
 
-  options = mergeLoaderOptions(loader.options, options);
+  options = mergeOptions(loader.options, options);
 
   if (isResponse(data)) {
     // Serialize to support passing the response to web worker

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

@@ -4,13 +4,13 @@
 
 import type {LoaderContext, LoaderOptions, Loader} from '@loaders.gl/loader-utils';
 import {compareArrayBuffers, path, log} from '@loaders.gl/loader-utils';
+import {TypedArray} from '@loaders.gl/schema';
 import {normalizeLoader} from '../loader-utils/normalize-loader';
 import {getResourceUrl, getResourceMIMEType} from '../utils/resource-utils';
 import {compareMIMETypes} from '../utils/mime-type-utils';
 import {getRegisteredLoaders} from './register-loaders';
 import {isBlob} from '../../javascript-utils/is-type';
 import {stripQueryString} from '../utils/url-utils';
-import {TypedArray} from '@loaders.gl/schema';
 
 const EXT_PATTERN = /\.([^.]+)$/;