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

package/dist/loader-utils/lib/sources/data-source-manager.js

@@ -0,0 +1,376 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+/**
+ * Manages shared DataSource instances and notifies consumers when they become available or change.
+ */
+export class DataSourceManager {
+    /** Protocol used to refer to deferred DataSource ids. */
+    protocol;
+    /** Managed DataSource entries keyed by normalized DataSource id. */
+    dataSources = Object.create(null);
+    /** Consumer subscriptions keyed by consumer id. */
+    consumers = Object.create(null);
+    /** Generated DataSource ids keyed by object identity for non-string inputs. */
+    dataSourceIds = new WeakMap();
+    /** Monotonic counter used to create stable object-identity DataSource ids. */
+    nextDataSourceId = 0;
+    /** Pending prune timer used to batch unsubscribe cleanup. */
+    pruneRequest = null;
+    /** Creates a DataSourceManager with an optional deferred DataSource URL protocol. */
+    constructor(props = {}) {
+        this.protocol = props.protocol || 'datasource://';
+    }
+    /** Returns true if the id is registered or uses the deferred DataSource protocol. */
+    contains(dataSourceId) {
+        if (dataSourceId.startsWith(this.protocol)) {
+            return true;
+        }
+        return dataSourceId in this.dataSources;
+    }
+    /** Lists managed registrations in insertion order for source discovery and diagnostics. */
+    listDataSources() {
+        return Object.freeze(Object.values(this.dataSources).map(dataSourceEntry => dataSourceEntry.getInfo()));
+    }
+    /** Discovers picker-ready scan metadata without exposing or retaining owned source instances. */
+    async discoverDataSources(options = {}) {
+        const discoveries = await Promise.all(Object.values(this.dataSources).map(async (dataSourceEntry) => {
+            const info = dataSourceEntry.getInfo();
+            if (info.status !== 'ready') {
+                return Object.freeze({ ...info, compatible: false });
+            }
+            const dataSource = dataSourceEntry.getDataSource();
+            if (typeof dataSource.getQueryMetadata !== 'function') {
+                return Object.freeze({ ...info, compatible: false });
+            }
+            try {
+                const queryMetadata = await dataSource.getQueryMetadata({ signal: options.signal });
+                const executionMethod = queryMetadata.execution.status === 'supported'
+                    ? queryMetadata.execution.method
+                    : undefined;
+                const compatible = (!options.queryType || queryMetadata.queryType === options.queryType) &&
+                    executionMethod !== undefined &&
+                    typeof dataSource[executionMethod] ===
+                        'function';
+                return Object.freeze({ ...info, compatible, queryMetadata });
+            }
+            catch (discoveryError) {
+                if (options.signal?.aborted) {
+                    throw options.signal.reason || new DOMException('Aborted', 'AbortError');
+                }
+                return Object.freeze({ ...info, compatible: false, discoveryError });
+            }
+        }));
+        return Object.freeze(discoveries);
+    }
+    /** Adds or replaces a managed DataSource. */
+    add({ dataSourceId, dataSource, forceUpdate = false, persistent = true }) {
+        const normalizedDataSourceId = this.normalizeDataSourceId(dataSourceId);
+        let dataSourceEntry = this.dataSources[normalizedDataSourceId];
+        if (dataSourceEntry) {
+            dataSourceEntry.setDataSource(dataSource, forceUpdate);
+        }
+        else {
+            dataSourceEntry = new ManagedDataSourceEntry(normalizedDataSourceId, dataSource);
+            this.dataSources[normalizedDataSourceId] = dataSourceEntry;
+        }
+        dataSourceEntry.persistent = persistent;
+    }
+    /** Returns an existing DataSource for the same key, or creates and retains a new one. */
+    getOrCreate({ dataSourceId, data, createDataSource, persistent = true }) {
+        const normalizedDataSourceId = this.resolveDataSourceId(dataSourceId, data);
+        let dataSourceEntry = this.dataSources[normalizedDataSourceId];
+        if (!dataSourceEntry) {
+            dataSourceEntry = new ManagedDataSourceEntry(normalizedDataSourceId, createDataSource(data));
+            dataSourceEntry.persistent = persistent;
+            this.dataSources[normalizedDataSourceId] = dataSourceEntry;
+        }
+        else if (dataSourceEntry.isPlaceholder()) {
+            dataSourceEntry.setDataSource(createDataSource(data));
+            dataSourceEntry.persistent = persistent;
+        }
+        dataSourceEntry.retain();
+        return dataSourceEntry.getDataSource();
+    }
+    /** Removes a managed DataSource and releases its lifecycle resources. */
+    async remove(dataSourceId) {
+        const normalizedDataSourceId = this.normalizeDataSourceId(dataSourceId);
+        const dataSourceEntry = this.dataSources[normalizedDataSourceId];
+        if (dataSourceEntry) {
+            delete this.dataSources[normalizedDataSourceId];
+            await dataSourceEntry.delete();
+        }
+    }
+    /** Releases one retained DataSource reference created by getOrCreate(). */
+    async release(dataSourceId) {
+        const normalizedDataSourceId = this.normalizeDataSourceId(dataSourceId);
+        const dataSourceEntry = this.dataSources[normalizedDataSourceId];
+        if (dataSourceEntry) {
+            dataSourceEntry.release();
+            if (!dataSourceEntry.isRetained() && !dataSourceEntry.inUse()) {
+                delete this.dataSources[normalizedDataSourceId];
+                await dataSourceEntry.delete();
+            }
+        }
+    }
+    /** Unsubscribes all requests made by one consumer. */
+    unsubscribe({ consumerId }) {
+        const consumer = this.consumers[consumerId];
+        if (consumer) {
+            for (const requestId in consumer) {
+                const request = consumer[requestId];
+                const dataSourceEntry = this.dataSources[request.dataSourceId];
+                dataSourceEntry?.unsubscribe(request);
+            }
+            delete this.consumers[consumerId];
+            this.prune();
+        }
+    }
+    /** Subscribes a consumer to a managed DataSource. */
+    subscribe({ dataSourceId, onChange, consumerId, requestId = 'default' }) {
+        const normalizedDataSourceId = this.normalizeDataSourceId(dataSourceId);
+        if (dataSourceId.startsWith(this.protocol) && !this.dataSources[normalizedDataSourceId]) {
+            this.add({ dataSourceId: normalizedDataSourceId, dataSource: null, persistent: false });
+        }
+        const dataSourceEntry = this.dataSources[normalizedDataSourceId];
+        this.track(consumerId, requestId, dataSourceEntry, onChange);
+        return dataSourceEntry?.getDataSource();
+    }
+    /** Schedules pruning of unused non-persistent DataSources. */
+    prune() {
+        if (!this.pruneRequest) {
+            this.pruneRequest = setTimeout(() => void this.pruneNow(), 0);
+        }
+    }
+    /** Releases all managed DataSources and clears all subscriptions. */
+    async finalize() {
+        if (this.pruneRequest) {
+            clearTimeout(this.pruneRequest);
+            this.pruneRequest = null;
+        }
+        const dataSources = this.dataSources;
+        this.dataSources = Object.create(null);
+        this.consumers = Object.create(null);
+        await Promise.all(Object.values(dataSources).map(dataSourceEntry => dataSourceEntry.delete()));
+    }
+    /** Removes the deferred DataSource protocol prefix from a DataSource id. */
+    normalizeDataSourceId(dataSourceId) {
+        return dataSourceId.startsWith(this.protocol)
+            ? dataSourceId.slice(this.protocol.length)
+            : dataSourceId;
+    }
+    /** Resolves an explicit or data-derived DataSource id for deduplicated creation. */
+    resolveDataSourceId(dataSourceId, data) {
+        if (dataSourceId) {
+            return this.normalizeDataSourceId(dataSourceId);
+        }
+        if (typeof data === 'string') {
+            return this.normalizeDataSourceId(data);
+        }
+        if (data && typeof data === 'object') {
+            let objectDataSourceId = this.dataSourceIds.get(data);
+            if (!objectDataSourceId) {
+                objectDataSourceId = `object:${this.nextDataSourceId++}`;
+                this.dataSourceIds.set(data, objectDataSourceId);
+            }
+            return objectDataSourceId;
+        }
+        throw new Error('DataSourceManager.getOrCreate requires dataSourceId or data.');
+    }
+    /** Tracks one consumer request against one managed DataSource entry. */
+    track(consumerId, requestId, dataSourceEntry, onChange) {
+        this.consumers[consumerId] = this.consumers[consumerId] || Object.create(null);
+        const consumer = this.consumers[consumerId];
+        let request = consumer[requestId];
+        const oldDataSourceEntry = request?.dataSourceId && this.dataSources[request.dataSourceId];
+        if (oldDataSourceEntry) {
+            oldDataSourceEntry.unsubscribe(request);
+            this.prune();
+        }
+        if (dataSourceEntry) {
+            if (request) {
+                request.onChange = onChange;
+                request.dataSourceId = dataSourceEntry.id;
+            }
+            else {
+                request = { onChange, dataSourceId: dataSourceEntry.id };
+            }
+            consumer[requestId] = request;
+            dataSourceEntry.subscribe(request);
+        }
+    }
+    /** Prunes unused non-persistent DataSources immediately. */
+    async pruneNow() {
+        this.pruneRequest = null;
+        const deletedDataSources = [];
+        for (const dataSourceId of Object.keys(this.dataSources)) {
+            const dataSourceEntry = this.dataSources[dataSourceId];
+            if (!dataSourceEntry.persistent &&
+                !dataSourceEntry.inUse() &&
+                !dataSourceEntry.isRetained()) {
+                delete this.dataSources[dataSourceId];
+                deletedDataSources.push(dataSourceEntry.delete());
+            }
+        }
+        await Promise.all(deletedDataSources);
+    }
+}
+/** Internal state for one managed DataSource. */
+class ManagedDataSourceEntry {
+    /** Stable DataSource id used by subscribers. */
+    id;
+    /** Whether the DataSource currently has a resolved value or error. */
+    isLoaded = false;
+    /** If false, the manager may prune the DataSource after all subscribers leave. */
+    persistent;
+    /** Number of retained callers currently using this DataSource. */
+    retainCount = 0;
+    /** Monotonic counter used to ignore stale promise resolutions. */
+    loadCount = 0;
+    /** Subscribers currently using this DataSource entry. */
+    subscribers = new Set();
+    /** Last DataSource value provided to this entry. */
+    dataSource;
+    /** Promise that tracks the active asynchronous DataSource resolution. */
+    loader;
+    /** Error from the latest asynchronous DataSource resolution. */
+    error;
+    /** Resolved DataSource instance, or null for an unresolved placeholder. */
+    content = null;
+    /** Creates a managed DataSource entry. */
+    constructor(id, dataSource) {
+        this.id = id;
+        this.setDataSource(dataSource);
+    }
+    /** Adds a subscriber to this DataSource. */
+    subscribe(consumer) {
+        this.subscribers.add(consumer);
+    }
+    /** Removes a subscriber from this DataSource. */
+    unsubscribe(consumer) {
+        this.subscribers.delete(consumer);
+    }
+    /** Returns true when at least one subscriber is using this DataSource. */
+    inUse() {
+        return this.subscribers.size > 0;
+    }
+    /** Increments the retained caller count. */
+    retain() {
+        this.retainCount++;
+    }
+    /** Decrements the retained caller count. */
+    release() {
+        this.retainCount = Math.max(this.retainCount - 1, 0);
+    }
+    /** Returns true when at least one caller retained this DataSource. */
+    isRetained() {
+        return this.retainCount > 0;
+    }
+    /** Returns an immutable public snapshot of this entry's lifecycle state. */
+    getInfo() {
+        const status = !this.isLoaded
+            ? 'pending'
+            : this.error
+                ? 'error'
+                : this.isPlaceholder()
+                    ? 'placeholder'
+                    : 'ready';
+        return Object.freeze({
+            dataSourceId: this.id,
+            status,
+            persistent: this.persistent !== false,
+            subscriberCount: this.subscribers.size,
+            retainCount: this.retainCount,
+            ...(this.error ? { error: this.error } : {})
+        });
+    }
+    /** Releases this DataSource and clears its subscribers. */
+    async delete() {
+        this.loadCount++;
+        this.subscribers.clear();
+        const content = this.content;
+        this.content = null;
+        this.dataSource = null;
+        if (content) {
+            await closeDataSource(content);
+        }
+    }
+    /** Returns the current DataSource, placeholder, or pending DataSource promise. */
+    getDataSource() {
+        if (this.isLoaded) {
+            return this.error ? Promise.reject(this.error) : this.content;
+        }
+        return this.loader;
+    }
+    /** Returns true when this entry is an unresolved placeholder. */
+    isPlaceholder() {
+        return this.isLoaded && this.content === null && this.dataSource === null && !this.error;
+    }
+    /** Replaces the underlying DataSource and notifies subscribers. */
+    setDataSource(dataSource, forceUpdate) {
+        if (dataSource === this.dataSource && !forceUpdate) {
+            return;
+        }
+        const oldContent = this.content;
+        this.dataSource = dataSource;
+        this.content = null;
+        const loadCount = ++this.loadCount;
+        if (oldContent && oldContent !== dataSource) {
+            void closeDataSource(oldContent);
+        }
+        if (dataSource instanceof Promise) {
+            this.isLoaded = false;
+            this.loader = dataSource
+                .then(result => {
+                if (this.loadCount === loadCount) {
+                    this.isLoaded = true;
+                    this.error = undefined;
+                    this.content = result;
+                }
+                else {
+                    void closeDataSource(result);
+                }
+                return result;
+            })
+                .catch(error => {
+                const normalizedError = normalizeError(error);
+                if (this.loadCount === loadCount) {
+                    this.isLoaded = true;
+                    this.error = normalizedError;
+                }
+                throw normalizedError;
+            });
+            this.notifySubscribers();
+        }
+        else {
+            this.isLoaded = true;
+            this.loader = undefined;
+            this.error = undefined;
+            this.content = dataSource;
+            this.notifySubscribers();
+        }
+    }
+    /** Notifies all subscribers with the current DataSource value. */
+    notifySubscribers() {
+        for (const subscriber of this.subscribers) {
+            subscriber.onChange(this.getDataSource());
+        }
+    }
+}
+/** Converts thrown values to Error instances. */
+function normalizeError(error) {
+    return error instanceof Error ? error : new Error(String(error));
+}
+/** Releases a DataSource through the lifecycle method it implements. */
+async function closeDataSource(dataSource) {
+    if (typeof dataSource.close === 'function') {
+        await dataSource.close();
+    }
+    else if (typeof dataSource.finalize === 'function') {
+        await dataSource.finalize();
+    }
+    else if (typeof dataSource.destroy === 'function') {
+        await dataSource.destroy();
+    }
+}
+//# sourceMappingURL=data-source-manager.js.map

