@loaders.gl/core 5.0.0-alpha.11 → 5.0.0-alpha.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/core",
-  "version": "5.0.0-alpha.11",
+  "version": "5.0.0-alpha.13",
   "description": "The core API for working with loaders.gl loaders and writers",
   "license": "MIT",
   "type": "module",
@@ -33,36 +33,126 @@
       "import": "./dist/index.js",
       "require": "./dist/index.cjs"
     },
+    "./loader-utils": {
+      "types": "./dist/loader-utils/index.d.ts",
+      "import": "./dist/loader-utils/index.js",
+      "require": "./dist/loader-utils/index.cjs"
+    },
+    "./worker-utils": {
+      "types": "./dist/worker-utils/index.d.ts",
+      "import": "./dist/worker-utils/index.js",
+      "require": "./dist/worker-utils/index.cjs"
+    },
+    "./worker-utils/null-worker.js": {
+      "import": "./dist/worker-utils/null-worker.js"
+    },
+    "./worker-utils/null-worker-node.js": {
+      "import": "./dist/worker-utils/null-worker-node.js"
+    },
     "./null-worker.js": {
       "import": "./dist/null-worker.js"
     },
     "./null-worker-node.js": {
       "import": "./dist/null-worker-node.js"
+    },
+    "./polyfills": {
+      "types": "./dist/polyfills/index.d.ts",
+      "browser": "./dist/polyfills/index.browser.js",
+      "import": "./dist/polyfills/index.js",
+      "require": "./dist/polyfills/index.cjs"
+    },
+    "./schema": {
+      "types": "./dist/schema/index.d.ts",
+      "import": "./dist/schema/index.js",
+      "require": "./dist/schema/index.cjs"
+    },
+    "./schema-utils": {
+      "types": "./dist/schema-utils/index.d.ts",
+      "import": "./dist/schema-utils/index.js",
+      "require": "./dist/schema-utils/index.cjs"
+    },
+    "./schema/geospatial-metadata-zod-schema": {
+      "types": "./dist/schema/geospatial-metadata-zod-schema.d.ts",
+      "import": "./dist/schema/geospatial-metadata-zod-schema.js",
+      "require": "./dist/schema/geospatial-metadata-zod-schema.cjs"
+    },
+    "./schema/geoparquet.schema.json": "./dist/schema/geoparquet.schema.json",
+    "./schema/geoarrow-metadata.schema.json": "./dist/schema/geoarrow-metadata.schema.json",
+    "./schema-utils/arrow-transport": {
+      "types": "./dist/schema-utils/arrow-transport.d.ts",
+      "import": "./dist/schema-utils/arrow-transport.js",
+      "require": "./dist/schema-utils/arrow-transport.cjs"
     }
   },
