@loaders.gl/core 3.1.8 → 3.2.0-alpha.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/dist.min.js +234 -60
- package/dist/es5/index.js +8 -2
- package/dist/es5/index.js.map +1 -1
- package/dist/es5/lib/api/encode.js +75 -50
- package/dist/es5/lib/api/encode.js.map +1 -1
- package/dist/es5/lib/api/loader-options.js +20 -0
- package/dist/es5/lib/api/loader-options.js.map +1 -0
- package/dist/es5/lib/api/parse.js +36 -17
- package/dist/es5/lib/api/parse.js.map +1 -1
- package/dist/es5/lib/api/select-loader.js.map +1 -1
- package/dist/es5/lib/init.js +1 -1
- package/dist/es5/lib/init.js.map +1 -1
- package/dist/es5/lib/loader-utils/option-defaults.js +4 -1
- package/dist/es5/lib/loader-utils/option-defaults.js.map +1 -1
- package/dist/es5/lib/loader-utils/option-utils.js +3 -0
- package/dist/es5/lib/loader-utils/option-utils.js.map +1 -1
- package/dist/es5/lib/utils/response-utils.js +2 -2
- package/dist/es5/lib/utils/response-utils.js.map +1 -1
- package/dist/es5/null-loader.js +22 -11
- package/dist/es5/null-loader.js.map +1 -1
- package/dist/esm/index.js +1 -1
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/lib/api/encode.js +12 -0
- package/dist/esm/lib/api/encode.js.map +1 -1
- package/dist/esm/lib/api/loader-options.js +3 -0
- package/dist/esm/lib/api/loader-options.js.map +1 -0
- package/dist/esm/lib/api/parse.js +24 -0
- package/dist/esm/lib/api/parse.js.map +1 -1
- package/dist/esm/lib/api/select-loader.js.map +1 -1
- package/dist/esm/lib/init.js +1 -1
- package/dist/esm/lib/init.js.map +1 -1
- package/dist/esm/lib/loader-utils/option-defaults.js +3 -1
- package/dist/esm/lib/loader-utils/option-defaults.js.map +1 -1
- package/dist/esm/lib/loader-utils/option-utils.js +1 -3
- package/dist/esm/lib/loader-utils/option-utils.js.map +1 -1
- package/dist/esm/lib/utils/response-utils.js +2 -2
- package/dist/esm/lib/utils/response-utils.js.map +1 -1
- package/dist/esm/null-loader.js +19 -6
- package/dist/esm/null-loader.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +5 -4
- package/dist/lib/api/encode.d.ts +1 -1
- package/dist/lib/api/encode.d.ts.map +1 -1
- package/dist/lib/api/encode.js +13 -5
- package/dist/lib/api/loader-options.d.ts +3 -0
- package/dist/lib/api/loader-options.d.ts.map +1 -0
- package/dist/lib/api/loader-options.js +7 -0
- package/dist/lib/api/parse.d.ts.map +1 -1
- package/dist/lib/api/parse.js +8 -0
- package/dist/lib/api/select-loader.js +1 -0
- package/dist/lib/loader-utils/option-defaults.d.ts.map +1 -1
- package/dist/lib/loader-utils/option-defaults.js +3 -1
- package/dist/lib/loader-utils/option-utils.d.ts +8 -0
- package/dist/lib/loader-utils/option-utils.d.ts.map +1 -1
- package/dist/lib/loader-utils/option-utils.js +10 -6
- package/dist/lib/utils/response-utils.js +2 -2
- package/dist/null-loader.d.ts.map +1 -1
- package/dist/null-loader.js +17 -5
- package/dist/null-worker.js +61 -21
- package/package.json +6 -4
- package/src/index.ts +1 -1
- package/src/lib/api/encode.ts +9 -1
- package/src/lib/api/loader-options.ts +2 -0
- package/src/lib/api/parse.ts +9 -0
- package/src/lib/api/select-loader.ts +1 -0
- package/src/lib/loader-utils/option-defaults.ts +3 -1
- package/src/lib/loader-utils/option-utils.ts +6 -3
- package/src/lib/utils/response-utils.ts +2 -2
- package/src/null-loader.ts +17 -5
- package/dist/es5/lib/api/set-loader-options.js +0 -13
- package/dist/es5/lib/api/set-loader-options.js.map +0 -1
- package/dist/esm/lib/api/set-loader-options.js +0 -5
- package/dist/esm/lib/api/set-loader-options.js.map +0 -1
- package/dist/lib/api/set-loader-options.d.ts +0 -6
- package/dist/lib/api/set-loader-options.d.ts.map +0 -1
- package/dist/lib/api/set-loader-options.js +0 -12
- package/src/lib/api/set-loader-options.ts +0 -9
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/lib/loader-utils/option-defaults.ts"],"names":["ConsoleLog","DEFAULT_LOADER_OPTIONS","fetch","mimeType","undefined","nothrow","log","CDN","worker","maxConcurrency","maxMobileConcurrency","reuseWorkers","_workerType","limit","_limitMB","batchSize","batchDebounceMs","metadata","transforms","REMOVED_LOADER_OPTIONS","throws","dataType","uri","method","headers","body","mode","credentials","cache","redirect","referrer","referrerPolicy","integrity","keepalive","signal"],"mappings":"AACA,SAAQA,UAAR,QAAyB,WAAzB;AAEA,OAAO,MAAMC,sBAAqC,GAAG;AAEnDC,EAAAA,KAAK,EAAE,IAF4C;AAGnDC,EAAAA,QAAQ,EAAEC,SAHyC;AAInDC,EAAAA,OAAO,EAAE,KAJ0C;AAKnDC,EAAAA,GAAG,EAAE,IAAIN,UAAJ,EAL8C;AAOnDO,EAAAA,GAAG,EAAE,+BAP8C;AAQnDC,EAAAA,MAAM,EAAE,IAR2C;AASnDC,EAAAA,cAAc,EAAE,CATmC;AAUnDC,EAAAA,oBAAoB,EAAE,CAV6B;AAWnDC,EAAAA,YAAY,EAAE,
|
|
1
|
+
{"version":3,"sources":["../../../../src/lib/loader-utils/option-defaults.ts"],"names":["isBrowser","ConsoleLog","DEFAULT_LOADER_OPTIONS","fetch","mimeType","undefined","nothrow","log","CDN","worker","maxConcurrency","maxMobileConcurrency","reuseWorkers","_nodeWorkers","_workerType","limit","_limitMB","batchSize","batchDebounceMs","metadata","transforms","REMOVED_LOADER_OPTIONS","throws","dataType","uri","method","headers","body","mode","credentials","cache","redirect","referrer","referrerPolicy","integrity","keepalive","signal"],"mappings":"AACA,SAAQA,SAAR,QAAwB,0BAAxB;AACA,SAAQC,UAAR,QAAyB,WAAzB;AAEA,OAAO,MAAMC,sBAAqC,GAAG;AAEnDC,EAAAA,KAAK,EAAE,IAF4C;AAGnDC,EAAAA,QAAQ,EAAEC,SAHyC;AAInDC,EAAAA,OAAO,EAAE,KAJ0C;AAKnDC,EAAAA,GAAG,EAAE,IAAIN,UAAJ,EAL8C;AAOnDO,EAAAA,GAAG,EAAE,+BAP8C;AAQnDC,EAAAA,MAAM,EAAE,IAR2C;AASnDC,EAAAA,cAAc,EAAE,CATmC;AAUnDC,EAAAA,oBAAoB,EAAE,CAV6B;AAWnDC,EAAAA,YAAY,EAAEZ,SAXqC;AAYnDa,EAAAA,YAAY,EAAE,KAZqC;AAanDC,EAAAA,WAAW,EAAE,EAbsC;AAenDC,EAAAA,KAAK,EAAE,CAf4C;AAgBnDC,EAAAA,QAAQ,EAAE,CAhByC;AAiBnDC,EAAAA,SAAS,EAAE,MAjBwC;AAkBnDC,EAAAA,eAAe,EAAE,CAlBkC;AAmBnDC,EAAAA,QAAQ,EAAE,KAnByC;AAoBnDC,EAAAA,UAAU,EAAE;AApBuC,CAA9C;AAuBP,OAAO,MAAMC,sBAAsB,GAAG;AACpCC,EAAAA,MAAM,EAAE,SAD4B;AAEpCC,EAAAA,QAAQ,EAAE,kBAF0B;AAGpCC,EAAAA,GAAG,EAAE,SAH+B;AAKpCC,EAAAA,MAAM,EAAE,cAL4B;AAMpCC,EAAAA,OAAO,EAAE,eAN2B;AAOpCC,EAAAA,IAAI,EAAE,YAP8B;AAQpCC,EAAAA,IAAI,EAAE,YAR8B;AASpCC,EAAAA,WAAW,EAAE,mBATuB;AAUpCC,EAAAA,KAAK,EAAE,aAV6B;AAWpCC,EAAAA,QAAQ,EAAE,gBAX0B;AAYpCC,EAAAA,QAAQ,EAAE,gBAZ0B;AAapCC,EAAAA,cAAc,EAAE,sBAboB;AAcpCC,EAAAA,SAAS,EAAE,iBAdyB;AAepCC,EAAAA,SAAS,EAAE,iBAfyB;AAgBpCC,EAAAA,MAAM,EAAE;AAhB4B,CAA/B","sourcesContent":["import type {LoaderOptions} from '@loaders.gl/loader-utils';\nimport {isBrowser} from '@loaders.gl/loader-utils';\nimport {ConsoleLog} from './loggers';\n\nexport const DEFAULT_LOADER_OPTIONS: LoaderOptions = {\n // baseUri\n fetch: null,\n mimeType: undefined,\n nothrow: false,\n log: new ConsoleLog(), // A probe.gl compatible (`log.log()()` syntax) that just logs to console\n\n CDN: 'https://unpkg.com/@loaders.gl',\n worker: true, // By default, use worker if provided by loader.\n maxConcurrency: 3, // How many worker instances should be created for each loader.\n maxMobileConcurrency: 1, // How many worker instances should be created for each loader on mobile devices.\n reuseWorkers: isBrowser, // By default reuse workers in browser (Node.js refuses to terminate if browsers are running)\n _nodeWorkers: false, // By default do not support node workers\n _workerType: '', // 'test' to use locally generated workers\n\n limit: 0,\n _limitMB: 0,\n batchSize: 'auto',\n batchDebounceMs: 0,\n metadata: false, // TODO - currently only implemented for parseInBatches, adds initial metadata batch,\n transforms: []\n};\n\nexport const REMOVED_LOADER_OPTIONS = {\n throws: 'nothrow',\n dataType: '(no longer used)',\n uri: 'baseUri',\n // Warn if fetch options are used on top-level\n method: 'fetch.method',\n headers: 'fetch.headers',\n body: 'fetch.body',\n mode: 'fetch.mode',\n credentials: 'fetch.credentials',\n cache: 'fetch.cache',\n redirect: 'fetch.redirect',\n referrer: 'fetch.referrer',\n referrerPolicy: 'fetch.referrerPolicy',\n integrity: 'fetch.integrity',\n keepalive: 'fetch.keepalive',\n signal: 'fetch.signal'\n};\n"],"file":"option-defaults.js"}
|
|
@@ -10,14 +10,12 @@ export function getGlobalLoaderState() {
|
|
|
10
10
|
loaders._state = loaders._state || {};
|
|
11
11
|
return loaders._state;
|
|
12
12
|
}
|
|
13
|
-
|
|
14
|
-
const getGlobalLoaderOptions = () => {
|
|
13
|
+
export const getGlobalLoaderOptions = () => {
|
|
15
14
|
const state = getGlobalLoaderState();
|
|
16
15
|
state.globalOptions = state.globalOptions || { ...DEFAULT_LOADER_OPTIONS
|
|
17
16
|
};
|
|
18
17
|
return state.globalOptions;
|
|
19
18
|
};
|
|
20
|
-
|
|
21
19
|
export function setGlobalOptions(options) {
|
|
22
20
|
const state = getGlobalLoaderState();
|
|
23
21
|
const globalOptions = getGlobalLoaderOptions();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/lib/loader-utils/option-utils.ts"],"names":["isPureObject","isObject","fetchFile","probeLog","NullLog","DEFAULT_LOADER_OPTIONS","REMOVED_LOADER_OPTIONS","getGlobalLoaderState","globalThis","loaders","_state","getGlobalLoaderOptions","state","globalOptions","setGlobalOptions","options","normalizeOptionsInternal","normalizeOptions","loader","url","Array","isArray","validateOptions","getFetchFunction","context","fetchOptions","fetch","validateOptionsObject","idOptions","id","loaderOptions","deprecatedOptions","defaultOptions","loaderName","prefix","key","isSubOptions","isBaseUriOption","isWorkerUrlOption","warn","suggestion","findSimilarOption","optionKey","lowerCaseOptionKey","toLowerCase","bestSuggestion","lowerCaseKey","isPartialMatch","startsWith","loaderDefaultOptions","mergedOptions","addUrlOptions","log","mergeNestedFields","value","baseUri"],"mappings":"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","sourcesContent":["import type {Loader, LoaderContext, LoaderOptions} from '@loaders.gl/loader-utils';\nimport {isPureObject, isObject} from '../../javascript-utils/is-type';\nimport {fetchFile} from '../fetch/fetch-file';\nimport {probeLog, NullLog} from './loggers';\nimport {DEFAULT_LOADER_OPTIONS, REMOVED_LOADER_OPTIONS} from './option-defaults';\n/**\n * Global state for loaders.gl. Stored on `global.loaders._state`\n */\ntype GlobalLoaderState = {\n loaderRegistry: Loader[];\n globalOptions: {[key: string]: any};\n};\n\n/**\n * Helper for safely accessing global loaders.gl variables\n * Wraps initialization of global variable in function to defeat overly aggressive tree-shakers\n */\nexport function getGlobalLoaderState(): GlobalLoaderState {\n // @ts-ignore\n globalThis.loaders = globalThis.loaders || {};\n // @ts-ignore\n const {loaders} = globalThis;\n\n // Add _state object to keep separate from modules added to globalThis.loaders\n loaders._state = loaders._state || {};\n return loaders._state;\n}\n\n// Store global loader options on the global object to increase chances of cross loaders-version interoperability\n// NOTE: This use case is not reliable but can help when testing new versions of loaders.gl with existing frameworks\nconst getGlobalLoaderOptions = () => {\n const state = getGlobalLoaderState();\n // Ensure all default loader options from this library are mentioned\n state.globalOptions = state.globalOptions || {...DEFAULT_LOADER_OPTIONS};\n return state.globalOptions;\n};\n\n/**\n * Set global loader options\n * @param options\n */\nexport function setGlobalOptions(options: object): void {\n const state = getGlobalLoaderState();\n const globalOptions = getGlobalLoaderOptions();\n state.globalOptions = normalizeOptionsInternal(globalOptions, options);\n}\n\n/**\n * Merges options with global opts and loader defaults, also injects baseUri\n * @param options\n * @param loader\n * @param loaders\n * @param url\n */\nexport function normalizeOptions(\n options: object,\n loader: Loader,\n loaders?: Loader[],\n url?: string\n): object {\n loaders = loaders || [];\n loaders = Array.isArray(loaders) ? loaders : [loaders];\n\n validateOptions(options, loaders);\n return normalizeOptionsInternal(loader, options, url);\n}\n\n/**\n * Gets the current fetch function from options and context\n * @param options\n * @param context\n */\nexport function getFetchFunction(\n options?: LoaderOptions,\n context?: Omit<LoaderContext, 'fetch'> & Partial<Pick<LoaderContext, 'fetch'>>\n) {\n const globalOptions = getGlobalLoaderOptions();\n\n const fetchOptions = options || globalOptions;\n\n // options.fetch can be a function\n if (typeof fetchOptions.fetch === 'function') {\n return fetchOptions.fetch;\n }\n\n // options.fetch can be an options object\n if (isObject(fetchOptions.fetch)) {\n return (url) => fetchFile(url, fetchOptions);\n }\n\n // else refer to context (from parent loader) if available\n if (context?.fetch) {\n return context?.fetch;\n }\n\n // else return the default fetch function\n return fetchFile;\n}\n\n// VALIDATE OPTIONS\n\n/**\n * Warn for unsupported options\n * @param options\n * @param loaders\n */\nfunction validateOptions(options: LoaderOptions, loaders: Loader[]) {\n // Check top level options\n validateOptionsObject(options, null, DEFAULT_LOADER_OPTIONS, REMOVED_LOADER_OPTIONS, loaders);\n for (const loader of loaders) {\n // Get the scoped, loader specific options from the user supplied options\n const idOptions = (options && options[loader.id]) || {};\n\n // Get scoped, loader specific default and deprecated options from the selected loader\n const loaderOptions = (loader.options && loader.options[loader.id]) || {};\n const deprecatedOptions =\n (loader.deprecatedOptions && loader.deprecatedOptions[loader.id]) || {};\n\n // Validate loader specific options\n validateOptionsObject(idOptions, loader.id, loaderOptions, deprecatedOptions, loaders);\n }\n}\n\n// eslint-disable-next-line max-params, complexity\nfunction validateOptionsObject(\n options,\n id: string | null,\n defaultOptions,\n deprecatedOptions,\n loaders: Loader[]\n) {\n const loaderName = id || 'Top level';\n const prefix = id ? `${id}.` : '';\n\n for (const key in options) {\n // If top level option value is an object it could options for a loader, so ignore\n const isSubOptions = !id && isObject(options[key]);\n const isBaseUriOption = key === 'baseUri' && !id;\n const isWorkerUrlOption = key === 'workerUrl' && id;\n // <loader>.workerUrl requires special handling as it is now auto-generated and no longer specified as a default option.\n if (!(key in defaultOptions) && !isBaseUriOption && !isWorkerUrlOption) {\n // Issue deprecation warnings\n if (key in deprecatedOptions) {\n probeLog.warn(\n `${loaderName} loader option \\'${prefix}${key}\\' no longer supported, use \\'${deprecatedOptions[key]}\\'`\n )();\n } else if (!isSubOptions) {\n const suggestion = findSimilarOption(key, loaders);\n probeLog.warn(\n `${loaderName} loader option \\'${prefix}${key}\\' not recognized. ${suggestion}`\n )();\n }\n }\n }\n}\n\nfunction findSimilarOption(optionKey, loaders) {\n const lowerCaseOptionKey = optionKey.toLowerCase();\n let bestSuggestion = '';\n for (const loader of loaders) {\n for (const key in loader.options) {\n if (optionKey === key) {\n return `Did you mean \\'${loader.id}.${key}\\'?`;\n }\n const lowerCaseKey = key.toLowerCase();\n const isPartialMatch =\n lowerCaseOptionKey.startsWith(lowerCaseKey) || lowerCaseKey.startsWith(lowerCaseOptionKey);\n if (isPartialMatch) {\n bestSuggestion = bestSuggestion || `Did you mean \\'${loader.id}.${key}\\'?`;\n }\n }\n }\n return bestSuggestion;\n}\n\nfunction normalizeOptionsInternal(loader, options, url?: string) {\n const loaderDefaultOptions = loader.options || {};\n\n const mergedOptions = {...loaderDefaultOptions};\n\n addUrlOptions(mergedOptions, url);\n\n // LOGGING: options.log can be set to `null` to defeat logging\n if (mergedOptions.log === null) {\n mergedOptions.log = new NullLog();\n }\n\n mergeNestedFields(mergedOptions, getGlobalLoaderOptions());\n mergeNestedFields(mergedOptions, options);\n\n return mergedOptions;\n}\n\n// Merge nested options objects\nfunction mergeNestedFields(mergedOptions, options) {\n for (const key in options) {\n // Check for nested options\n // object in options => either no key in defaultOptions or object in defaultOptions\n if (key in options) {\n const value = options[key];\n if (isPureObject(value) && isPureObject(mergedOptions[key])) {\n mergedOptions[key] = {\n ...mergedOptions[key],\n ...options[key]\n };\n } else {\n mergedOptions[key] = options[key];\n }\n }\n // else: No need to merge nested opts, and the initial merge already copied over the nested options\n }\n}\n\n// Harvest information from the url\n// TODO - baseUri should be a directory, i.e. remove file component from baseUri\n// TODO - extract extension?\n// TODO - extract query parameters?\n// TODO - should these be injected on context instead of options?\nfunction addUrlOptions(options, url?: string) {\n if (url && !('baseUri' in options)) {\n options.baseUri = url;\n }\n}\n"],"file":"option-utils.js"}
|
|
1
|
+
{"version":3,"sources":["../../../../src/lib/loader-utils/option-utils.ts"],"names":["isPureObject","isObject","fetchFile","probeLog","NullLog","DEFAULT_LOADER_OPTIONS","REMOVED_LOADER_OPTIONS","getGlobalLoaderState","globalThis","loaders","_state","getGlobalLoaderOptions","state","globalOptions","setGlobalOptions","options","normalizeOptionsInternal","normalizeOptions","loader","url","Array","isArray","validateOptions","getFetchFunction","context","fetchOptions","fetch","validateOptionsObject","idOptions","id","loaderOptions","deprecatedOptions","defaultOptions","loaderName","prefix","key","isSubOptions","isBaseUriOption","isWorkerUrlOption","warn","suggestion","findSimilarOption","optionKey","lowerCaseOptionKey","toLowerCase","bestSuggestion","lowerCaseKey","isPartialMatch","startsWith","loaderDefaultOptions","mergedOptions","addUrlOptions","log","mergeNestedFields","value","baseUri"],"mappings":"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","sourcesContent":["import type {Loader, LoaderContext, LoaderOptions} from '@loaders.gl/loader-utils';\nimport {isPureObject, isObject} from '../../javascript-utils/is-type';\nimport {fetchFile} from '../fetch/fetch-file';\nimport {probeLog, NullLog} from './loggers';\nimport {DEFAULT_LOADER_OPTIONS, REMOVED_LOADER_OPTIONS} from './option-defaults';\n/**\n * Global state for loaders.gl. Stored on `global.loaders._state`\n */\ntype GlobalLoaderState = {\n loaderRegistry: Loader[];\n globalOptions: {[key: string]: any};\n};\n\n/**\n * Helper for safely accessing global loaders.gl variables\n * Wraps initialization of global variable in function to defeat overly aggressive tree-shakers\n */\nexport function getGlobalLoaderState(): GlobalLoaderState {\n // @ts-ignore\n globalThis.loaders = globalThis.loaders || {};\n // @ts-ignore\n const {loaders} = globalThis;\n\n // Add _state object to keep separate from modules added to globalThis.loaders\n loaders._state = loaders._state || {};\n return loaders._state;\n}\n\n/**\n * Store global loader options on the global object to increase chances of cross loaders-version interoperability\n * NOTE: This use case is not reliable but can help when testing new versions of loaders.gl with existing frameworks\n * @returns global loader options merged with default loader options\n */\nexport const getGlobalLoaderOptions = () => {\n const state = getGlobalLoaderState();\n // Ensure all default loader options from this library are mentioned\n state.globalOptions = state.globalOptions || {...DEFAULT_LOADER_OPTIONS};\n return state.globalOptions;\n};\n\n/**\n * Set global loader options\n * @param options\n */\nexport function setGlobalOptions(options: object): void {\n const state = getGlobalLoaderState();\n const globalOptions = getGlobalLoaderOptions();\n state.globalOptions = normalizeOptionsInternal(globalOptions, options);\n}\n\n/**\n * Merges options with global opts and loader defaults, also injects baseUri\n * @param options\n * @param loader\n * @param loaders\n * @param url\n */\nexport function normalizeOptions(\n options: object,\n loader: Loader,\n loaders?: Loader[],\n url?: string\n): object {\n loaders = loaders || [];\n loaders = Array.isArray(loaders) ? loaders : [loaders];\n\n validateOptions(options, loaders);\n return normalizeOptionsInternal(loader, options, url);\n}\n\n/**\n * Gets the current fetch function from options and context\n * @param options\n * @param context\n */\nexport function getFetchFunction(\n options?: LoaderOptions,\n context?: Omit<LoaderContext, 'fetch'> & Partial<Pick<LoaderContext, 'fetch'>>\n) {\n const globalOptions = getGlobalLoaderOptions();\n\n const fetchOptions = options || globalOptions;\n\n // options.fetch can be a function\n if (typeof fetchOptions.fetch === 'function') {\n return fetchOptions.fetch;\n }\n\n // options.fetch can be an options object\n if (isObject(fetchOptions.fetch)) {\n return (url) => fetchFile(url, fetchOptions);\n }\n\n // else refer to context (from parent loader) if available\n if (context?.fetch) {\n return context?.fetch;\n }\n\n // else return the default fetch function\n return fetchFile;\n}\n\n// VALIDATE OPTIONS\n\n/**\n * Warn for unsupported options\n * @param options\n * @param loaders\n */\nfunction validateOptions(options: LoaderOptions, loaders: Loader[]) {\n // Check top level options\n validateOptionsObject(options, null, DEFAULT_LOADER_OPTIONS, REMOVED_LOADER_OPTIONS, loaders);\n for (const loader of loaders) {\n // Get the scoped, loader specific options from the user supplied options\n const idOptions = (options && options[loader.id]) || {};\n\n // Get scoped, loader specific default and deprecated options from the selected loader\n const loaderOptions = (loader.options && loader.options[loader.id]) || {};\n const deprecatedOptions =\n (loader.deprecatedOptions && loader.deprecatedOptions[loader.id]) || {};\n\n // Validate loader specific options\n validateOptionsObject(idOptions, loader.id, loaderOptions, deprecatedOptions, loaders);\n }\n}\n\n// eslint-disable-next-line max-params, complexity\nfunction validateOptionsObject(\n options,\n id: string | null,\n defaultOptions,\n deprecatedOptions,\n loaders: Loader[]\n) {\n const loaderName = id || 'Top level';\n const prefix = id ? `${id}.` : '';\n\n for (const key in options) {\n // If top level option value is an object it could options for a loader, so ignore\n const isSubOptions = !id && isObject(options[key]);\n const isBaseUriOption = key === 'baseUri' && !id;\n const isWorkerUrlOption = key === 'workerUrl' && id;\n // <loader>.workerUrl requires special handling as it is now auto-generated and no longer specified as a default option.\n if (!(key in defaultOptions) && !isBaseUriOption && !isWorkerUrlOption) {\n // Issue deprecation warnings\n if (key in deprecatedOptions) {\n probeLog.warn(\n `${loaderName} loader option \\'${prefix}${key}\\' no longer supported, use \\'${deprecatedOptions[key]}\\'`\n )();\n } else if (!isSubOptions) {\n const suggestion = findSimilarOption(key, loaders);\n probeLog.warn(\n `${loaderName} loader option \\'${prefix}${key}\\' not recognized. ${suggestion}`\n )();\n }\n }\n }\n}\n\nfunction findSimilarOption(optionKey, loaders) {\n const lowerCaseOptionKey = optionKey.toLowerCase();\n let bestSuggestion = '';\n for (const loader of loaders) {\n for (const key in loader.options) {\n if (optionKey === key) {\n return `Did you mean \\'${loader.id}.${key}\\'?`;\n }\n const lowerCaseKey = key.toLowerCase();\n const isPartialMatch =\n lowerCaseOptionKey.startsWith(lowerCaseKey) || lowerCaseKey.startsWith(lowerCaseOptionKey);\n if (isPartialMatch) {\n bestSuggestion = bestSuggestion || `Did you mean \\'${loader.id}.${key}\\'?`;\n }\n }\n }\n return bestSuggestion;\n}\n\nfunction normalizeOptionsInternal(loader, options, url?: string) {\n const loaderDefaultOptions = loader.options || {};\n\n const mergedOptions = {...loaderDefaultOptions};\n\n addUrlOptions(mergedOptions, url);\n\n // LOGGING: options.log can be set to `null` to defeat logging\n if (mergedOptions.log === null) {\n mergedOptions.log = new NullLog();\n }\n\n mergeNestedFields(mergedOptions, getGlobalLoaderOptions());\n mergeNestedFields(mergedOptions, options);\n\n return mergedOptions;\n}\n\n// Merge nested options objects\nfunction mergeNestedFields(mergedOptions, options) {\n for (const key in options) {\n // Check for nested options\n // object in options => either no key in defaultOptions or object in defaultOptions\n if (key in options) {\n const value = options[key];\n if (isPureObject(value) && isPureObject(mergedOptions[key])) {\n mergedOptions[key] = {\n ...mergedOptions[key],\n ...options[key]\n };\n } else {\n mergedOptions[key] = options[key];\n }\n }\n // else: No need to merge nested opts, and the initial merge already copied over the nested options\n }\n}\n\n// Harvest information from the url\n// TODO - baseUri should be a directory, i.e. remove file component from baseUri\n// TODO - extract extension?\n// TODO - extract query parameters?\n// TODO - should these be injected on context instead of options?\nfunction addUrlOptions(options, url?: string) {\n if (url && !('baseUri' in options)) {\n options.baseUri = url;\n }\n}\n"],"file":"option-utils.js"}
|
|
@@ -48,7 +48,7 @@ export async function checkResponse(response) {
|
|
|
48
48
|
export function checkResponseSync(response) {
|
|
49
49
|
if (!response.ok) {
|
|
50
50
|
let message = "".concat(response.status, " ").concat(response.statusText);
|
|
51
|
-
message = message.length > 60 ? "".concat(message.slice(60), "...") : message;
|
|
51
|
+
message = message.length > 60 ? "".concat(message.slice(0, 60), "...") : message;
|
|
52
52
|
throw new Error(message);
|
|
53
53
|
}
|
|
54
54
|
}
|
|
@@ -65,7 +65,7 @@ async function getResponseError(response) {
|
|
|
65
65
|
}
|
|
66
66
|
|
|
67
67
|
message += text;
|
|
68
|
-
message = message.length > 60 ? "".concat(message.slice(60), "...") : message;
|
|
68
|
+
message = message.length > 60 ? "".concat(message.slice(0, 60), "...") : message;
|
|
69
69
|
} catch (error) {}
|
|
70
70
|
|
|
71
71
|
return message;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/lib/utils/response-utils.ts"],"names":["isResponse","getResourceContentLength","getResourceUrlAndType","makeResponse","resource","headers","contentLength","String","url","type","initialDataUrl","getInitialDataUrl","TextEncoder","encode","response","Response","Object","defineProperty","value","checkResponse","ok","message","getResponseError","Error","checkResponseSync","status","statusText","length","slice","contentType","get","text","includes","error","INITIAL_DATA_LENGTH","Blob","blobSlice","Promise","resolve","reader","FileReader","onload","event","target","result","readAsDataURL","ArrayBuffer","base64","arrayBufferToBase64","buffer","binary","bytes","Uint8Array","i","byteLength","fromCharCode","btoa"],"mappings":"AAAA,SAAQA,UAAR,QAAyB,gCAAzB;AACA,SAAQC,wBAAR,EAAkCC,qBAAlC,QAA8D,kBAA9D;AAQA,OAAO,eAAeC,YAAf,CAA4BC,QAA5B,EAA8D;AACnE,MAAIJ,UAAU,CAACI,QAAD,CAAd,EAA0B;AACxB,WAAOA,QAAP;AACD;;AAGD,QAAMC,OAAmC,GAAG,EAA5C;AAEA,QAAMC,aAAa,GAAGL,wBAAwB,CAACG,QAAD,CAA9C;;AACA,MAAIE,aAAa,IAAI,CAArB,EAAwB;AACtBD,IAAAA,OAAO,CAAC,gBAAD,CAAP,GAA4BE,MAAM,CAACD,aAAD,CAAlC;AACD;;AAID,QAAM;AAACE,IAAAA,GAAD;AAAMC,IAAAA;AAAN,MAAcP,qBAAqB,CAACE,QAAD,CAAzC;;AACA,MAAIK,IAAJ,EAAU;AACRJ,IAAAA,OAAO,CAAC,cAAD,CAAP,GAA0BI,IAA1B;AACD;;AAGD,QAAMC,cAAc,GAAG,MAAMC,iBAAiB,CAACP,QAAD,CAA9C;;AACA,MAAIM,cAAJ,EAAoB;AAClBL,IAAAA,OAAO,CAAC,eAAD,CAAP,GAA2BK,cAA3B;AACD;;AAID,MAAI,OAAON,QAAP,KAAoB,QAAxB,EAAkC;AAEhCA,IAAAA,QAAQ,GAAG,IAAIQ,WAAJ,GAAkBC,MAAlB,CAAyBT,QAAzB,CAAX;AACD;;AAGD,QAAMU,QAAQ,GAAG,IAAIC,QAAJ,CAAaX,QAAb,EAAuB;AAACC,IAAAA;AAAD,GAAvB,CAAjB;AAEAW,EAAAA,MAAM,CAACC,cAAP,CAAsBH,QAAtB,EAAgC,KAAhC,EAAuC;AAACI,IAAAA,KAAK,EAAEV;AAAR,GAAvC;AACA,SAAOM,QAAP;AACD;AAMD,OAAO,eAAeK,aAAf,CAA6BL,QAA7B,EAAgE;AACrE,MAAI,CAACA,QAAQ,CAACM,EAAd,EAAkB;AAChB,UAAMC,OAAO,GAAG,MAAMC,gBAAgB,CAACR,QAAD,CAAtC;AACA,UAAM,IAAIS,KAAJ,CAAUF,OAAV,CAAN;AACD;AACF;AAMD,OAAO,SAASG,iBAAT,CAA2BV,QAA3B,EAAqD;AAC1D,MAAI,CAACA,QAAQ,CAACM,EAAd,EAAkB;AAChB,QAAIC,OAAO,aAAMP,QAAQ,CAACW,MAAf,cAAyBX,QAAQ,CAACY,UAAlC,CAAX;AACAL,IAAAA,OAAO,GAAGA,OAAO,CAACM,MAAR,GAAiB,EAAjB,aAAyBN,OAAO,CAACO,KAAR,CAAc,
|
|
1
|
+
{"version":3,"sources":["../../../../src/lib/utils/response-utils.ts"],"names":["isResponse","getResourceContentLength","getResourceUrlAndType","makeResponse","resource","headers","contentLength","String","url","type","initialDataUrl","getInitialDataUrl","TextEncoder","encode","response","Response","Object","defineProperty","value","checkResponse","ok","message","getResponseError","Error","checkResponseSync","status","statusText","length","slice","contentType","get","text","includes","error","INITIAL_DATA_LENGTH","Blob","blobSlice","Promise","resolve","reader","FileReader","onload","event","target","result","readAsDataURL","ArrayBuffer","base64","arrayBufferToBase64","buffer","binary","bytes","Uint8Array","i","byteLength","fromCharCode","btoa"],"mappings":"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","sourcesContent":["import {isResponse} from '../../javascript-utils/is-type';\nimport {getResourceContentLength, getResourceUrlAndType} from './resource-utils';\n\n/**\n * Returns a Response object\n * Adds content-length header when possible\n *\n * @param resource\n */\nexport async function makeResponse(resource: any): Promise<Response> {\n if (isResponse(resource)) {\n return resource;\n }\n\n // Add content-length header if possible\n const headers: {[header: string]: string} = {};\n\n const contentLength = getResourceContentLength(resource);\n if (contentLength >= 0) {\n headers['content-length'] = String(contentLength);\n }\n\n // `new Response(File)` does not preserve content-type and URL\n // so we add them here\n const {url, type} = getResourceUrlAndType(resource);\n if (type) {\n headers['content-type'] = type;\n }\n\n // Add a custom header with initial bytes if available\n const initialDataUrl = await getInitialDataUrl(resource);\n if (initialDataUrl) {\n headers['x-first-bytes'] = initialDataUrl;\n }\n\n // TODO - is this the best way of handling strings?\n // Maybe package as data URL instead?\n if (typeof resource === 'string') {\n // Convert to ArrayBuffer to avoid Response treating it as a URL\n resource = new TextEncoder().encode(resource);\n }\n\n // Attempt to create a Response from the resource, adding headers and setting url\n const response = new Response(resource, {headers});\n // We can't control `Response.url` via constructor, use a property override to record URL.\n Object.defineProperty(response, 'url', {value: url});\n return response;\n}\n\n/**\n * Checks response status (async) and throws a helpful error message if status is not OK.\n * @param response\n */\nexport async function checkResponse(response: Response): Promise<void> {\n if (!response.ok) {\n const message = await getResponseError(response);\n throw new Error(message);\n }\n}\n\n/**\n * Checks response status (sync) and throws a helpful error message if status is not OK.\n * @param response\n */\nexport function checkResponseSync(response: Response): void {\n if (!response.ok) {\n let message = `${response.status} ${response.statusText}`;\n message = message.length > 60 ? `${message.slice(0, 60)}...` : message;\n throw new Error(message);\n }\n}\n\n// HELPERS\n\nasync function getResponseError(response): Promise<string> {\n let message = `Failed to fetch resource ${response.url} (${response.status}): `;\n try {\n const contentType = response.headers.get('Content-Type');\n let text = response.statusText;\n if (contentType.includes('application/json')) {\n text += ` ${await response.text()}`;\n }\n message += text;\n message = message.length > 60 ? `${message.slice(0, 60)}...` : message;\n } catch (error) {\n // eslint forbids return in a finally statement, so we just catch here\n }\n return message;\n}\n\nasync function getInitialDataUrl(resource): Promise<string | null> {\n const INITIAL_DATA_LENGTH = 5;\n if (typeof resource === 'string') {\n return `data:,${resource.slice(0, INITIAL_DATA_LENGTH)}`;\n }\n if (resource instanceof Blob) {\n const blobSlice = resource.slice(0, 5);\n return await new Promise((resolve) => {\n const reader = new FileReader();\n reader.onload = (event) => resolve(event?.target?.result as string);\n reader.readAsDataURL(blobSlice);\n });\n }\n if (resource instanceof ArrayBuffer) {\n const slice = resource.slice(0, INITIAL_DATA_LENGTH);\n const base64 = arrayBufferToBase64(slice);\n return `data:base64,${base64}`;\n }\n return null;\n}\n\n// https://stackoverflow.com/questions/9267899/arraybuffer-to-base64-encoded-string\nfunction arrayBufferToBase64(buffer) {\n let binary = '';\n const bytes = new Uint8Array(buffer);\n for (let i = 0; i < bytes.byteLength; i++) {\n binary += String.fromCharCode(bytes[i]);\n }\n return btoa(binary);\n}\n"],"file":"response-utils.js"}
|
package/dist/esm/null-loader.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
const VERSION = typeof "3.
|
|
1
|
+
const VERSION = typeof "3.2.0-alpha.3" !== 'undefined' ? "3.2.0-alpha.3" : 'latest';
|
|
2
2
|
export const NullWorkerLoader = {
|
|
3
3
|
name: 'Null loader',
|
|
4
4
|
id: 'null',
|
|
@@ -12,6 +12,17 @@ export const NullWorkerLoader = {
|
|
|
12
12
|
null: {}
|
|
13
13
|
}
|
|
14
14
|
};
|
|
15
|
+
|
|
16
|
+
function parseSync(arrayBuffer, options, context) {
|
|
17
|
+
if (!options.null.echoParameters) return null;
|
|
18
|
+
context = context && JSON.parse(JSON.stringify(context));
|
|
19
|
+
return {
|
|
20
|
+
arrayBuffer,
|
|
21
|
+
options,
|
|
22
|
+
context
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
|
|
15
26
|
export const NullLoader = {
|
|
16
27
|
name: 'Null loader',
|
|
17
28
|
id: 'null',
|
|
@@ -19,16 +30,18 @@ export const NullLoader = {
|
|
|
19
30
|
version: VERSION,
|
|
20
31
|
mimeTypes: ['application/x.empty'],
|
|
21
32
|
extensions: ['null'],
|
|
22
|
-
parse: async arrayBuffer => arrayBuffer,
|
|
23
|
-
parseSync
|
|
24
|
-
parseInBatches: async function* generator(asyncIterator) {
|
|
33
|
+
parse: async (arrayBuffer, options, context) => parseSync(arrayBuffer, options, context),
|
|
34
|
+
parseSync,
|
|
35
|
+
parseInBatches: async function* generator(asyncIterator, options, context) {
|
|
25
36
|
for await (const batch of asyncIterator) {
|
|
26
|
-
yield batch;
|
|
37
|
+
yield parseSync(batch, options, context);
|
|
27
38
|
}
|
|
28
39
|
},
|
|
29
40
|
tests: [() => false],
|
|
30
41
|
options: {
|
|
31
|
-
null: {
|
|
42
|
+
null: {
|
|
43
|
+
echoParameters: false
|
|
44
|
+
}
|
|
32
45
|
}
|
|
33
46
|
};
|
|
34
47
|
//# sourceMappingURL=null-loader.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/null-loader.ts"],"names":["VERSION","NullWorkerLoader","name","id","module","version","worker","mimeTypes","extensions","tests","options","null","
|
|
1
|
+
{"version":3,"sources":["../../src/null-loader.ts"],"names":["VERSION","NullWorkerLoader","name","id","module","version","worker","mimeTypes","extensions","tests","options","null","parseSync","arrayBuffer","context","echoParameters","JSON","parse","stringify","NullLoader","parseInBatches","generator","asyncIterator","batch"],"mappings":"AAEA,MAAMA,OAAO,GAAG,2BAAuB,WAAvB,qBAAmD,QAAnE;AAOA,OAAO,MAAMC,gBAAwB,GAAG;AACtCC,EAAAA,IAAI,EAAE,aADgC;AAEtCC,EAAAA,EAAE,EAAE,MAFkC;AAGtCC,EAAAA,MAAM,EAAE,MAH8B;AAItCC,EAAAA,OAAO,EAAEL,OAJ6B;AAKtCM,EAAAA,MAAM,EAAE,IAL8B;AAMtCC,EAAAA,SAAS,EAAE,CAAC,qBAAD,CAN2B;AAOtCC,EAAAA,UAAU,EAAE,CAAC,MAAD,CAP0B;AAQtCC,EAAAA,KAAK,EAAE,CAAC,MAAM,KAAP,CAR+B;AAStCC,EAAAA,OAAO,EAAE;AACPC,IAAAA,IAAI,EAAE;AADC;AAT6B,CAAjC;;AAkBP,SAASC,SAAT,CAAmBC,WAAnB,EAAgCH,OAAhC,EAAyCI,OAAzC,EAAkD;AAChD,MAAI,CAACJ,OAAO,CAACC,IAAR,CAAaI,cAAlB,EAAkC,OAAO,IAAP;AAClCD,EAAAA,OAAO,GAAGA,OAAO,IAAIE,IAAI,CAACC,KAAL,CAAWD,IAAI,CAACE,SAAL,CAAeJ,OAAf,CAAX,CAArB;AACA,SAAO;AAACD,IAAAA,WAAD;AAAcH,IAAAA,OAAd;AAAuBI,IAAAA;AAAvB,GAAP;AACD;;AAKD,OAAO,MAAMK,UAA4B,GAAG;AAC1CjB,EAAAA,IAAI,EAAE,aADoC;AAE1CC,EAAAA,EAAE,EAAE,MAFsC;AAG1CC,EAAAA,MAAM,EAAE,MAHkC;AAI1CC,EAAAA,OAAO,EAAEL,OAJiC;AAK1CO,EAAAA,SAAS,EAAE,CAAC,qBAAD,CAL+B;AAM1CC,EAAAA,UAAU,EAAE,CAAC,MAAD,CAN8B;AAO1CS,EAAAA,KAAK,EAAE,OAAOJ,WAAP,EAAoBH,OAApB,EAA6BI,OAA7B,KAAyCF,SAAS,CAACC,WAAD,EAAcH,OAAd,EAAuBI,OAAvB,CAPf;AAQ1CF,EAAAA,SAR0C;AAS1CQ,EAAAA,cAAc,EAAE,gBAAgBC,SAAhB,CAA0BC,aAA1B,EAAyCZ,OAAzC,EAAkDI,OAAlD,EAA2D;AACzE,eAAW,MAAMS,KAAjB,IAA0BD,aAA1B,EAAyC;AACvC,YAAMV,SAAS,CAACW,KAAD,EAAQb,OAAR,EAAiBI,OAAjB,CAAf;AACD;AACF,GAbyC;AAc1CL,EAAAA,KAAK,EAAE,CAAC,MAAM,KAAP,CAdmC;AAe1CC,EAAAA,OAAO,EAAE;AACPC,IAAAA,IAAI,EAAE;AACJI,MAAAA,cAAc,EAAE;AADZ;AADC;AAfiC,CAArC","sourcesContent":["// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n\nimport {Loader, LoaderWithParser} from '@loaders.gl/loader-utils';\n\n/**\n * Loads any data and returns null (or optionally passes through data unparsed)\n */\nexport const NullWorkerLoader: Loader = {\n name: 'Null loader',\n id: 'null',\n module: 'core',\n version: VERSION,\n worker: true,\n mimeTypes: ['application/x.empty'],\n extensions: ['null'],\n tests: [() => false],\n options: {\n null: {}\n }\n};\n\n/**\n * Returns arguments passed to the parse API in a format that can be transfered to a\n * web worker. The `context` parameter is stripped using JSON.stringify & parse.\n */\nfunction parseSync(arrayBuffer, options, context) {\n if (!options.null.echoParameters) return null;\n context = context && JSON.parse(JSON.stringify(context));\n return {arrayBuffer, options, context};\n}\n\n/**\n * Loads any data and returns null (or optionally passes through data unparsed)\n */\nexport const NullLoader: LoaderWithParser = {\n name: 'Null loader',\n id: 'null',\n module: 'core',\n version: VERSION,\n mimeTypes: ['application/x.empty'],\n extensions: ['null'],\n parse: async (arrayBuffer, options, context) => parseSync(arrayBuffer, options, context),\n parseSync,\n parseInBatches: async function* generator(asyncIterator, options, context) {\n for await (const batch of asyncIterator) {\n yield parseSync(batch, options, context);\n }\n },\n tests: [() => false],\n options: {\n null: {\n echoParameters: false\n }\n }\n};\n"],"file":"null-loader.js"}
|
package/dist/index.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ export { fetchFile } from './lib/fetch/fetch-file';
|
|
|
2
2
|
export { readArrayBuffer } from './lib/fetch/read-array-buffer';
|
|
3
3
|
export { readFileSync } from './lib/fetch/read-file';
|
|
4
4
|
export { writeFile, writeFileSync } from './lib/fetch/write-file';
|
|
5
|
-
export { setLoaderOptions } from './lib/api/
|
|
5
|
+
export { setLoaderOptions, getLoaderOptions } from './lib/api/loader-options';
|
|
6
6
|
export { registerLoaders } from './lib/api/register-loaders';
|
|
7
7
|
export { selectLoader, selectLoaderSync } from './lib/api/select-loader';
|
|
8
8
|
export { parse } from './lib/api/parse';
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,SAAS,EAAC,MAAM,wBAAwB,CAAC;AAEjD,OAAO,EAAC,eAAe,EAAC,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAC,YAAY,EAAC,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAC,SAAS,EAAE,aAAa,EAAC,MAAM,wBAAwB,CAAC;AAGhE,OAAO,EAAC,gBAAgB,EAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,SAAS,EAAC,MAAM,wBAAwB,CAAC;AAEjD,OAAO,EAAC,eAAe,EAAC,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAC,YAAY,EAAC,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAC,SAAS,EAAE,aAAa,EAAC,MAAM,wBAAwB,CAAC;AAGhE,OAAO,EAAC,gBAAgB,EAAE,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAC5E,OAAO,EAAC,eAAe,EAAC,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAC,YAAY,EAAE,gBAAgB,EAAC,MAAM,yBAAyB,CAAC;AAGvE,OAAO,EAAC,KAAK,EAAC,MAAM,iBAAiB,CAAC;AACtC,OAAO,EAAC,SAAS,EAAC,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAC,cAAc,EAAC,MAAM,4BAA4B,CAAC;AAE1D,OAAO,EAAC,IAAI,EAAC,MAAM,gBAAgB,CAAC;AACpC,OAAO,EAAC,aAAa,EAAC,MAAM,2BAA2B,CAAC;AAGxD,OAAO,EAAC,MAAM,EAAE,UAAU,EAAE,eAAe,EAAE,UAAU,EAAE,cAAc,EAAC,MAAM,kBAAkB,CAAC;AACjG,OAAO,EAAC,IAAI,EAAE,QAAQ,EAAC,MAAM,gBAAgB,CAAC;AAG9C,OAAO,EAAC,aAAa,EAAE,aAAa,EAAE,WAAW,EAAC,MAAM,0BAA0B,CAAC;AACnF,OAAO,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAG1D,OAAO,EAAC,YAAY,EAAC,MAAM,yCAAyC,CAAC;AACrE,OAAO,EAAC,UAAU,EAAC,MAAM,0CAA0C,CAAC;AAGpE,OAAO,EAAC,gBAAgB,EAAE,UAAU,EAAC,MAAM,eAAe,CAAC;AAC3D,OAAO,EAAC,UAAU,EAAC,MAAM,0BAA0B,CAAC;AAGpD,OAAO,EAAC,OAAO,IAAI,cAAc,EAAC,MAAM,+BAA+B,CAAC;AACxE,OAAO,EAAC,OAAO,IAAI,kBAAkB,EAAC,MAAM,sCAAsC,CAAC;AAGnF,OAAO,EAAC,kBAAkB,EAAC,MAAM,4BAA4B,CAAC;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,MAAM,4BAA4B,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -3,8 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.
|
|
7
|
-
exports.isWritableStream = exports.isReadableStream = exports.isResponse = exports.isIterator = void 0;
|
|
6
|
+
exports.isIterable = exports.isPromise = exports.isPureObject = exports.makeNumberedLineIterator = exports.makeLineIterator = exports.makeTextEncoderIterator = exports.makeTextDecoderIterator = exports.concatenateArrayBuffersAsync = exports.forEach = exports.assert = exports.document = exports.global = exports.window = exports.self = exports.isWorker = exports.isBrowser = exports._unregisterLoaders = exports._BrowserFileSystem = exports._fetchProgress = exports.JSONLoader = exports.NullLoader = exports.NullWorkerLoader = exports.makeStream = exports.makeIterator = exports.RequestScheduler = exports.resolvePath = exports.getPathPrefix = exports.setPathPrefix = exports.saveSync = exports.save = exports.encodeURLtoURL = exports.encodeText = exports.encodeInBatches = exports.encodeSync = exports.encode = exports.loadInBatches = exports.load = exports.parseInBatches = exports.parseSync = exports.parse = exports.selectLoaderSync = exports.selectLoader = exports.registerLoaders = exports.getLoaderOptions = exports.setLoaderOptions = exports.writeFileSync = exports.writeFile = exports.readFileSync = exports.readArrayBuffer = exports.fetchFile = void 0;
|
|
7
|
+
exports.isWritableStream = exports.isReadableStream = exports.isResponse = exports.isIterator = exports.isAsyncIterable = void 0;
|
|
8
8
|
// FILE READING AND WRITING
|
|
9
9
|
var fetch_file_1 = require("./lib/fetch/fetch-file");
|
|
10
10
|
Object.defineProperty(exports, "fetchFile", { enumerable: true, get: function () { return fetch_file_1.fetchFile; } });
|
|
@@ -16,8 +16,9 @@ var write_file_1 = require("./lib/fetch/write-file");
|
|
|
16
16
|
Object.defineProperty(exports, "writeFile", { enumerable: true, get: function () { return write_file_1.writeFile; } });
|
|
17
17
|
Object.defineProperty(exports, "writeFileSync", { enumerable: true, get: function () { return write_file_1.writeFileSync; } });
|
|
18
18
|
// CONFIGURATION
|
|
19
|
-
var
|
|
20
|
-
Object.defineProperty(exports, "setLoaderOptions", { enumerable: true, get: function () { return
|
|
19
|
+
var loader_options_1 = require("./lib/api/loader-options");
|
|
20
|
+
Object.defineProperty(exports, "setLoaderOptions", { enumerable: true, get: function () { return loader_options_1.setLoaderOptions; } });
|
|
21
|
+
Object.defineProperty(exports, "getLoaderOptions", { enumerable: true, get: function () { return loader_options_1.getLoaderOptions; } });
|
|
21
22
|
var register_loaders_1 = require("./lib/api/register-loaders");
|
|
22
23
|
Object.defineProperty(exports, "registerLoaders", { enumerable: true, get: function () { return register_loaders_1.registerLoaders; } });
|
|
23
24
|
var select_loader_1 = require("./lib/api/select-loader");
|
package/dist/lib/api/encode.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"encode.d.ts","sourceRoot":"","sources":["../../../src/lib/api/encode.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"encode.d.ts","sourceRoot":"","sources":["../../../src/lib/api/encode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,aAAa,EAAsB,MAAM,0BAA0B,CAAC;AAQpF;;GAEG;AACH,wBAAsB,MAAM,CAC1B,IAAI,EAAE,GAAG,EACT,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,WAAW,CAAC,CAqDtB;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,WAAW,CAK1F;AAED;;;;;GAKG;AACH,wBAAsB,UAAU,CAC9B,IAAI,EAAE,GAAG,EACT,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,MAAM,CAAC,CAWjB;AAED;;GAEG;AACH,wBAAgB,eAAe,CAC7B,IAAI,EAAE,GAAG,EACT,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,aAAa,GACtB,aAAa,CAAC,WAAW,CAAC,CAO5B;AAED;;;GAGG;AACH,wBAAsB,cAAc,CAClC,QAAQ,KAAA,EACR,SAAS,KAAA,EACT,MAAM,EAAE,MAAM,EACd,OAAO,KAAA,GACN,OAAO,CAAC,MAAM,CAAC,CAQjB"}
|
package/dist/lib/api/encode.js
CHANGED
|
@@ -2,13 +2,21 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.encodeURLtoURL = exports.encodeInBatches = exports.encodeText = exports.encodeSync = exports.encode = void 0;
|
|
4
4
|
const loader_utils_1 = require("@loaders.gl/loader-utils");
|
|
5
|
+
const worker_utils_1 = require("@loaders.gl/worker-utils");
|
|
5
6
|
const loader_utils_2 = require("@loaders.gl/loader-utils");
|
|
7
|
+
const loader_utils_3 = require("@loaders.gl/loader-utils");
|
|
6
8
|
const write_file_1 = require("../fetch/write-file");
|
|
7
9
|
const fetch_file_1 = require("../fetch/fetch-file");
|
|
10
|
+
const loader_options_1 = require("./loader-options");
|
|
8
11
|
/**
|
|
9
12
|
* Encode loaded data into a binary ArrayBuffer using the specified Writer.
|
|
10
13
|
*/
|
|
11
14
|
async function encode(data, writer, options) {
|
|
15
|
+
const globalOptions = (0, loader_options_1.getLoaderOptions)();
|
|
16
|
+
options = { ...globalOptions, ...options };
|
|
17
|
+
if ((0, loader_utils_1.canEncodeWithWorker)(writer, options)) {
|
|
18
|
+
return await (0, worker_utils_1.processOnWorker)(writer, data, options);
|
|
19
|
+
}
|
|
12
20
|
// TODO Merge default writer options with options argument like it is done in load module.
|
|
13
21
|
if (writer.encode) {
|
|
14
22
|
return await writer.encode(data, options);
|
|
@@ -29,9 +37,9 @@ async function encode(data, writer, options) {
|
|
|
29
37
|
chunks.push(batch);
|
|
30
38
|
}
|
|
31
39
|
// @ts-ignore
|
|
32
|
-
return (0,
|
|
40
|
+
return (0, loader_utils_2.concatenateArrayBuffers)(...chunks);
|
|
33
41
|
}
|
|
34
|
-
if (!
|
|
42
|
+
if (!loader_utils_3.isBrowser && writer.encodeURLtoURL) {
|
|
35
43
|
// TODO - how to generate filenames with correct extensions?
|
|
36
44
|
const tmpInputFilename = getTemporaryFilename('input');
|
|
37
45
|
await (0, write_file_1.writeFile)(tmpInputFilename, data);
|
|
@@ -87,9 +95,9 @@ exports.encodeInBatches = encodeInBatches;
|
|
|
87
95
|
* @note Node.js only. This function enables using command-line converters as "writers".
|
|
88
96
|
*/
|
|
89
97
|
async function encodeURLtoURL(inputUrl, outputUrl, writer, options) {
|
|
90
|
-
inputUrl = (0,
|
|
91
|
-
outputUrl = (0,
|
|
92
|
-
if (
|
|
98
|
+
inputUrl = (0, loader_utils_2.resolvePath)(inputUrl);
|
|
99
|
+
outputUrl = (0, loader_utils_2.resolvePath)(outputUrl);
|
|
100
|
+
if (loader_utils_3.isBrowser || !writer.encodeURLtoURL) {
|
|
93
101
|
throw new Error();
|
|
94
102
|
}
|
|
95
103
|
const outputFilename = await writer.encodeURLtoURL(inputUrl, outputUrl, options);
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"loader-options.d.ts","sourceRoot":"","sources":["../../../src/lib/api/loader-options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,IAAI,gBAAgB,EAAC,MAAM,8BAA8B,CAAC;AAClF,OAAO,EAAC,sBAAsB,IAAI,gBAAgB,EAAC,MAAM,8BAA8B,CAAC"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getLoaderOptions = exports.setLoaderOptions = void 0;
|
|
4
|
+
var option_utils_1 = require("../loader-utils/option-utils");
|
|
5
|
+
Object.defineProperty(exports, "setLoaderOptions", { enumerable: true, get: function () { return option_utils_1.setGlobalOptions; } });
|
|
6
|
+
var option_utils_2 = require("../loader-utils/option-utils");
|
|
7
|
+
Object.defineProperty(exports, "getLoaderOptions", { enumerable: true, get: function () { return option_utils_2.getGlobalLoaderOptions; } });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse.d.ts","sourceRoot":"","sources":["../../../src/lib/api/parse.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"parse.d.ts","sourceRoot":"","sources":["../../../src/lib/api/parse.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAW7F;;;;;;GAMG;AACH,wBAAsB,KAAK,CACzB,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,GACtB,OAAO,CAAC,GAAG,CAAC,CAmCd"}
|
package/dist/lib/api/parse.js
CHANGED
|
@@ -4,6 +4,7 @@ exports.parse = void 0;
|
|
|
4
4
|
const worker_utils_1 = require("@loaders.gl/worker-utils");
|
|
5
5
|
const loader_utils_1 = require("@loaders.gl/loader-utils");
|
|
6
6
|
const normalize_loader_1 = require("../loader-utils/normalize-loader");
|
|
7
|
+
const is_type_1 = require("../../javascript-utils/is-type");
|
|
7
8
|
const option_utils_1 = require("../loader-utils/option-utils");
|
|
8
9
|
const get_data_1 = require("../loader-utils/get-data");
|
|
9
10
|
const loader_context_1 = require("../loader-utils/loader-context");
|
|
@@ -50,6 +51,13 @@ exports.parse = parse;
|
|
|
50
51
|
// TODO - should accept loader.parseAsyncIterator and concatenate.
|
|
51
52
|
async function parseWithLoader(loader, data, options, context) {
|
|
52
53
|
(0, worker_utils_1.validateWorkerVersion)(loader);
|
|
54
|
+
if ((0, is_type_1.isResponse)(data)) {
|
|
55
|
+
// Serialize to support passing the response to web worker
|
|
56
|
+
const response = data;
|
|
57
|
+
const { ok, redirected, status, statusText, type, url } = response;
|
|
58
|
+
const headers = Object.fromEntries(response.headers.entries());
|
|
59
|
+
context.response = { headers, ok, redirected, status, statusText, type, url };
|
|
60
|
+
}
|
|
53
61
|
data = await (0, get_data_1.getArrayBufferOrStringFromData)(data, loader, options);
|
|
54
62
|
// First check for synchronous text parser, wrap results in promises
|
|
55
63
|
if (loader.parseTextSync && typeof data === 'string') {
|
|
@@ -83,6 +83,7 @@ function selectLoaderSync(data, loaders = [], options, context) {
|
|
|
83
83
|
}
|
|
84
84
|
exports.selectLoaderSync = selectLoaderSync;
|
|
85
85
|
/** Implements loaders selection logic */
|
|
86
|
+
// eslint-disable-next-line complexity
|
|
86
87
|
function selectLoaderInternal(data, loaders, options, context) {
|
|
87
88
|
const { url, type } = (0, resource_utils_1.getResourceUrlAndType)(data);
|
|
88
89
|
const testUrl = url || context?.url;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"option-defaults.d.ts","sourceRoot":"","sources":["../../../src/lib/loader-utils/option-defaults.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"option-defaults.d.ts","sourceRoot":"","sources":["../../../src/lib/loader-utils/option-defaults.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAI5D,eAAO,MAAM,sBAAsB,EAAE,aAqBpC,CAAC;AAEF,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;CAiBlC,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.REMOVED_LOADER_OPTIONS = exports.DEFAULT_LOADER_OPTIONS = void 0;
|
|
4
|
+
const loader_utils_1 = require("@loaders.gl/loader-utils");
|
|
4
5
|
const loggers_1 = require("./loggers");
|
|
5
6
|
exports.DEFAULT_LOADER_OPTIONS = {
|
|
6
7
|
// baseUri
|
|
@@ -12,7 +13,8 @@ exports.DEFAULT_LOADER_OPTIONS = {
|
|
|
12
13
|
worker: true,
|
|
13
14
|
maxConcurrency: 3,
|
|
14
15
|
maxMobileConcurrency: 1,
|
|
15
|
-
reuseWorkers:
|
|
16
|
+
reuseWorkers: loader_utils_1.isBrowser,
|
|
17
|
+
_nodeWorkers: false,
|
|
16
18
|
_workerType: '',
|
|
17
19
|
limit: 0,
|
|
18
20
|
_limitMB: 0,
|
|
@@ -13,6 +13,14 @@ declare type GlobalLoaderState = {
|
|
|
13
13
|
* Wraps initialization of global variable in function to defeat overly aggressive tree-shakers
|
|
14
14
|
*/
|
|
15
15
|
export declare function getGlobalLoaderState(): GlobalLoaderState;
|
|
16
|
+
/**
|
|
17
|
+
* Store global loader options on the global object to increase chances of cross loaders-version interoperability
|
|
18
|
+
* NOTE: This use case is not reliable but can help when testing new versions of loaders.gl with existing frameworks
|
|
19
|
+
* @returns global loader options merged with default loader options
|
|
20
|
+
*/
|
|
21
|
+
export declare const getGlobalLoaderOptions: () => {
|
|
22
|
+
[key: string]: any;
|
|
23
|
+
};
|
|
16
24
|
/**
|
|
17
25
|
* Set global loader options
|
|
18
26
|
* @param options
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"option-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/loader-utils/option-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAE,aAAa,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAKnF;;GAEG;AACH,aAAK,iBAAiB,GAAG;IACvB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,aAAa,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,CAAC;CACrC,CAAC;AAEF;;;GAGG;AACH,wBAAgB,oBAAoB,IAAI,iBAAiB,CASxD;
|
|
1
|
+
{"version":3,"file":"option-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/loader-utils/option-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAE,aAAa,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAKnF;;GAEG;AACH,aAAK,iBAAiB,GAAG;IACvB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,aAAa,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,CAAC;CACrC,CAAC;AAEF;;;GAGG;AACH,wBAAgB,oBAAoB,IAAI,iBAAiB,CASxD;AAED;;;;GAIG;AACH,eAAO,MAAM,sBAAsB;;CAKlC,CAAC;AAEF;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAItD;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,MAAM,EAAE,EAClB,GAAG,CAAC,EAAE,MAAM,GACX,MAAM,CAMR;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC,OAuB/E"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getFetchFunction = exports.normalizeOptions = exports.setGlobalOptions = exports.getGlobalLoaderState = void 0;
|
|
3
|
+
exports.getFetchFunction = exports.normalizeOptions = exports.setGlobalOptions = exports.getGlobalLoaderOptions = exports.getGlobalLoaderState = void 0;
|
|
4
4
|
const is_type_1 = require("../../javascript-utils/is-type");
|
|
5
5
|
const fetch_file_1 = require("../fetch/fetch-file");
|
|
6
6
|
const loggers_1 = require("./loggers");
|
|
@@ -19,21 +19,25 @@ function getGlobalLoaderState() {
|
|
|
19
19
|
return loaders._state;
|
|
20
20
|
}
|
|
21
21
|
exports.getGlobalLoaderState = getGlobalLoaderState;
|
|
22
|
-
|
|
23
|
-
|
|
22
|
+
/**
|
|
23
|
+
* Store global loader options on the global object to increase chances of cross loaders-version interoperability
|
|
24
|
+
* NOTE: This use case is not reliable but can help when testing new versions of loaders.gl with existing frameworks
|
|
25
|
+
* @returns global loader options merged with default loader options
|
|
26
|
+
*/
|
|
24
27
|
const getGlobalLoaderOptions = () => {
|
|
25
28
|
const state = getGlobalLoaderState();
|
|
26
29
|
// Ensure all default loader options from this library are mentioned
|
|
27
30
|
state.globalOptions = state.globalOptions || { ...option_defaults_1.DEFAULT_LOADER_OPTIONS };
|
|
28
31
|
return state.globalOptions;
|
|
29
32
|
};
|
|
33
|
+
exports.getGlobalLoaderOptions = getGlobalLoaderOptions;
|
|
30
34
|
/**
|
|
31
35
|
* Set global loader options
|
|
32
36
|
* @param options
|
|
33
37
|
*/
|
|
34
38
|
function setGlobalOptions(options) {
|
|
35
39
|
const state = getGlobalLoaderState();
|
|
36
|
-
const globalOptions = getGlobalLoaderOptions();
|
|
40
|
+
const globalOptions = (0, exports.getGlobalLoaderOptions)();
|
|
37
41
|
state.globalOptions = normalizeOptionsInternal(globalOptions, options);
|
|
38
42
|
}
|
|
39
43
|
exports.setGlobalOptions = setGlobalOptions;
|
|
@@ -57,7 +61,7 @@ exports.normalizeOptions = normalizeOptions;
|
|
|
57
61
|
* @param context
|
|
58
62
|
*/
|
|
59
63
|
function getFetchFunction(options, context) {
|
|
60
|
-
const globalOptions = getGlobalLoaderOptions();
|
|
64
|
+
const globalOptions = (0, exports.getGlobalLoaderOptions)();
|
|
61
65
|
const fetchOptions = options || globalOptions;
|
|
62
66
|
// options.fetch can be a function
|
|
63
67
|
if (typeof fetchOptions.fetch === 'function') {
|
|
@@ -141,7 +145,7 @@ function normalizeOptionsInternal(loader, options, url) {
|
|
|
141
145
|
if (mergedOptions.log === null) {
|
|
142
146
|
mergedOptions.log = new loggers_1.NullLog();
|
|
143
147
|
}
|
|
144
|
-
mergeNestedFields(mergedOptions, getGlobalLoaderOptions());
|
|
148
|
+
mergeNestedFields(mergedOptions, (0, exports.getGlobalLoaderOptions)());
|
|
145
149
|
mergeNestedFields(mergedOptions, options);
|
|
146
150
|
return mergedOptions;
|
|
147
151
|
}
|
|
@@ -61,7 +61,7 @@ exports.checkResponse = checkResponse;
|
|
|
61
61
|
function checkResponseSync(response) {
|
|
62
62
|
if (!response.ok) {
|
|
63
63
|
let message = `${response.status} ${response.statusText}`;
|
|
64
|
-
message = message.length > 60 ? `${message.slice(60)}...` : message;
|
|
64
|
+
message = message.length > 60 ? `${message.slice(0, 60)}...` : message;
|
|
65
65
|
throw new Error(message);
|
|
66
66
|
}
|
|
67
67
|
}
|
|
@@ -76,7 +76,7 @@ async function getResponseError(response) {
|
|
|
76
76
|
text += ` ${await response.text()}`;
|
|
77
77
|
}
|
|
78
78
|
message += text;
|
|
79
|
-
message = message.length > 60 ? `${message.slice(60)}...` : message;
|
|
79
|
+
message = message.length > 60 ? `${message.slice(0, 60)}...` : message;
|
|
80
80
|
}
|
|
81
81
|
catch (error) {
|
|
82
82
|
// eslint forbids return in a finally statement, so we just catch here
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"null-loader.d.ts","sourceRoot":"","sources":["../src/null-loader.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,MAAM,EAAE,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAElE;;GAEG;AACH,eAAO,MAAM,gBAAgB,EAAE,MAY9B,CAAC;
|
|
1
|
+
{"version":3,"file":"null-loader.d.ts","sourceRoot":"","sources":["../src/null-loader.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,MAAM,EAAE,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAElE;;GAEG;AACH,eAAO,MAAM,gBAAgB,EAAE,MAY9B,CAAC;AAYF;;GAEG;AACH,eAAO,MAAM,UAAU,EAAE,gBAoBxB,CAAC"}
|
package/dist/null-loader.js
CHANGED
|
@@ -20,6 +20,16 @@ exports.NullWorkerLoader = {
|
|
|
20
20
|
null: {}
|
|
21
21
|
}
|
|
22
22
|
};
|
|
23
|
+
/**
|
|
24
|
+
* Returns arguments passed to the parse API in a format that can be transfered to a
|
|
25
|
+
* web worker. The `context` parameter is stripped using JSON.stringify & parse.
|
|
26
|
+
*/
|
|
27
|
+
function parseSync(arrayBuffer, options, context) {
|
|
28
|
+
if (!options.null.echoParameters)
|
|
29
|
+
return null;
|
|
30
|
+
context = context && JSON.parse(JSON.stringify(context));
|
|
31
|
+
return { arrayBuffer, options, context };
|
|
32
|
+
}
|
|
23
33
|
/**
|
|
24
34
|
* Loads any data and returns null (or optionally passes through data unparsed)
|
|
25
35
|
*/
|
|
@@ -30,15 +40,17 @@ exports.NullLoader = {
|
|
|
30
40
|
version: VERSION,
|
|
31
41
|
mimeTypes: ['application/x.empty'],
|
|
32
42
|
extensions: ['null'],
|
|
33
|
-
parse: async (arrayBuffer) => arrayBuffer,
|
|
34
|
-
parseSync
|
|
35
|
-
parseInBatches: async function* generator(asyncIterator) {
|
|
43
|
+
parse: async (arrayBuffer, options, context) => parseSync(arrayBuffer, options, context),
|
|
44
|
+
parseSync,
|
|
45
|
+
parseInBatches: async function* generator(asyncIterator, options, context) {
|
|
36
46
|
for await (const batch of asyncIterator) {
|
|
37
|
-
yield batch;
|
|
47
|
+
yield parseSync(batch, options, context);
|
|
38
48
|
}
|
|
39
49
|
},
|
|
40
50
|
tests: [() => false],
|
|
41
51
|
options: {
|
|
42
|
-
null: {
|
|
52
|
+
null: {
|
|
53
|
+
echoParameters: false
|
|
54
|
+
}
|
|
43
55
|
}
|
|
44
56
|
};
|