package/dist/loader-utils/lib/sources/data-source-manager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"data-source-manager.js","sourceRoot":"","sources":["../../../../src/loader-utils/lib/sources/data-source-manager.ts"],"names":[],"mappings":"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"}

package/dist/loader-utils/lib/sources/data-source.d.ts

@@ -0,0 +1,79 @@
+import type { Loader, LoaderContext, LoaderOptions, StrictLoaderOptions } from "../../loader-types.js";
+import type { BatchableDataType, DataType, SyncDataType } from "../../types.js";
+import type { ReadableFile } from "../files/file.js";
+/** Common properties for all data sources */
+export type DataSourceOptions = StrictLoaderOptions & {
+    /** Removed in v5. Pass parser options directly in their loader namespaces. */
+    loadOptions?: never;
+    core?: StrictLoaderOptions['core'] & {
+        /** Allows application to specify which source should be selected. Matches `Source.type`. Defaults to 'auto' */
+        type?: string;
+        /** Any dataset attributions (in case underlying metadata does not include attributions) */
+        attributions?: string[];
+        /** Removed in v5. Move these options to `core` and the root loader namespaces. */
+        loadOptions?: never;
+        /** Make additional loaders available to the data source */
+        loaders?: Loader[];
+        /** Called when source-level initialization or metadata loading fails. */
+        onError?: (error: Error, source: DataSource<any, any>) => void;
+    };
+};
+/** Runtime hooks injected when a DataSource is created through an integration layer such as `@loaders.gl/core`. */
+export type CoreAPI = Readonly<{
+    fetchFile: (urlOrData: string | Blob, fetchOptions?: RequestInit) => Promise<Response>;
+    parse: (data: DataType | Promise<DataType>, loaders?: Loader | Loader[] | LoaderOptions, options?: LoaderOptions, context?: LoaderContext) => Promise<unknown>;
+    parseFile: (file: ReadableFile, loaders?: Loader | Loader[] | LoaderOptions, options?: LoaderOptions, context?: LoaderContext) => Promise<unknown>;
+    parseSync: (data: SyncDataType, loaders?: Loader | Loader[] | LoaderOptions, options?: LoaderOptions, context?: LoaderContext) => unknown;
+    parseInBatches: (data: BatchableDataType, loaders?: Loader | Loader[] | LoaderOptions, options?: LoaderOptions, context?: LoaderContext) => Promise<AsyncIterable<unknown> | Iterable<unknown>>;
+    load: (url: string | DataType, loaders?: Loader[] | LoaderOptions | Loader, options?: LoaderOptions | LoaderContext, context?: LoaderContext) => Promise<unknown>;
+    loadInBatches: (files: string | File | Blob | Response | (string | File | Blob | Response)[] | FileList, loaders?: Loader[] | LoaderOptions | Loader, options?: LoaderOptions, context?: LoaderContext) => Promise<AsyncIterable<unknown>> | Promise<AsyncIterable<unknown>>[];
+}>;
+/** base class of all data sources */
+export declare abstract class DataSource<DataT, OptionsT extends DataSourceOptions> {
+    static defaultOptions: {
+        core: {
+            type: string;
+            attributions: never[];
+            loaders: never[];
+            onError: never;
+        };
+    };
+    optionsType?: OptionsT & DataSourceOptions;
+    options: Required<OptionsT & DataSourceOptions>;
+    readonly data: DataT;
+    readonly url: string;
+    /** Shared parser options derived from the source options, excluding source-only core controls. */
+    loadOptions: StrictLoaderOptions;
+    /** A resolved fetch function extracted from the shared core options. */
+    fetch: (url: string, options?: RequestInit) => Promise<Response>;
+    /** Shared source-level runtime hooks, when supplied by the source factory. */
+    readonly coreApi: CoreAPI;
+    /** Whether a real CoreAPI instance was injected by the integration layer. */
+    readonly hasCoreApi: boolean;
+    _needsRefresh: boolean;
+    constructor(data: DataT, options: OptionsT, defaultOptions?: Partial<OptionsT>, coreApi?: CoreAPI);
+    setProps(options: OptionsT): void;
+    /** Mark this data source as needing a refresh (redraw) */
+    setNeedsRefresh(): void;
+    /**
+     * Does this data source need refreshing?
+     * @note The specifics of the refresh mechanism depends on type of data source
+     */
+    getNeedsRefresh(clear?: boolean): boolean;
+    /** Reports a source-level failure through the configured callback or the shared logger. */
+    protected reportError(error: unknown, message: string): Error;
+}
+/**
+ * Gets the current fetch function from options
+ * @todo - move to loader-utils module
+ * @todo - use in core module counterpart
+ * @param options
+ * @param context
+ */
+export declare function getFetchFunction(options?: StrictLoaderOptions): import("../..").FetchLike;
+/**
+ * Derives parser options from flat source options without forwarding source controls to workers.
+ * Removed option wrappers are rejected so JavaScript callers receive actionable migration guidance.
+ */
+export declare function getSourceLoaderOptions(options: DataSourceOptions): StrictLoaderOptions;
+//# sourceMappingURL=data-source.d.ts.map