-  "sideEffects": false,
+  "sideEffects": [
+    "./dist/polyfills/index.js",
+    "./dist/polyfills/index.cjs",
+    "./dist/polyfills/index.browser.js",
+    "./src/polyfills/index.ts",
+    "./src/polyfills/index.browser.ts"
+  ],
   "browser": {
+    "./dist/loader-utils/lib/node/buffer.js": "./dist/loader-utils/lib/node/buffer.browser.js",
+    "./dist/loader-utils/lib/node/stream.js": "./dist/loader-utils/lib/node/stream.browser.js",
+    "./dist/polyfills/index.cjs": "./dist/polyfills/index.browser.js",
+    "./dist/polyfills/index.js": "./dist/polyfills/index.browser.js",
+    "./dist/polyfills/load-library/require-utils.node.js": false,
+    "./dist/worker-utils/lib/node/worker_threads.js": "./dist/worker-utils/lib/node/worker_threads-browser.js",
+    "./dist/worker-utils/lib/process-utils/child-process-proxy.js": "./dist/worker-utils/lib/process-utils/child-process-proxy.browser.js",
+    "./src/loader-utils/lib/node/buffer.ts": "./src/loader-utils/lib/node/buffer.browser.ts",
+    "./src/loader-utils/lib/node/stream.ts": "./src/loader-utils/lib/node/stream.browser.ts",
+    "./src/polyfills/index.ts": "./src/polyfills/index.browser.ts",
+    "./src/polyfills/load-library/require-utils.node.ts": false,
+    "./src/worker-utils/lib/node/worker_threads.ts": "./src/worker-utils/lib/node/worker_threads-browser.ts",
+    "./src/worker-utils/lib/process-utils/child-process-proxy.ts": "./src/worker-utils/lib/process-utils/child-process-proxy.browser.ts",
+    "child_process": false,
     "fs": false,
+    "module": false,
+    "path": false,
     "stream": false
   },
   "files": [
     "src",
     "dist",
-    "README.md"
+    "README.md",
+    "SCHEMA-README.md",
+    "SCHEMA-UTILS-README.md"
   ],
   "scripts": {
-    "pre-build": "npm run build-bundle && npm run build-bundle-dev && npm run build-worker && npm run build-worker-node",
+    "pre-build": "npm run build-bundle && npm run build-bundle-dev && npm run build-worker && npm run build-worker-node && npm run build-worker-utils-worker && npm run build-worker-utils-worker-node && npm run build-polyfills-node-entrypoint && npm run build-schema-subpaths && npm run generate-json-schema",
     "build-bundle": "ocular-bundle ./bundle.ts --output=dist/dist.min.js",
     "build-bundle-dev": "ocular-bundle ./bundle.ts --env=dev --output=dist/dist.dev.js",
     "build-worker": "esbuild src/workers/null-worker.ts --outfile=dist/null-worker.js --bundle --target=esnext --define:__VERSION__=\\\"$npm_package_version\\\"",
-    "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\\\""
+    "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\\\"",
+    "build-worker-utils-worker": "esbuild src/worker-utils/workers/null-worker.ts --outfile=dist/worker-utils/null-worker.js --target=esnext --bundle --sourcemap --define:__VERSION__=\\\"$npm_package_version\\\"",
+    "build-worker-utils-worker-node": "esbuild src/worker-utils/workers/null-worker.ts --outfile=dist/worker-utils/null-worker-node.js --platform=node --target=node16 --bundle --sourcemap --define:__VERSION__=\\\"$npm_package_version\\\"",
+    "build-polyfills-node-entrypoint": "esbuild src/polyfills/index.ts --bundle --packages=external --platform=node --format=cjs --outfile=dist/polyfills/index.cjs",
+    "build-schema-subpaths": "esbuild src/schema/index.ts --bundle --packages=external --platform=node --format=cjs --outfile=dist/schema/index.cjs && esbuild src/schema/geospatial-metadata-zod-schema.ts --bundle --packages=external --platform=node --format=cjs --outfile=dist/schema/geospatial-metadata-zod-schema.cjs && esbuild src/schema-utils/index.ts --bundle --packages=external --platform=node --format=cjs --outfile=dist/schema-utils/index.cjs && esbuild src/schema-utils/arrow-transport.ts --bundle --packages=external --platform=node --format=cjs --outfile=dist/schema-utils/arrow-transport.cjs",
+    "generate-json-schema": "node ../../scripts/generate-json-schema.mjs --schema ./dist/schema/geospatial-metadata-zod-schema.js --export GeoParquetMetadataSchema --output ./dist/schema/geoparquet.schema.json --id https://unpkg.com/@loaders.gl/core/schema/geoparquet.schema.json --title 'loaders.gl GeoParquet metadata' && node ../../scripts/generate-json-schema.mjs --schema ./dist/schema/geospatial-metadata-zod-schema.js --export GeoArrowMetadataSchema --output ./dist/schema/geoarrow-metadata.schema.json --id https://unpkg.com/@loaders.gl/core/schema/geoarrow-metadata.schema.json --title 'loaders.gl GeoArrow field metadata'"
   },
   "dependencies": {
-    "@loaders.gl/loader-utils": "5.0.0-alpha.11",
-    "@loaders.gl/schema": "5.0.0-alpha.11",
-    "@loaders.gl/schema-utils": "5.0.0-alpha.11",
-    "@loaders.gl/worker-utils": "5.0.0-alpha.11",
-    "@probe.gl/log": "^4.1.1"
+    "@math.gl/core": "5.0.0-alpha.19",
+    "@math.gl/geospatial": "5.0.0-alpha.19",
+    "@types/geojson": "^7946.0.7",
+    "apache-arrow": ">= 17.0.0",
+    "probe.gl": "^5.0.0",
+    "zod": "^4.1.12"
+  },
+  "gitHead": "1464ee8e912521b658a51f96c88c3b2310ceb2cd",
+  "peerDependencies": {
+    "get-pixels": "^3.3.3",
+    "ndarray": "^1.0.19",
+    "save-pixels": "^2.3.6"
   },