package/dist/loader-utils/lib/sources/data-source.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"data-source.d.ts","sourceRoot":"","sources":["../../../../src/loader-utils/lib/sources/data-source.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,mBAAmB,EAAC,8BAA2B;AAClG,OAAO,KAAK,EAAC,iBAAiB,EAAE,QAAQ,EAAE,YAAY,EAAC,uBAAoB;AAC3E,OAAO,KAAK,EAAC,YAAY,EAAC,yBAAsB;AAOhD,6CAA6C;AAC7C,MAAM,MAAM,iBAAiB,GAAG,mBAAmB,GAAG;IACpD,8EAA8E;IAC9E,WAAW,CAAC,EAAE,KAAK,CAAC;IACpB,IAAI,CAAC,EAAE,mBAAmB,CAAC,MAAM,CAAC,GAAG;QACnC,+GAA+G;QAC/G,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,2FAA2F;QAC3F,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;QACxB,kFAAkF;QAClF,WAAW,CAAC,EAAE,KAAK,CAAC;QACpB,2DAA2D;QAC3D,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;QACnB,yEAAyE;QACzE,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,KAAK,IAAI,CAAC;KAChE,CAAC;CACH,CAAC;AAEF,mHAAmH;AACnH,MAAM,MAAM,OAAO,GAAG,QAAQ,CAAC;IAC7B,SAAS,EAAE,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,EAAE,YAAY,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;IACvF,KAAK,EAAE,CACL,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,EAClC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,aAAa,EAC3C,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,KACpB,OAAO,CAAC,OAAO,CAAC,CAAC;IACtB,SAAS,EAAE,CACT,IAAI,EAAE,YAAY,EAClB,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,aAAa,EAC3C,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,KACpB,OAAO,CAAC,OAAO,CAAC,CAAC;IACtB,SAAS,EAAE,CACT,IAAI,EAAE,YAAY,EAClB,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,aAAa,EAC3C,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,KACpB,OAAO,CAAC;IACb,cAAc,EAAE,CACd,IAAI,EAAE,iBAAiB,EACvB,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,aAAa,EAC3C,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,KACpB,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;IACzD,IAAI,EAAE,CACJ,GAAG,EAAE,MAAM,GAAG,QAAQ,EACtB,OAAO,CAAC,EAAE,MAAM,EAAE,GAAG,aAAa,GAAG,MAAM,EAC3C,OAAO,CAAC,EAAE,aAAa,GAAG,aAAa,EACvC,OAAO,CAAC,EAAE,aAAa,KACpB,OAAO,CAAC,OAAO,CAAC,CAAC;IACtB,aAAa,EAAE,CACb,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,GAAG,QAAQ,GAAG,CAAC,MAAM,GAAG,IAAI,GAAG,IAAI,GAAG,QAAQ,CAAC,EAAE,GAAG,QAAQ,EACvF,OAAO,CAAC,EAAE,MAAM,EAAE,GAAG,aAAa,GAAG,MAAM,EAC3C,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,KACpB,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;CAC1E,CAAC,CAAC;AAYH,qCAAqC;AACrC,8BAAsB,UAAU,CAAC,KAAK,EAAE,QAAQ,SAAS,iBAAiB;IACxE,MAAM,CAAC,cAAc;;;;;;;MAOS;IAE9B,WAAW,CAAC,EAAE,QAAQ,GAAG,iBAAiB,CAAC;IAC3C,OAAO,EAAE,QAAQ,CAAC,QAAQ,GAAG,iBAAiB,CAAC,CAAC;IAChD,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC;IACrB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAErB,kGAAkG;IAClG,WAAW,EAAE,mBAAmB,CAAC;IACjC,wEAAwE;IACxE,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;IACjE,8EAA8E;IAC9E,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,6EAA6E;IAC7E,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,aAAa,EAAE,OAAO,CAAQ;gBAG5B,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,cAAc,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,EAClC,OAAO,CAAC,EAAE,OAAO;IAgBnB,QAAQ,CAAC,OAAO,EAAE,QAAQ;IAY1B,0DAA0D;IAC1D,eAAe,IAAI,IAAI;IAIvB;;;OAGG;IACH,eAAe,CAAC,KAAK,GAAE,OAAc;IAQrC,2FAA2F;IAC3F,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,KAAK;CAU9D;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,CAAC,EAAE,mBAAmB,6BAE7D;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,iBAAiB,GAAG,mBAAmB,CA+BtF"}