-  "gitHead": "31449661e98c1c3f97bb4f8a7bcba7f19596ac00"
+  "peerDependenciesMeta": {
+    "get-pixels": {
+      "optional": true
+    },
+    "ndarray": {
+      "optional": true
+    },
+    "save-pixels": {
+      "optional": true
+    }
+  }
 }

package/src/index.ts

@@ -19,8 +19,8 @@ export type {
   Stat,
   FileSystem,
   RandomAccessFileSystem
-} from '@loaders.gl/loader-utils';
-export type {SourceLoader} from '@loaders.gl/loader-utils';
+} from '@loaders.gl/core/loader-utils';
+export type {SourceLoader} from '@loaders.gl/core/loader-utils';
 
 // FILE READING AND WRITING
 export {fetchFile} from './lib/fetch/fetch-file';
@@ -56,8 +56,8 @@ 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';
+export {setPathPrefix, getPathPrefix, resolvePath} from '@loaders.gl/core/loader-utils';
+export {RequestScheduler} from '@loaders.gl/core/loader-utils';
 
 // ITERATOR UTILS
 export {makeIterator} from './iterators/make-iterator/make-iterator';
@@ -65,7 +65,7 @@ export {makeStream} from './iterators/make-stream/make-stream';
 
 // CORE LOADERS
 export {NullLoader} from './null-loader';
-export {JSONLoader} from '@loaders.gl/loader-utils';
+export {JSONLoader} from '@loaders.gl/core/loader-utils';
 
 // EXPERIMENTAL
 export {fetchProgress as _fetchProgress} from './lib/progress/fetch-progress';
@@ -78,16 +78,16 @@ export {_unregisterLoaders} from './lib/api/register-loaders';
 // TODO - MOVE TO LOADER-UTILS AND DEPRECATE IN CORE?
 //
 
-export {isBrowser, isWorker, self, window, global, document} from '@loaders.gl/loader-utils';
-export {assert} from '@loaders.gl/loader-utils';
-export {forEach, concatenateArrayBuffersAsync} from '@loaders.gl/loader-utils';
+export {isBrowser, isWorker, self, window, global, document} from '@loaders.gl/core/loader-utils';
+export {assert} from '@loaders.gl/core/loader-utils';
+export {forEach, concatenateArrayBuffersAsync} from '@loaders.gl/core/loader-utils';
 
 export {
   makeTextDecoderIterator,
   makeTextEncoderIterator,
   makeLineIterator,
   makeNumberedLineIterator
-} from '@loaders.gl/loader-utils';
+} from '@loaders.gl/core/loader-utils';
 
 // "JAVASCRIPT" UTILS - move to loader-utils?
 export {
@@ -99,7 +99,7 @@ export {
   isResponse,
   isReadableStream,
   isWritableStream
-} from '@loaders.gl/loader-utils';
+} from '@loaders.gl/core/loader-utils';
 
 // DEPRECATED EXPORTS
 /** @deprecated Use NullLoader. */

package/src/iterators/make-iterator/make-iterator.ts

@@ -9,7 +9,7 @@ import {makeArrayBufferIterator} from './make-array-buffer-iterator';
 import {makeBlobIterator} from './make-blob-iterator';
 import type {StreamIteratorOptions} from './make-stream-iterator';
 import {makeStreamIterator} from './make-stream-iterator';
-import {isBlob, isReadableStream, isResponse} from '@loaders.gl/loader-utils';
+import {isBlob, isReadableStream, isResponse} from '@loaders.gl/core/loader-utils';
 
 /**
  * @param [options.chunkSize]

package/src/iterators/make-iterator/make-stream-iterator.ts

@@ -3,7 +3,7 @@
 // Copyright (c) vis.gl contributors
 
 import type {Readable} from 'stream';
-import {isBrowser, toArrayBuffer} from '@loaders.gl/loader-utils';
+import {isBrowser, toArrayBuffer} from '@loaders.gl/core/loader-utils';
 
 export type StreamIteratorOptions = {
   _streamReadAhead?: boolean;

package/src/iterators/make-iterator/make-string-iterator.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {ensureArrayBuffer} from '@loaders.gl/loader-utils';
+import {ensureArrayBuffer} from '@loaders.gl/core/loader-utils';
 import type {IteratorOptions} from './make-iterator';
 
 const DEFAULT_CHUNK_SIZE = 256 * 1024;

package/src/lib/api/core-api.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import type {CoreAPI} from '@loaders.gl/loader-utils';
+import type {CoreAPI} from '@loaders.gl/core/loader-utils';
 import {fetchFile} from '../fetch/fetch-file';
 import {parse} from './parse';
 import {parseFile} from './parse-file';

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

@@ -6,8 +6,8 @@ import {
   SourceLoader,
   SourceArrayOptionsType,
   SourceArrayDataSourceType
-} from '@loaders.gl/loader-utils';
-import {resolveAuthenticationOptions} from '@loaders.gl/loader-utils';
+} from '@loaders.gl/core/loader-utils';
+import {resolveAuthenticationOptions} from '@loaders.gl/core/loader-utils';
 import {coreApi} from './core-api';
 import {selectLoaderSync} from './select-loader';
 

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

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

package/src/lib/api/encode.ts

@@ -8,15 +8,15 @@ import type {
   WriterOptionsType,
   WriterDataType,
   WriterBatchType
-} from '@loaders.gl/loader-utils';
+} from '@loaders.gl/core/loader-utils';
 import {
   canEncodeWithWorker,
   NodeFile,
   resolvePath,
   isBrowser,
   ensureArrayBuffer
-} from '@loaders.gl/loader-utils';
-import {processOnWorker} from '@loaders.gl/worker-utils';
+} from '@loaders.gl/core/loader-utils';
+import {processOnWorker} from '@loaders.gl/core/worker-utils';
 import {fetchFile} from '../fetch/fetch-file';
 import {getLoaderOptions} from './loader-options';
 

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

@@ -11,8 +11,8 @@ import type {
   LoaderOptionsType,
   LoaderOptionsWithShape,
   LoaderShapeType
-} from '@loaders.gl/loader-utils';
-import {resolveLoaderAuthenticationOptions} from '@loaders.gl/loader-utils';
+} from '@loaders.gl/core/loader-utils';
+import {resolveLoaderAuthenticationOptions} from '@loaders.gl/core/loader-utils';
 import {isLoaderObject} from '../loader-utils/normalize-loader';
 import {getFetchFunction} from '../loader-utils/get-fetch-function';
 import {applySearchParamsToUrl} from '../loader-utils/option-utils';

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

@@ -2,13 +2,13 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {isSourceLoader, mergeOptions} from '@loaders.gl/loader-utils';
+import {isSourceLoader, mergeOptions} from '@loaders.gl/core/loader-utils';
 import type {
   Loader,
   LoaderOptions,
   LoaderWithParser,
   StrictLoaderOptions
-} from '@loaders.gl/loader-utils';
+} from '@loaders.gl/core/loader-utils';
 
 const loaderImplementationPromises = new Map<Loader, Map<string, Promise<LoaderWithParser>>>();
 const loaderImplementations = new Map<Loader, Map<string, LoaderWithParser>>();

package/src/lib/api/load.ts

@@ -18,13 +18,13 @@ import type {
   SourceArrayOptionsType,
   DataSourceOptions,
   LoaderWithParser
-} from '@loaders.gl/loader-utils';
+} from '@loaders.gl/core/loader-utils';
 import {
   isBlob,
   isSourceLoader,
   resolveAuthenticationOptions,
   resolveLoaderAuthenticationOptions
-} from '@loaders.gl/loader-utils';
+} from '@loaders.gl/core/loader-utils';
 import {isLoaderObject} from '../loader-utils/normalize-loader';
 import {getFetchFunction} from '../loader-utils/get-fetch-function';
 import {

package/src/lib/api/parse-file.ts

@@ -15,13 +15,13 @@ import type {
   LoaderWithParser,
   ReadableFile,
   StrictLoaderOptions
-} from '@loaders.gl/loader-utils';
+} from '@loaders.gl/core/loader-utils';
 import {
   isSourceLoader,
   mergeOptions,
   resolveLoaderAuthenticationOptions
-} from '@loaders.gl/loader-utils';
-import {validateWorkerVersion} from '@loaders.gl/worker-utils';
+} from '@loaders.gl/core/loader-utils';
+import {validateWorkerVersion} from '@loaders.gl/core/worker-utils';
 import {isLoaderObject} from '../loader-utils/normalize-loader';
 import {normalizeOptions} from '../loader-utils/option-utils';
 import {getLoaderContext, getLoadersFromContext} from '../loader-utils/loader-context';

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

@@ -2,9 +2,8 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import type {Batch} from '@loaders.gl/schema';
-import {isTable, makeBatchFromTable} from '@loaders.gl/schema-utils';
-import {resolveLoaderAuthenticationOptions} from '@loaders.gl/loader-utils';
+import type {Batch, Table} from '@loaders.gl/core/schema';
+import {resolveLoaderAuthenticationOptions} from '@loaders.gl/core/loader-utils';
 import type {
   Loader,
   LoaderWithParser,
@@ -19,13 +18,13 @@ import type {
   LoaderArrayOptionsType,
   LoaderArrayBatchType,
   TransformBatches
-} from '@loaders.gl/loader-utils';
+} from '@loaders.gl/core/loader-utils';
 import {
   canParseWithWorker,
   concatenateArrayBuffersAsync,
   isBrowser,
   parseWithWorkerInBatches
-} from '@loaders.gl/loader-utils';
+} from '@loaders.gl/core/loader-utils';
 import {isLoaderObject} from '../loader-utils/normalize-loader';
 import {normalizeOptions} from '../loader-utils/option-utils';
 import {getLoaderContext} from '../loader-utils/loader-context';
@@ -236,7 +235,7 @@ async function* parseChunkInBatches(
 function convertDataToBatch(parsedData: unknown, loader: Loader): Batch {
   // biome-ignore format: preserve intentional fixture layout
   const batch: Batch = isTable(parsedData)
-    ? makeBatchFromTable(parsedData)
+    ? {...parsedData, length: getTableLength(parsedData), batchType: 'data'}
     : {
       shape: 'unknown',
       batchType: 'data',
@@ -249,6 +248,45 @@ function convertDataToBatch(parsedData: unknown, loader: Loader): Batch {
   return batch;
 }
 
+/** Checks whether parsed data follows one of the core table shapes. */
+function isTable(value: unknown): value is Table {
+  if (!value || typeof value !== 'object' || !('shape' in value)) {
+    return false;
+  }
+  const table = value as Partial<Table>;
+  switch (table.shape) {
+    case 'array-row-table':
+    case 'object-row-table':
+      return Array.isArray(table.data);
+    case 'geojson-table':
+      return Array.isArray(table.features);
+    case 'columnar-table':
+      return Boolean(table.data && typeof table.data === 'object');
+    case 'arrow-table':
+      return Boolean(table.data && typeof table.data === 'object' && 'numRows' in table.data);
+    default:
+      return false;
+  }
+}
+
+/** Returns the row count for a table-shaped parse result. */
+function getTableLength(table: Table): number {
+  switch (table.shape) {
+    case 'array-row-table':
+    case 'object-row-table':
+      return table.data.length;
+    case 'geojson-table':
+      return table.features.length;
+    case 'arrow-table':
+      return table.data.numRows;
+    case 'columnar-table':
+      for (const column of Object.values(table.data)) {
+        return column.length || 0;
+      }
+      return 0;
+  }
+}
+
 /**
  * Create an iterator chain with any transform iterators (crypto, decompression)
  * @param inputIterator

package/src/lib/api/parse-sync.ts

@@ -15,8 +15,8 @@ import type {
   LoaderArrayOptionsType,
   LoaderArrayReturnType,
   StrictLoaderOptions
-} from '@loaders.gl/loader-utils';
-import {isSourceLoader} from '@loaders.gl/loader-utils';
+} from '@loaders.gl/core/loader-utils';
+import {isSourceLoader} from '@loaders.gl/core/loader-utils';
 import {selectLoaderSync} from './select-loader';
 import {isLoaderObject} from '../loader-utils/normalize-loader';
 import {normalizeOptions} from '../loader-utils/option-utils';

package/src/lib/api/parse.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {resolveLoaderAuthenticationOptions} from '@loaders.gl/loader-utils';
+import {resolveLoaderAuthenticationOptions} from '@loaders.gl/core/loader-utils';
 import type {
   Loader,
   LoaderContext,
@@ -16,7 +16,7 @@ import type {
   LoaderArrayOptionsType,
   LoaderArrayReturnType,
   StrictLoaderOptions
-} from '@loaders.gl/loader-utils';
+} from '@loaders.gl/core/loader-utils';
 import {
   parseWithWorker,
   shouldParseWithWorker,
@@ -24,8 +24,8 @@ import {
   isResponse,
   isBlob,
   isSourceLoader
-} from '@loaders.gl/loader-utils';
-import {validateWorkerVersion} from '@loaders.gl/worker-utils';
+} from '@loaders.gl/core/loader-utils';
+import {validateWorkerVersion} from '@loaders.gl/core/worker-utils';
 import {isLoaderObject} from '../loader-utils/normalize-loader';
 import {normalizeOptions} from '../loader-utils/option-utils';
 import {getArrayBufferOrStringFromData} from '../loader-utils/get-data';

package/src/lib/api/preload.ts

@@ -2,7 +2,12 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import type {Loader, LoaderOptions, LoaderWithParser, SourceLoader} from '@loaders.gl/loader-utils';
+import type {
+  Loader,
+  LoaderOptions,
+  LoaderWithParser,
+  SourceLoader
+} from '@loaders.gl/core/loader-utils';
 import {
   getLoaderImplementation,
   getLoaderImplementationSync,

package/src/lib/api/register-loaders.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {Loader} from '@loaders.gl/loader-utils';
+import {Loader} from '@loaders.gl/core/loader-utils';
 import {normalizeLoader} from '../loader-utils/normalize-loader';
 import {getGlobalLoaderState} from '../loader-utils/option-utils';
 

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

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import type {LoaderContext, LoaderOptions, Loader, DataType} from '@loaders.gl/loader-utils';
+import type {LoaderContext, LoaderOptions, Loader, DataType} from '@loaders.gl/core/loader-utils';
 import {
   compareArrayBuffers,
   path,
@@ -11,8 +11,8 @@ import {
   ensureArrayBuffer,
   isArrayBufferLike,
   isSourceLoader
-} from '@loaders.gl/loader-utils';
-import {TypedArray} from '@loaders.gl/schema';
+} from '@loaders.gl/core/loader-utils';
+import {TypedArray} from '@loaders.gl/core/schema';
 import {normalizeLoader} from '../loader-utils/normalize-loader';
 import {normalizeLoaderOptions} from '../loader-utils/option-utils';
 import {getResourceUrl, getResourceMIMEType} from '../utils/resource-utils';

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

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import type {SourceLoader} from '@loaders.gl/loader-utils';
+import type {SourceLoader} from '@loaders.gl/core/loader-utils';
 import {selectLoaderSync} from './select-loader';
 
 /** Guess service type from URL */