package/dist/loader-utils/lib/sources/data-source.js

@@ -0,0 +1,145 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+import { mergeOptions } from "../option-utils/merge-options.js";
+import { resolvePath } from "../path-utils/file-aliases.js";
+import { log } from "../log-utils/log.js";
+import { getAuthenticatedFetch } from "../request-utils/request-credentials.js";
+import { resolveAuthenticationOptions } from "../request-utils/authentication.js";
+const UNAVAILABLE_CORE_API = {
+    fetchFile: unavailableCoreApiMethod('fetchFile'),
+    parse: unavailableCoreApiMethod('parse'),
+    parseFile: unavailableCoreApiMethod('parseFile'),
+    parseSync: unavailableCoreApiMethod('parseSync'),
+    parseInBatches: unavailableCoreApiMethod('parseInBatches'),
+    load: unavailableCoreApiMethod('load'),
+    loadInBatches: unavailableCoreApiMethod('loadInBatches')
+};
+/** base class of all data sources */
+export class DataSource {
+    static defaultOptions = {
+        core: {
+            type: 'auto',
+            attributions: [],
+            loaders: [],
+            onError: undefined
+        }
+    };
+    optionsType;
+    options;
+    data;
+    url;
+    /** Shared parser options derived from the source options, excluding source-only core controls. */
+    loadOptions;
+    /** A resolved fetch function extracted from the shared core options. */
+    fetch;
+    /** Shared source-level runtime hooks, when supplied by the source factory. */
+    coreApi;
+    /** Whether a real CoreAPI instance was injected by the integration layer. */
+    hasCoreApi;
+    _needsRefresh = true;
+    constructor(data, options, defaultOptions, coreApi) {
+        this.options = mergeOptions(mergeOptions(DataSource.defaultOptions, defaultOptions || {}), options);
+        this.data = data;
+        this.url = typeof data === 'string' ? resolvePath(data) : '';
+        const loadOptions = resolveAuthenticationOptions(getSourceLoaderOptions(this.options));
+        this.loadOptions = loadOptions;
+        const fetch = getFetchFunction(loadOptions);
+        this.coreApi = coreApi || UNAVAILABLE_CORE_API;
+        this.hasCoreApi = Boolean(coreApi);
+        this.fetch = fetch;
+    }
+    setProps(options) {
+        const mergedOptions = mergeOptions(this.options, options);
+        const loadOptions = resolveAuthenticationOptions(getSourceLoaderOptions(mergedOptions));
+        this.options = mergedOptions;
+        this.loadOptions = loadOptions;
+        this.fetch = getFetchFunction(loadOptions);
+        // TODO - add a shallow compare to avoid setting refresh if no change?
+        this.setNeedsRefresh();
+    }
+    /** Mark this data source as needing a refresh (redraw) */
+    setNeedsRefresh() {
+        this._needsRefresh = true;
+    }
+    /**
+     * Does this data source need refreshing?
+     * @note The specifics of the refresh mechanism depends on type of data source
+     */
+    getNeedsRefresh(clear = true) {
+        const needsRefresh = this._needsRefresh;
+        if (clear) {
+            this._needsRefresh = false;
+        }
+        return needsRefresh;
+    }
+    /** Reports a source-level failure through the configured callback or the shared logger. */
+    reportError(error, message) {
+        const normalizedError = normalizeError(error, message);
+        const callback = this.options.core?.onError;
+        if (callback) {
+            callback(normalizedError, this);
+        }
+        else {
+            log.warn(`${this.constructor.name}: ${normalizedError.message}`)();
+        }
+        return normalizedError;
+    }
+}
+/**
+ * Gets the current fetch function from options
+ * @todo - move to loader-utils module
+ * @todo - use in core module counterpart
+ * @param options
+ * @param context
+ */
+export function getFetchFunction(options) {
+    return getAuthenticatedFetch(options);
+}
+/**
+ * Derives parser options from flat source options without forwarding source controls to workers.
+ * Removed option wrappers are rejected so JavaScript callers receive actionable migration guidance.
+ */
+export function getSourceLoaderOptions(options) {
+    if (options.loadOptions !== undefined || options.core?.loadOptions !== undefined) {
+        throw new Error('Source loadOptions and core.loadOptions were removed. Use core and root loader namespaces directly.');
+    }
+    const loadOptions = { ...options };
+    if (options?.core) {
+        loadOptions.core = { ...options.core };
+        const parserCore = loadOptions.core;
+        for (const key of ['type', 'attributions', 'loaders', 'onError', 'loadOptions']) {
+            delete parserCore[key];
+        }
+        if (Object.keys(parserCore).length === 0) {
+            delete loadOptions.core;
+        }
+    }
+    const topLevelBaseUri = typeof loadOptions.baseUri === 'string' ? loadOptions.baseUri : undefined;
+    const topLevelBaseUrl = typeof loadOptions.baseUrl === 'string' ? loadOptions.baseUrl : undefined;
+    if (topLevelBaseUri !== undefined || topLevelBaseUrl !== undefined) {
+        loadOptions.core ||= {};
+        if (loadOptions.core.baseUrl === undefined) {
+            loadOptions.core.baseUrl = topLevelBaseUrl ?? topLevelBaseUri;
+        }
+        delete loadOptions.baseUri;
+        delete loadOptions.baseUrl;
+    }
+    return loadOptions;
+}
+/** Normalizes arbitrary thrown values to `Error` instances for source-level reporting. */
+function normalizeError(error, message) {
+    if (error instanceof Error) {
+        return error;
+    }
+    if (typeof error === 'string') {
+        return new Error(error);
+    }
+    return new Error(message);
+}
+function unavailableCoreApiMethod(methodName) {
+    return () => {
+        throw new Error(`CoreAPI.${methodName} is unavailable. Use @loaders.gl/core.createDataSource().`);
+    };
+}
+//# sourceMappingURL=data-source.js.map