package/src/lib/common.ts

@@ -2,4 +2,4 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-export type {LoaderWithParser} from '@loaders.gl/loader-utils';
+export type {LoaderWithParser} from '@loaders.gl/core/loader-utils';

package/src/lib/fetch/fetch-file.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {resolvePath} from '@loaders.gl/loader-utils';
+import {resolvePath} from '@loaders.gl/core/loader-utils';
 import {makeResponse} from '../utils/response-utils';
 // import {FetchError} from './fetch-error';
 
@@ -36,7 +36,7 @@ export async function fetchFile(
         return globalThis.loaders?.fetchNode(url, fetchOptions);
       }
       // throw new Error(
-      //   'fetchFile: globalThis.loaders.fetchNode not defined. Install @loaders.gl/polyfills'
+      //   'fetchFile: globalThis.loaders.fetchNode not defined. Install @loaders.gl/core/polyfills'
       // );
     }
 

package/src/lib/filesystems/browser-filesystem.ts

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import type {FileSystem, ReadableFile} from '@loaders.gl/loader-utils';
-import {BlobFile} from '@loaders.gl/loader-utils';
+import type {FileSystem, ReadableFile} from '@loaders.gl/core/loader-utils';
+import {BlobFile} from '@loaders.gl/core/loader-utils';
 
 type BrowserFileSystemOptions = {
   fetch?: typeof fetch;

package/src/lib/init.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {log} from '@loaders.gl/loader-utils';
+import {log} from '@loaders.gl/core/loader-utils';
 
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
 const version = typeof __VERSION__ !== 'undefined' ? __VERSION__ : '';

package/src/lib/loader-utils/get-data.ts

@@ -8,7 +8,7 @@ import type {
   BatchableDataType,
   Loader,
   LoaderOptions
-} from '@loaders.gl/loader-utils';
+} from '@loaders.gl/core/loader-utils';
 import {
   concatenateArrayBuffersAsync,
   isPromise,
@@ -22,7 +22,7 @@ import {
   isArrayBufferLike,
   toArrayBuffer,
   toArrayBufferView
-} from '@loaders.gl/loader-utils';
+} from '@loaders.gl/core/loader-utils';
 import {makeIterator} from '../../iterators/make-iterator/make-iterator';
 import {checkResponse, makeResponse} from '../utils/response-utils';
 