package/dist/loader-utils/lib/sources/data-source.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"data-source.js","sourceRoot":"","sources":["../../../../src/loader-utils/lib/sources/data-source.ts"],"names":[],"mappings":"AAAA,aAAa;AACb,+BAA+B;AAC/B,oCAAoC;AAKpC,OAAO,EAAC,YAAY,EAAC,yCAAsC;AAC3D,OAAO,EAAC,WAAW,EAAC,sCAAmC;AACvD,OAAO,EAAC,GAAG,EAAC,4BAAyB;AACrC,OAAO,EAAC,qBAAqB,EAAC,gDAA6C;AAC3E,OAAO,EAAC,4BAA4B,EAAC,2CAAwC;AA6D7E,MAAM,oBAAoB,GAAY;IACpC,SAAS,EAAE,wBAAwB,CAAC,WAAW,CAAC;IAChD,KAAK,EAAE,wBAAwB,CAAC,OAAO,CAAC;IACxC,SAAS,EAAE,wBAAwB,CAAC,WAAW,CAAC;IAChD,SAAS,EAAE,wBAAwB,CAAC,WAAW,CAAC;IAChD,cAAc,EAAE,wBAAwB,CAAC,gBAAgB,CAAC;IAC1D,IAAI,EAAE,wBAAwB,CAAC,MAAM,CAAC;IACtC,aAAa,EAAE,wBAAwB,CAAC,eAAe,CAAC;CACzD,CAAC;AAEF,qCAAqC;AACrC,MAAM,OAAgB,UAAU;IAC9B,MAAM,CAAC,cAAc,GAAG;QACtB,IAAI,EAAE;YACJ,IAAI,EAAE,MAAM;YACZ,YAAY,EAAE,EAAE;YAChB,OAAO,EAAE,EAAE;YACX,OAAO,EAAE,SAAU;SACpB;KAC0B,CAAC;IAE9B,WAAW,CAAgC;IAC3C,OAAO,CAAyC;IACvC,IAAI,CAAQ;IACZ,GAAG,CAAS;IAErB,kGAAkG;IAClG,WAAW,CAAsB;IACjC,wEAAwE;IACxE,KAAK,CAA4D;IACjE,8EAA8E;IACrE,OAAO,CAAU;IAC1B,6EAA6E;IACpE,UAAU,CAAU;IAC7B,aAAa,GAAY,IAAI,CAAC;IAE9B,YACE,IAAW,EACX,OAAiB,EACjB,cAAkC,EAClC,OAAiB;QAEjB,IAAI,CAAC,OAAO,GAAG,YAAY,CACzB,YAAY,CAAoB,UAAU,CAAC,cAAc,EAAE,cAAc,IAAI,EAAE,CAAC,EAChF,OAAO,CACkC,CAAC;QAC5C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,GAAG,GAAG,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7D,MAAM,WAAW,GAAG,4BAA4B,CAAC,sBAAsB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;QACvF,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,MAAM,KAAK,GAAG,gBAAgB,CAAC,WAAW,CAAC,CAAC;QAC5C,IAAI,CAAC,OAAO,GAAG,OAAO,IAAI,oBAAoB,CAAC;QAC/C,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;QACnC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IAED,QAAQ,CAAC,OAAiB;QACxB,MAAM,aAAa,GAAG,YAAY,CAAoB,IAAI,CAAC,OAAO,EAAE,OAAO,CAE1E,CAAC;QACF,MAAM,WAAW,GAAG,4BAA4B,CAAC,sBAAsB,CAAC,aAAa,CAAC,CAAC,CAAC;QACxF,IAAI,CAAC,OAAO,GAAG,aAAa,CAAC;QAC7B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,KAAK,GAAG,gBAAgB,CAAC,WAAW,CAAC,CAAC;QAC3C,sEAAsE;QACtE,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;IAED,0DAA0D;IAC1D,eAAe;QACb,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;IAC5B,CAAC;IAED;;;OAGG;IACH,eAAe,CAAC,QAAiB,IAAI;QACnC,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC;QACxC,IAAI,KAAK,EAAE,CAAC;YACV,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;QAC7B,CAAC;QACD,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,2FAA2F;IACjF,WAAW,CAAC,KAAc,EAAE,OAAe;QACnD,MAAM,eAAe,GAAG,cAAc,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QACvD,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC;QAC5C,IAAI,QAAQ,EAAE,CAAC;YACb,QAAQ,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;QAClC,CAAC;aAAM,CAAC;YACN,GAAG,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,eAAe,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;QACrE,CAAC;QACD,OAAO,eAAe,CAAC;IACzB,CAAC;;AAGH;;;;;;GAMG;AACH,MAAM,UAAU,gBAAgB,CAAC,OAA6B;IAC5D,OAAO,qBAAqB,CAAC,OAAO,CAAC,CAAC;AACxC,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,sBAAsB,CAAC,OAA0B;IAC/D,IAAI,OAAO,CAAC,WAAW,KAAK,SAAS,IAAI,OAAO,CAAC,IAAI,EAAE,WAAW,KAAK,SAAS,EAAE,CAAC;QACjF,MAAM,IAAI,KAAK,CACb,qGAAqG,CACtG,CAAC;IACJ,CAAC;IACD,MAAM,WAAW,GAAkB,EAAC,GAAG,OAAO,EAAC,CAAC;IAChD,IAAI,OAAO,EAAE,IAAI,EAAE,CAAC;QAClB,WAAW,CAAC,IAAI,GAAG,EAAC,GAAG,OAAO,CAAC,IAAI,EAAC,CAAC;QACrC,MAAM,UAAU,GAAG,WAAW,CAAC,IAA+B,CAAC;QAC/D,KAAK,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,cAAc,EAAE,SAAS,EAAE,SAAS,EAAE,aAAa,CAAC,EAAE,CAAC;YAChF,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC;QACzB,CAAC;QACD,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzC,OAAO,WAAW,CAAC,IAAI,CAAC;QAC1B,CAAC;IACH,CAAC;IAED,MAAM,eAAe,GAAG,OAAO,WAAW,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;IAClG,MAAM,eAAe,GAAG,OAAO,WAAW,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;IAElG,IAAI,eAAe,KAAK,SAAS,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;QACnE,WAAW,CAAC,IAAI,KAAK,EAAE,CAAC;QACxB,IAAI,WAAW,CAAC,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YAC3C,WAAW,CAAC,IAAI,CAAC,OAAO,GAAG,eAAe,IAAI,eAAe,CAAC;QAChE,CAAC;QACD,OAAO,WAAW,CAAC,OAAO,CAAC;QAC3B,OAAO,WAAW,CAAC,OAAO,CAAC;IAC7B,CAAC;IAED,OAAO,WAAkC,CAAC;AAC5C,CAAC;AAED,0FAA0F;AAC1F,SAAS,cAAc,CAAC,KAAc,EAAE,OAAe;IACrD,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;QAC3B,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;IACD,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;AAC5B,CAAC;AAED,SAAS,wBAAwB,CAAC,UAAyB;IACzD,OAAO,GAAG,EAAE;QACV,MAAM,IAAI,KAAK,CACb,WAAW,UAAU,2DAA2D,CACjF,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC"}