package/src/lib/loader-utils/get-fetch-function.ts

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import type {LoaderContext, LoaderOptions, FetchLike} from '@loaders.gl/loader-utils';
-import {createAuthenticatedFetch, isObject} from '@loaders.gl/loader-utils';
+import type {LoaderContext, LoaderOptions, FetchLike} from '@loaders.gl/core/loader-utils';
+import {createAuthenticatedFetch, isObject} from '@loaders.gl/core/loader-utils';
 import {fetchFile} from '../fetch/fetch-file';
 import {getGlobalLoaderOptions} from './option-utils';
 

package/src/lib/loader-utils/loader-context.ts

@@ -2,10 +2,10 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import type {Loader, LoaderContext, StrictLoaderOptions} from '@loaders.gl/loader-utils';
+import type {Loader, LoaderContext, StrictLoaderOptions} from '@loaders.gl/core/loader-utils';
 import {getFetchFunction} from './get-fetch-function';
 import {extractQueryString, stripQueryString} from '../utils/url-utils';
-import {path} from '@loaders.gl/loader-utils';
+import {path} from '@loaders.gl/core/loader-utils';
 import {coreApi} from '../api/core-api';
 
 /** Properties for creating an updated context */

package/src/lib/loader-utils/loggers.ts

@@ -4,7 +4,7 @@
 
 // probe.gl Log compatible loggers
 
-import {Log} from '@probe.gl/log';
+import {Log} from 'probe.gl/log';
 
 /** Default probe.gl logger used by loaders.gl. */
 export const probeLog = new Log({id: 'loaders.gl'});