@loaders.gl/core 4.0.0-alpha.21 → 4.0.0-alpha.22

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.
Files changed (100) hide show
  1. package/dist/dist.min.js +15 -18
  2. package/dist/es5/index.js +0 -7
  3. package/dist/es5/index.js.map +1 -1
  4. package/dist/es5/iterators/make-stream/make-node-stream.js.map +1 -1
  5. package/dist/es5/lib/api/parse-in-batches.js +11 -13
  6. package/dist/es5/lib/api/parse-in-batches.js.map +1 -1
  7. package/dist/es5/lib/api/parse-sync.js +2 -6
  8. package/dist/es5/lib/api/parse-sync.js.map +1 -1
  9. package/dist/es5/lib/api/parse.js +10 -12
  10. package/dist/es5/lib/api/parse.js.map +1 -1
  11. package/dist/es5/lib/api/save.js.map +1 -1
  12. package/dist/es5/lib/api/select-loader.js +5 -3
  13. package/dist/es5/lib/api/select-loader.js.map +1 -1
  14. package/dist/es5/lib/filesystems/browser-filesystem.js.map +1 -1
  15. package/dist/es5/lib/filesystems/filesystem.js.map +1 -1
  16. package/dist/es5/lib/init.js +1 -1
  17. package/dist/es5/lib/init.js.map +1 -1
  18. package/dist/es5/lib/loader-utils/get-data.js.map +1 -1
  19. package/dist/es5/lib/loader-utils/loader-context.js +2 -2
  20. package/dist/es5/lib/loader-utils/loader-context.js.map +1 -1
  21. package/dist/es5/lib/loader-utils/loggers.js.map +1 -1
  22. package/dist/es5/lib/loader-utils/option-utils.js +3 -4
  23. package/dist/es5/lib/loader-utils/option-utils.js.map +1 -1
  24. package/dist/es5/lib/progress/fetch-progress.js.map +1 -1
  25. package/dist/es5/null-loader.js +1 -1
  26. package/dist/es5/null-loader.js.map +1 -1
  27. package/dist/esm/index.js +0 -1
  28. package/dist/esm/index.js.map +1 -1
  29. package/dist/esm/iterators/make-stream/make-node-stream.js.map +1 -1
  30. package/dist/esm/lib/api/parse-in-batches.js +3 -4
  31. package/dist/esm/lib/api/parse-in-batches.js.map +1 -1
  32. package/dist/esm/lib/api/parse-sync.js +2 -4
  33. package/dist/esm/lib/api/parse-sync.js.map +1 -1
  34. package/dist/esm/lib/api/parse.js +1 -2
  35. package/dist/esm/lib/api/parse.js.map +1 -1
  36. package/dist/esm/lib/api/save.js.map +1 -1
  37. package/dist/esm/lib/api/select-loader.js +5 -3
  38. package/dist/esm/lib/api/select-loader.js.map +1 -1
  39. package/dist/esm/lib/filesystems/browser-filesystem.js.map +1 -1
  40. package/dist/esm/lib/filesystems/filesystem.js.map +1 -1
  41. package/dist/esm/lib/init.js +1 -1
  42. package/dist/esm/lib/init.js.map +1 -1
  43. package/dist/esm/lib/loader-utils/get-data.js.map +1 -1
  44. package/dist/esm/lib/loader-utils/loader-context.js +2 -2
  45. package/dist/esm/lib/loader-utils/loader-context.js.map +1 -1
  46. package/dist/esm/lib/loader-utils/loggers.js.map +1 -1
  47. package/dist/esm/lib/loader-utils/option-utils.js +2 -2
  48. package/dist/esm/lib/loader-utils/option-utils.js.map +1 -1
  49. package/dist/esm/lib/progress/fetch-progress.js.map +1 -1
  50. package/dist/esm/null-loader.js +1 -1
  51. package/dist/esm/null-loader.js.map +1 -1
  52. package/dist/index.d.ts +1 -1
  53. package/dist/index.d.ts.map +1 -1
  54. package/dist/iterators/make-stream/make-node-stream.d.ts.map +1 -1
  55. package/dist/iterators/make-stream/make-node-stream.js +5 -2
  56. package/dist/lib/api/parse-in-batches.js +1 -2
  57. package/dist/lib/api/parse-sync.d.ts.map +1 -1
  58. package/dist/lib/api/parse-sync.js +2 -3
  59. package/dist/lib/api/parse.d.ts +2 -2
  60. package/dist/lib/api/parse.js +4 -2
  61. package/dist/lib/api/save.d.ts +2 -2
  62. package/dist/lib/api/save.d.ts.map +1 -1
  63. package/dist/lib/api/select-loader.d.ts.map +1 -1
  64. package/dist/lib/api/select-loader.js +8 -3
  65. package/dist/lib/filesystems/browser-filesystem.d.ts +2 -2
  66. package/dist/lib/filesystems/browser-filesystem.d.ts.map +1 -1
  67. package/dist/lib/filesystems/browser-filesystem.js +1 -1
  68. package/dist/lib/filesystems/filesystem.d.ts.map +1 -1
  69. package/dist/lib/filesystems/filesystem.js +1 -0
  70. package/dist/lib/init.d.ts.map +1 -1
  71. package/dist/lib/init.js +1 -0
  72. package/dist/lib/loader-utils/get-data.d.ts.map +1 -1
  73. package/dist/lib/loader-utils/get-data.js +1 -0
  74. package/dist/lib/loader-utils/loader-context.d.ts +5 -2
  75. package/dist/lib/loader-utils/loader-context.d.ts.map +1 -1
  76. package/dist/lib/loader-utils/loader-context.js +3 -3
  77. package/dist/lib/loader-utils/loggers.d.ts +10 -8
  78. package/dist/lib/loader-utils/loggers.d.ts.map +1 -1
  79. package/dist/lib/loader-utils/option-utils.d.ts +1 -1
  80. package/dist/lib/loader-utils/option-utils.d.ts.map +1 -1
  81. package/dist/lib/loader-utils/option-utils.js +7 -5
  82. package/dist/null-worker-node.js +9 -4
  83. package/dist/null-worker.js +9 -4
  84. package/package.json +4 -4
  85. package/src/index.ts +1 -1
  86. package/src/iterators/make-stream/make-node-stream.ts +5 -2
  87. package/src/lib/api/parse-in-batches.ts +5 -5
  88. package/src/lib/api/parse-sync.ts +4 -5
  89. package/src/lib/api/parse.ts +9 -5
  90. package/src/lib/api/save.ts +2 -2
  91. package/src/lib/api/select-loader.ts +24 -13
  92. package/src/lib/filesystems/browser-filesystem.ts +3 -3
  93. package/src/lib/filesystems/filesystem.ts +2 -0
  94. package/src/lib/init.ts +1 -0
  95. package/src/lib/loader-utils/get-data.ts +1 -0
  96. package/src/lib/loader-utils/loader-context.ts +8 -5
  97. package/src/lib/loader-utils/loggers.ts +10 -8
  98. package/src/lib/loader-utils/option-utils.ts +23 -14
  99. package/src/lib/progress/fetch-progress.ts +9 -1
  100. package/src/null-loader.ts +1 -1
@@ -1 +1 @@
1
- {"version":3,"file":"loggers.js","names":["Log","probeLog","id","NullLog","log","info","warn","error","ConsoleLog","constructor","_defineProperty","console","_len","arguments","length","args","Array","_key","bind","_len2","_key2","_len3","_key3","_len4","_key4"],"sources":["../../../../src/lib/loader-utils/loggers.ts"],"sourcesContent":["// probe.gl Log compatible loggers\nimport {Log} from '@probe.gl/log';\n\nexport const probeLog = new Log({id: 'loaders.gl'});\n\n// Logs nothing\nexport class NullLog {\n log() {\n return () => {};\n }\n info() {\n return () => {};\n }\n warn() {\n return () => {};\n }\n error() {\n return () => {};\n }\n}\n\n// Logs to console\nexport class ConsoleLog {\n console;\n\n constructor() {\n this.console = console; // eslint-disable-line\n }\n log(...args) {\n return this.console.log.bind(this.console, ...args);\n }\n info(...args) {\n return this.console.info.bind(this.console, ...args);\n }\n warn(...args) {\n return this.console.warn.bind(this.console, ...args);\n }\n error(...args) {\n return this.console.error.bind(this.console, ...args);\n }\n}\n"],"mappings":";AACA,SAAQA,GAAG,QAAO,eAAe;AAEjC,OAAO,MAAMC,QAAQ,GAAG,IAAID,GAAG,CAAC;EAACE,EAAE,EAAE;AAAY,CAAC,CAAC;AAGnD,OAAO,MAAMC,OAAO,CAAC;EACnBC,GAAGA,CAAA,EAAG;IACJ,OAAO,MAAM,CAAC,CAAC;EACjB;EACAC,IAAIA,CAAA,EAAG;IACL,OAAO,MAAM,CAAC,CAAC;EACjB;EACAC,IAAIA,CAAA,EAAG;IACL,OAAO,MAAM,CAAC,CAAC;EACjB;EACAC,KAAKA,CAAA,EAAG;IACN,OAAO,MAAM,CAAC,CAAC;EACjB;AACF;AAGA,OAAO,MAAMC,UAAU,CAAC;EAGtBC,WAAWA,CAAA,EAAG;IAAAC,eAAA;IACZ,IAAI,CAACC,OAAO,GAAGA,OAAO;EACxB;EACAP,GAAGA,CAAA,EAAU;IAAA,SAAAQ,IAAA,GAAAC,SAAA,CAAAC,MAAA,EAANC,IAAI,OAAAC,KAAA,CAAAJ,IAAA,GAAAK,IAAA,MAAAA,IAAA,GAAAL,IAAA,EAAAK,IAAA;MAAJF,IAAI,CAAAE,IAAA,IAAAJ,SAAA,CAAAI,IAAA;IAAA;IACT,OAAO,IAAI,CAACN,OAAO,CAACP,GAAG,CAACc,IAAI,CAAC,IAAI,CAACP,OAAO,EAAE,GAAGI,IAAI,CAAC;EACrD;EACAV,IAAIA,CAAA,EAAU;IAAA,SAAAc,KAAA,GAAAN,SAAA,CAAAC,MAAA,EAANC,IAAI,OAAAC,KAAA,CAAAG,KAAA,GAAAC,KAAA,MAAAA,KAAA,GAAAD,KAAA,EAAAC,KAAA;MAAJL,IAAI,CAAAK,KAAA,IAAAP,SAAA,CAAAO,KAAA;IAAA;IACV,OAAO,IAAI,CAACT,OAAO,CAACN,IAAI,CAACa,IAAI,CAAC,IAAI,CAACP,OAAO,EAAE,GAAGI,IAAI,CAAC;EACtD;EACAT,IAAIA,CAAA,EAAU;IAAA,SAAAe,KAAA,GAAAR,SAAA,CAAAC,MAAA,EAANC,IAAI,OAAAC,KAAA,CAAAK,KAAA,GAAAC,KAAA,MAAAA,KAAA,GAAAD,KAAA,EAAAC,KAAA;MAAJP,IAAI,CAAAO,KAAA,IAAAT,SAAA,CAAAS,KAAA;IAAA;IACV,OAAO,IAAI,CAACX,OAAO,CAACL,IAAI,CAACY,IAAI,CAAC,IAAI,CAACP,OAAO,EAAE,GAAGI,IAAI,CAAC;EACtD;EACAR,KAAKA,CAAA,EAAU;IAAA,SAAAgB,KAAA,GAAAV,SAAA,CAAAC,MAAA,EAANC,IAAI,OAAAC,KAAA,CAAAO,KAAA,GAAAC,KAAA,MAAAA,KAAA,GAAAD,KAAA,EAAAC,KAAA;MAAJT,IAAI,CAAAS,KAAA,IAAAX,SAAA,CAAAW,KAAA;IAAA;IACX,OAAO,IAAI,CAACb,OAAO,CAACJ,KAAK,CAACW,IAAI,CAAC,IAAI,CAACP,OAAO,EAAE,GAAGI,IAAI,CAAC;EACvD;AACF"}
1
+ {"version":3,"file":"loggers.js","names":["Log","probeLog","id","NullLog","log","info","warn","error","ConsoleLog","constructor","_defineProperty","console","_len","arguments","length","args","Array","_key","bind","_len2","_key2","_len3","_key3","_len4","_key4"],"sources":["../../../../src/lib/loader-utils/loggers.ts"],"sourcesContent":["// probe.gl Log compatible loggers\nimport {Log} from '@probe.gl/log';\n\nexport const probeLog = new Log({id: 'loaders.gl'});\n\ntype LogFunction = () => void;\n\n// Logs nothing\nexport class NullLog {\n log(): LogFunction {\n return () => {};\n }\n info(): LogFunction {\n return () => {};\n }\n warn(): LogFunction {\n return () => {};\n }\n error(): LogFunction {\n return () => {};\n }\n}\n\n// Logs to console\nexport class ConsoleLog {\n console;\n\n constructor() {\n this.console = console; // eslint-disable-line\n }\n log(...args: unknown[]): LogFunction {\n return this.console.log.bind(this.console, ...args);\n }\n info(...args: unknown[]): LogFunction {\n return this.console.info.bind(this.console, ...args);\n }\n warn(...args: unknown[]): LogFunction {\n return this.console.warn.bind(this.console, ...args);\n }\n error(...args: unknown[]): LogFunction {\n return this.console.error.bind(this.console, ...args);\n }\n}\n"],"mappings":";AACA,SAAQA,GAAG,QAAO,eAAe;AAEjC,OAAO,MAAMC,QAAQ,GAAG,IAAID,GAAG,CAAC;EAACE,EAAE,EAAE;AAAY,CAAC,CAAC;AAKnD,OAAO,MAAMC,OAAO,CAAC;EACnBC,GAAGA,CAAA,EAAgB;IACjB,OAAO,MAAM,CAAC,CAAC;EACjB;EACAC,IAAIA,CAAA,EAAgB;IAClB,OAAO,MAAM,CAAC,CAAC;EACjB;EACAC,IAAIA,CAAA,EAAgB;IAClB,OAAO,MAAM,CAAC,CAAC;EACjB;EACAC,KAAKA,CAAA,EAAgB;IACnB,OAAO,MAAM,CAAC,CAAC;EACjB;AACF;AAGA,OAAO,MAAMC,UAAU,CAAC;EAGtBC,WAAWA,CAAA,EAAG;IAAAC,eAAA;IACZ,IAAI,CAACC,OAAO,GAAGA,OAAO;EACxB;EACAP,GAAGA,CAAA,EAAkC;IAAA,SAAAQ,IAAA,GAAAC,SAAA,CAAAC,MAAA,EAA9BC,IAAI,OAAAC,KAAA,CAAAJ,IAAA,GAAAK,IAAA,MAAAA,IAAA,GAAAL,IAAA,EAAAK,IAAA;MAAJF,IAAI,CAAAE,IAAA,IAAAJ,SAAA,CAAAI,IAAA;IAAA;IACT,OAAO,IAAI,CAACN,OAAO,CAACP,GAAG,CAACc,IAAI,CAAC,IAAI,CAACP,OAAO,EAAE,GAAGI,IAAI,CAAC;EACrD;EACAV,IAAIA,CAAA,EAAkC;IAAA,SAAAc,KAAA,GAAAN,SAAA,CAAAC,MAAA,EAA9BC,IAAI,OAAAC,KAAA,CAAAG,KAAA,GAAAC,KAAA,MAAAA,KAAA,GAAAD,KAAA,EAAAC,KAAA;MAAJL,IAAI,CAAAK,KAAA,IAAAP,SAAA,CAAAO,KAAA;IAAA;IACV,OAAO,IAAI,CAACT,OAAO,CAACN,IAAI,CAACa,IAAI,CAAC,IAAI,CAACP,OAAO,EAAE,GAAGI,IAAI,CAAC;EACtD;EACAT,IAAIA,CAAA,EAAkC;IAAA,SAAAe,KAAA,GAAAR,SAAA,CAAAC,MAAA,EAA9BC,IAAI,OAAAC,KAAA,CAAAK,KAAA,GAAAC,KAAA,MAAAA,KAAA,GAAAD,KAAA,EAAAC,KAAA;MAAJP,IAAI,CAAAO,KAAA,IAAAT,SAAA,CAAAS,KAAA;IAAA;IACV,OAAO,IAAI,CAACX,OAAO,CAACL,IAAI,CAACY,IAAI,CAAC,IAAI,CAACP,OAAO,EAAE,GAAGI,IAAI,CAAC;EACtD;EACAR,KAAKA,CAAA,EAAkC;IAAA,SAAAgB,KAAA,GAAAV,SAAA,CAAAC,MAAA,EAA9BC,IAAI,OAAAC,KAAA,CAAAO,KAAA,GAAAC,KAAA,MAAAA,KAAA,GAAAD,KAAA,EAAAC,KAAA;MAAJT,IAAI,CAAAS,KAAA,IAAAX,SAAA,CAAAW,KAAA;IAAA;IACX,OAAO,IAAI,CAACb,OAAO,CAACJ,KAAK,CAACW,IAAI,CAAC,IAAI,CAACP,OAAO,EAAE,GAAGI,IAAI,CAAC;EACvD;AACF"}
@@ -9,13 +9,13 @@ export function getGlobalLoaderState() {
9
9
  loaders._state = loaders._state || {};
10
10
  return loaders._state;
11
11
  }
12
- export const getGlobalLoaderOptions = () => {
12
+ export function getGlobalLoaderOptions() {
13
13
  const state = getGlobalLoaderState();
14
14
  state.globalOptions = state.globalOptions || {
15
15
  ...DEFAULT_LOADER_OPTIONS
16
16
  };
17
17
  return state.globalOptions;
18
- };
18
+ }
19
19
  export function setGlobalOptions(options) {
20
20
  const state = getGlobalLoaderState();
21
21
  const globalOptions = getGlobalLoaderOptions();
@@ -1 +1 @@
1
- {"version":3,"file":"option-utils.js","names":["isPureObject","isObject","probeLog","NullLog","DEFAULT_LOADER_OPTIONS","REMOVED_LOADER_OPTIONS","getGlobalLoaderState","globalThis","loaders","_state","getGlobalLoaderOptions","state","globalOptions","setGlobalOptions","options","normalizeOptionsInternal","normalizeOptions","loader","url","Array","isArray","validateOptions","validateOptionsObject","idOptions","id","loaderOptions","deprecatedOptions","defaultOptions","loaderName","prefix","concat","key","isSubOptions","isBaseUriOption","isWorkerUrlOption","warn","suggestion","findSimilarOption","optionKey","lowerCaseOptionKey","toLowerCase","bestSuggestion","lowerCaseKey","isPartialMatch","startsWith","loaderDefaultOptions","mergedOptions","addUrlOptions","log","mergeNestedFields","value","baseUri"],"sources":["../../../../src/lib/loader-utils/option-utils.ts"],"sourcesContent":["// loaders.gl, MIT license\n\nimport type {Loader, LoaderOptions} from '@loaders.gl/loader-utils';\nimport {isPureObject, isObject} from '../../javascript-utils/is-type';\nimport {probeLog, NullLog} from './loggers';\nimport {DEFAULT_LOADER_OPTIONS, REMOVED_LOADER_OPTIONS} from './option-defaults';\n\n/**\n * Global state for loaders.gl. Stored on `global.loaders._state`\n */\ntype GlobalLoaderState = {\n loaderRegistry: Loader[];\n globalOptions: LoaderOptions;\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 = (): LoaderOptions => {\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: LoaderOptions): 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: LoaderOptions,\n loader: Loader,\n loaders?: Loader[],\n url?: string\n): LoaderOptions {\n loaders = loaders || [];\n loaders = Array.isArray(loaders) ? loaders : [loaders];\n\n validateOptions(options, loaders);\n return normalizeOptionsInternal(loader, options, url);\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/**\n * Harvest information from the url\n * @deprecated This is mainly there to support a hack in the GLTFLoader\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?\n */\nfunction addUrlOptions(options, url?: string) {\n if (url && !('baseUri' in options)) {\n options.baseUri = url;\n }\n}\n"],"mappings":"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"}
1
+ {"version":3,"file":"option-utils.js","names":["isPureObject","isObject","probeLog","NullLog","DEFAULT_LOADER_OPTIONS","REMOVED_LOADER_OPTIONS","getGlobalLoaderState","globalThis","loaders","_state","getGlobalLoaderOptions","state","globalOptions","setGlobalOptions","options","normalizeOptionsInternal","normalizeOptions","loader","url","Array","isArray","validateOptions","validateOptionsObject","idOptions","id","loaderOptions","deprecatedOptions","defaultOptions","loaderName","prefix","concat","key","isSubOptions","isBaseUriOption","isWorkerUrlOption","warn","suggestion","findSimilarOption","optionKey","lowerCaseOptionKey","toLowerCase","bestSuggestion","lowerCaseKey","isPartialMatch","startsWith","loaderDefaultOptions","mergedOptions","addUrlOptions","log","mergeNestedFields","value","baseUri"],"sources":["../../../../src/lib/loader-utils/option-utils.ts"],"sourcesContent":["// loaders.gl, MIT license\n\nimport type {Loader, LoaderOptions} from '@loaders.gl/loader-utils';\nimport {isPureObject, isObject} from '../../javascript-utils/is-type';\nimport {probeLog, NullLog} from './loggers';\nimport {DEFAULT_LOADER_OPTIONS, REMOVED_LOADER_OPTIONS} from './option-defaults';\n\n/**\n * Global state for loaders.gl. Stored on `global.loaders._state`\n */\ntype GlobalLoaderState = {\n loaderRegistry: Loader[];\n globalOptions: LoaderOptions;\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 function getGlobalLoaderOptions(): LoaderOptions {\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: LoaderOptions): void {\n const state = getGlobalLoaderState();\n const globalOptions = getGlobalLoaderOptions();\n // @ts-expect-error First param looks incorrect\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: LoaderOptions,\n loader: Loader,\n loaders?: Loader[],\n url?: string\n): LoaderOptions {\n loaders = loaders || [];\n loaders = Array.isArray(loaders) ? loaders : [loaders];\n\n validateOptions(options, loaders);\n return normalizeOptionsInternal(loader, options, url);\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[]): void {\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: Record<string, unknown> = ((options && options[loader.id]) || {}) as Record<\n string,\n unknown\n >;\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 // @ts-ignore\n validateOptionsObject(idOptions, loader.id, loaderOptions, deprecatedOptions, loaders);\n }\n}\n\n// eslint-disable-next-line max-params, complexity\nfunction validateOptionsObject(\n options: LoaderOptions,\n id: string | null,\n defaultOptions: Record<string, unknown>,\n deprecatedOptions: Record<string, unknown>,\n loaders: Loader[]\n): void {\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: string, loaders: Loader[]): string {\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(\n loader: Loader,\n options: LoaderOptions,\n url?: string\n): LoaderOptions {\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: LoaderOptions, options: LoaderOptions): void {\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] as object),\n ...(options[key] as object)\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/**\n * Harvest information from the url\n * @deprecated This is mainly there to support a hack in the GLTFLoader\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?\n */\nfunction addUrlOptions(options: LoaderOptions, url?: string): void {\n if (url && !('baseUri' in options)) {\n options.baseUri = url;\n }\n}\n"],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"fetch-progress.js","names":["fetchProgress","response","onProgress","onDone","arguments","length","undefined","onError","ok","body","contentLength","headers","get","totalBytes","parseInt","ReadableStream","getReader","progressStream","start","controller","reader","read","Response","loadedBytes","done","value","close","byteLength","percent","Math","round","enqueue","error"],"sources":["../../../../src/lib/progress/fetch-progress.ts"],"sourcesContent":["// Forked from github AnthumChris/fetch-progress-indicators under MIT license\n\n/**\n * Intercepts the Response stream and creates a new Response\n */\nexport default async function fetchProgress(\n response: Response | Promise<Response>,\n onProgress: any, // TODO better callback types\n onDone = () => {},\n onError = () => {}\n) {\n response = await response;\n if (!response.ok) {\n // ERROR checking needs to be done separately\n return response;\n }\n const body = response.body;\n if (!body) {\n // 'ReadableStream not yet supported in this browser.\n return response;\n }\n const contentLength = response.headers.get('content-length') || 0;\n const totalBytes = contentLength ? parseInt(contentLength) : 0;\n if (!(totalBytes > 0)) {\n return response;\n }\n // Currently override only implemented in browser\n if (typeof ReadableStream === 'undefined' || !body.getReader) {\n return response;\n }\n\n // Create a new stream that invisbly wraps original stream\n const progressStream = new ReadableStream({\n async start(controller) {\n const reader = body.getReader();\n await read(controller, reader, 0, totalBytes, onProgress, onDone, onError);\n }\n });\n\n return new Response(progressStream);\n}\n\n// Forward to original streams controller\n// TODO - this causes a crazy deep \"async stack\"... rewrite as async iterator?\n// eslint-disable-next-line max-params\nasync function read(controller, reader, loadedBytes, totalBytes, onProgress, onDone, onError) {\n try {\n const {done, value} = await reader.read();\n if (done) {\n onDone();\n controller.close();\n return;\n }\n loadedBytes += value.byteLength;\n const percent = Math.round((loadedBytes / totalBytes) * 100);\n onProgress(percent, {loadedBytes, totalBytes});\n controller.enqueue(value);\n await read(controller, reader, loadedBytes, totalBytes, onProgress, onDone, onError);\n } catch (error) {\n controller.error(error);\n onError(error);\n }\n}\n"],"mappings":"AAKA,eAAe,eAAeA,aAAaA,CACzCC,QAAsC,EACtCC,UAAe,EAGf;EAAA,IAFAC,MAAM,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,MAAM,CAAC,CAAC;EAAA,IACjBG,OAAO,GAAAH,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,MAAM,CAAC,CAAC;EAElBH,QAAQ,GAAG,MAAMA,QAAQ;EACzB,IAAI,CAACA,QAAQ,CAACO,EAAE,EAAE;IAEhB,OAAOP,QAAQ;EACjB;EACA,MAAMQ,IAAI,GAAGR,QAAQ,CAACQ,IAAI;EAC1B,IAAI,CAACA,IAAI,EAAE;IAET,OAAOR,QAAQ;EACjB;EACA,MAAMS,aAAa,GAAGT,QAAQ,CAACU,OAAO,CAACC,GAAG,CAAC,gBAAgB,CAAC,IAAI,CAAC;EACjE,MAAMC,UAAU,GAAGH,aAAa,GAAGI,QAAQ,CAACJ,aAAa,CAAC,GAAG,CAAC;EAC9D,IAAI,EAAEG,UAAU,GAAG,CAAC,CAAC,EAAE;IACrB,OAAOZ,QAAQ;EACjB;EAEA,IAAI,OAAOc,cAAc,KAAK,WAAW,IAAI,CAACN,IAAI,CAACO,SAAS,EAAE;IAC5D,OAAOf,QAAQ;EACjB;EAGA,MAAMgB,cAAc,GAAG,IAAIF,cAAc,CAAC;IACxC,MAAMG,KAAKA,CAACC,UAAU,EAAE;MACtB,MAAMC,MAAM,GAAGX,IAAI,CAACO,SAAS,CAAC,CAAC;MAC/B,MAAMK,IAAI,CAACF,UAAU,EAAEC,MAAM,EAAE,CAAC,EAAEP,UAAU,EAAEX,UAAU,EAAEC,MAAM,EAAEI,OAAO,CAAC;IAC5E;EACF,CAAC,CAAC;EAEF,OAAO,IAAIe,QAAQ,CAACL,cAAc,CAAC;AACrC;AAKA,eAAeI,IAAIA,CAACF,UAAU,EAAEC,MAAM,EAAEG,WAAW,EAAEV,UAAU,EAAEX,UAAU,EAAEC,MAAM,EAAEI,OAAO,EAAE;EAC5F,IAAI;IACF,MAAM;MAACiB,IAAI;MAAEC;IAAK,CAAC,GAAG,MAAML,MAAM,CAACC,IAAI,CAAC,CAAC;IACzC,IAAIG,IAAI,EAAE;MACRrB,MAAM,CAAC,CAAC;MACRgB,UAAU,CAACO,KAAK,CAAC,CAAC;MAClB;IACF;IACAH,WAAW,IAAIE,KAAK,CAACE,UAAU;IAC/B,MAAMC,OAAO,GAAGC,IAAI,CAACC,KAAK,CAAEP,WAAW,GAAGV,UAAU,GAAI,GAAG,CAAC;IAC5DX,UAAU,CAAC0B,OAAO,EAAE;MAACL,WAAW;MAAEV;IAAU,CAAC,CAAC;IAC9CM,UAAU,CAACY,OAAO,CAACN,KAAK,CAAC;IACzB,MAAMJ,IAAI,CAACF,UAAU,EAAEC,MAAM,EAAEG,WAAW,EAAEV,UAAU,EAAEX,UAAU,EAAEC,MAAM,EAAEI,OAAO,CAAC;EACtF,CAAC,CAAC,OAAOyB,KAAK,EAAE;IACdb,UAAU,CAACa,KAAK,CAACA,KAAK,CAAC;IACvBzB,OAAO,CAACyB,KAAK,CAAC;EAChB;AACF"}
1
+ {"version":3,"file":"fetch-progress.js","names":["fetchProgress","response","onProgress","onDone","arguments","length","undefined","onError","ok","body","contentLength","headers","get","totalBytes","parseInt","ReadableStream","getReader","progressStream","start","controller","reader","read","Response","loadedBytes","done","value","close","byteLength","percent","Math","round","enqueue","error"],"sources":["../../../../src/lib/progress/fetch-progress.ts"],"sourcesContent":["// Forked from github AnthumChris/fetch-progress-indicators under MIT license\n\n/**\n * Intercepts the Response stream and creates a new Response\n */\nexport default async function fetchProgress(\n response: Response | Promise<Response>,\n onProgress: any, // TODO better callback types\n onDone = () => {},\n onError = () => {}\n) {\n response = await response;\n if (!response.ok) {\n // ERROR checking needs to be done separately\n return response;\n }\n const body = response.body;\n if (!body) {\n // 'ReadableStream not yet supported in this browser.\n return response;\n }\n const contentLength = response.headers.get('content-length') || 0;\n const totalBytes = contentLength ? parseInt(contentLength) : 0;\n if (!(totalBytes > 0)) {\n return response;\n }\n // Currently override only implemented in browser\n if (typeof ReadableStream === 'undefined' || !body.getReader) {\n return response;\n }\n\n // Create a new stream that invisbly wraps original stream\n const progressStream = new ReadableStream({\n async start(controller) {\n const reader = body.getReader();\n await read(controller, reader, 0, totalBytes, onProgress, onDone, onError);\n }\n });\n\n return new Response(progressStream);\n}\n\n// Forward to original streams controller\n// TODO - this causes a crazy deep \"async stack\"... rewrite as async iterator?\n// eslint-disable-next-line max-params\nasync function read(\n controller: any,\n reader: any,\n loadedBytes: number,\n totalBytes: number,\n onProgress: Function,\n onDone: Function,\n onError: Function\n): Promise<void> {\n try {\n const {done, value} = await reader.read();\n if (done) {\n onDone();\n controller.close();\n return;\n }\n loadedBytes += value.byteLength;\n const percent = Math.round((loadedBytes / totalBytes) * 100);\n onProgress(percent, {loadedBytes, totalBytes});\n controller.enqueue(value);\n await read(controller, reader, loadedBytes, totalBytes, onProgress, onDone, onError);\n } catch (error) {\n controller.error(error);\n onError(error);\n }\n}\n"],"mappings":"AAKA,eAAe,eAAeA,aAAaA,CACzCC,QAAsC,EACtCC,UAAe,EAGf;EAAA,IAFAC,MAAM,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,MAAM,CAAC,CAAC;EAAA,IACjBG,OAAO,GAAAH,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,MAAM,CAAC,CAAC;EAElBH,QAAQ,GAAG,MAAMA,QAAQ;EACzB,IAAI,CAACA,QAAQ,CAACO,EAAE,EAAE;IAEhB,OAAOP,QAAQ;EACjB;EACA,MAAMQ,IAAI,GAAGR,QAAQ,CAACQ,IAAI;EAC1B,IAAI,CAACA,IAAI,EAAE;IAET,OAAOR,QAAQ;EACjB;EACA,MAAMS,aAAa,GAAGT,QAAQ,CAACU,OAAO,CAACC,GAAG,CAAC,gBAAgB,CAAC,IAAI,CAAC;EACjE,MAAMC,UAAU,GAAGH,aAAa,GAAGI,QAAQ,CAACJ,aAAa,CAAC,GAAG,CAAC;EAC9D,IAAI,EAAEG,UAAU,GAAG,CAAC,CAAC,EAAE;IACrB,OAAOZ,QAAQ;EACjB;EAEA,IAAI,OAAOc,cAAc,KAAK,WAAW,IAAI,CAACN,IAAI,CAACO,SAAS,EAAE;IAC5D,OAAOf,QAAQ;EACjB;EAGA,MAAMgB,cAAc,GAAG,IAAIF,cAAc,CAAC;IACxC,MAAMG,KAAKA,CAACC,UAAU,EAAE;MACtB,MAAMC,MAAM,GAAGX,IAAI,CAACO,SAAS,CAAC,CAAC;MAC/B,MAAMK,IAAI,CAACF,UAAU,EAAEC,MAAM,EAAE,CAAC,EAAEP,UAAU,EAAEX,UAAU,EAAEC,MAAM,EAAEI,OAAO,CAAC;IAC5E;EACF,CAAC,CAAC;EAEF,OAAO,IAAIe,QAAQ,CAACL,cAAc,CAAC;AACrC;AAKA,eAAeI,IAAIA,CACjBF,UAAe,EACfC,MAAW,EACXG,WAAmB,EACnBV,UAAkB,EAClBX,UAAoB,EACpBC,MAAgB,EAChBI,OAAiB,EACF;EACf,IAAI;IACF,MAAM;MAACiB,IAAI;MAAEC;IAAK,CAAC,GAAG,MAAML,MAAM,CAACC,IAAI,CAAC,CAAC;IACzC,IAAIG,IAAI,EAAE;MACRrB,MAAM,CAAC,CAAC;MACRgB,UAAU,CAACO,KAAK,CAAC,CAAC;MAClB;IACF;IACAH,WAAW,IAAIE,KAAK,CAACE,UAAU;IAC/B,MAAMC,OAAO,GAAGC,IAAI,CAACC,KAAK,CAAEP,WAAW,GAAGV,UAAU,GAAI,GAAG,CAAC;IAC5DX,UAAU,CAAC0B,OAAO,EAAE;MAACL,WAAW;MAAEV;IAAU,CAAC,CAAC;IAC9CM,UAAU,CAACY,OAAO,CAACN,KAAK,CAAC;IACzB,MAAMJ,IAAI,CAACF,UAAU,EAAEC,MAAM,EAAEG,WAAW,EAAEV,UAAU,EAAEX,UAAU,EAAEC,MAAM,EAAEI,OAAO,CAAC;EACtF,CAAC,CAAC,OAAOyB,KAAK,EAAE;IACdb,UAAU,CAACa,KAAK,CAACA,KAAK,CAAC;IACvBzB,OAAO,CAACyB,KAAK,CAAC;EAChB;AACF"}
@@ -1,4 +1,4 @@
1
- const VERSION = typeof "4.0.0-alpha.21" !== 'undefined' ? "4.0.0-alpha.21" : 'latest';
1
+ const VERSION = typeof "4.0.0-alpha.22" !== 'undefined' ? "4.0.0-alpha.22" : 'latest';
2
2
  export const NullWorkerLoader = {
3
3
  name: 'Null loader',
4
4
  id: 'null',
@@ -1 +1 @@
1
- {"version":3,"file":"null-loader.js","names":["VERSION","NullWorkerLoader","name","id","module","version","worker","mimeTypes","extensions","tests","options","null","NullLoader","parse","arrayBuffer","context","parseSync","parseInBatches","generator","asyncIterator","batch"],"sources":["../../src/null-loader.ts"],"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 type {Loader, LoaderWithParser, LoaderOptions} from '@loaders.gl/loader-utils';\nimport {LoaderContext} from 'modules/loader-utils/dist';\n\nexport type NullLoaderOptions = LoaderOptions & {\n null?: {};\n};\n\n/**\n * Loads any data and returns null (or optionally passes through data unparsed)\n */\nexport const NullWorkerLoader: Loader<null, never, NullLoaderOptions> = {\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 * Loads any data and returns null (or optionally passes through data unparsed)\n */\nexport const NullLoader: LoaderWithParser<null, null, NullLoaderOptions> = {\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: ArrayBuffer, options?: NullLoaderOptions, context?: LoaderContext) =>\n 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 }\n};\n\n/**\n * Returns arguments passed to the parse API in a format that can be transferred to a\n * web worker. The `context` parameter is stripped using JSON.stringify & parse.\n */\nfunction parseSync(\n arrayBuffer: ArrayBuffer,\n options?: NullLoaderOptions,\n context?: LoaderContext\n): null {\n return null;\n}\n"],"mappings":"AAEA,MAAMA,OAAO,GAAG,uBAAkB,KAAK,WAAW,sBAAiB,QAAQ;AAY3E,OAAO,MAAMC,gBAAwD,GAAG;EACtEC,IAAI,EAAE,aAAa;EACnBC,EAAE,EAAE,MAAM;EACVC,MAAM,EAAE,MAAM;EACdC,OAAO,EAAEL,OAAO;EAChBM,MAAM,EAAE,IAAI;EACZC,SAAS,EAAE,CAAC,qBAAqB,CAAC;EAClCC,UAAU,EAAE,CAAC,MAAM,CAAC;EACpBC,KAAK,EAAE,CAAC,MAAM,KAAK,CAAC;EACpBC,OAAO,EAAE;IACPC,IAAI,EAAE,CAAC;EACT;AACF,CAAC;AAKD,OAAO,MAAMC,UAA2D,GAAG;EACzEV,IAAI,EAAE,aAAa;EACnBC,EAAE,EAAE,MAAM;EACVC,MAAM,EAAE,MAAM;EACdC,OAAO,EAAEL,OAAO;EAChBO,SAAS,EAAE,CAAC,qBAAqB,CAAC;EAClCC,UAAU,EAAE,CAAC,MAAM,CAAC;EACpBK,KAAK,EAAE,MAAAA,CAAOC,WAAwB,EAAEJ,OAA2B,EAAEK,OAAuB,KAC1FC,SAAS,CAACF,WAAW,EAAEJ,OAAO,IAAI,CAAC,CAAC,EAAEK,OAAO,CAAC;EAChDC,SAAS;EACTC,cAAc,EAAE,gBAAgBC,SAASA,CAACC,aAAa,EAAET,OAAO,EAAEK,OAAO,EAAE;IACzE,WAAW,MAAMK,KAAK,IAAID,aAAa,EAAE;MACvC,MAAMH,SAAS,CAACI,KAAK,EAAEV,OAAO,EAAEK,OAAO,CAAC;IAC1C;EACF,CAAC;EACDN,KAAK,EAAE,CAAC,MAAM,KAAK,CAAC;EACpBC,OAAO,EAAE;IACPC,IAAI,EAAE,CAAC;EACT;AACF,CAAC;AAMD,SAASK,SAASA,CAChBF,WAAwB,EACxBJ,OAA2B,EAC3BK,OAAuB,EACjB;EACN,OAAO,IAAI;AACb"}
1
+ {"version":3,"file":"null-loader.js","names":["VERSION","NullWorkerLoader","name","id","module","version","worker","mimeTypes","extensions","tests","options","null","NullLoader","parse","arrayBuffer","context","parseSync","parseInBatches","generator","asyncIterator","batch"],"sources":["../../src/null-loader.ts"],"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 type {Loader, LoaderWithParser, LoaderOptions} from '@loaders.gl/loader-utils';\nimport {LoaderContext} from '@loaders.gl/loader-utils';\n\nexport type NullLoaderOptions = LoaderOptions & {\n null?: {};\n};\n\n/**\n * Loads any data and returns null (or optionally passes through data unparsed)\n */\nexport const NullWorkerLoader: Loader<null, never, NullLoaderOptions> = {\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 * Loads any data and returns null (or optionally passes through data unparsed)\n */\nexport const NullLoader: LoaderWithParser<null, null, NullLoaderOptions> = {\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: ArrayBuffer, options?: NullLoaderOptions, context?: LoaderContext) =>\n 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 }\n};\n\n/**\n * Returns arguments passed to the parse API in a format that can be transferred to a\n * web worker. The `context` parameter is stripped using JSON.stringify & parse.\n */\nfunction parseSync(\n arrayBuffer: ArrayBuffer,\n options?: NullLoaderOptions,\n context?: LoaderContext\n): null {\n return null;\n}\n"],"mappings":"AAEA,MAAMA,OAAO,GAAG,uBAAkB,KAAK,WAAW,sBAAiB,QAAQ;AAY3E,OAAO,MAAMC,gBAAwD,GAAG;EACtEC,IAAI,EAAE,aAAa;EACnBC,EAAE,EAAE,MAAM;EACVC,MAAM,EAAE,MAAM;EACdC,OAAO,EAAEL,OAAO;EAChBM,MAAM,EAAE,IAAI;EACZC,SAAS,EAAE,CAAC,qBAAqB,CAAC;EAClCC,UAAU,EAAE,CAAC,MAAM,CAAC;EACpBC,KAAK,EAAE,CAAC,MAAM,KAAK,CAAC;EACpBC,OAAO,EAAE;IACPC,IAAI,EAAE,CAAC;EACT;AACF,CAAC;AAKD,OAAO,MAAMC,UAA2D,GAAG;EACzEV,IAAI,EAAE,aAAa;EACnBC,EAAE,EAAE,MAAM;EACVC,MAAM,EAAE,MAAM;EACdC,OAAO,EAAEL,OAAO;EAChBO,SAAS,EAAE,CAAC,qBAAqB,CAAC;EAClCC,UAAU,EAAE,CAAC,MAAM,CAAC;EACpBK,KAAK,EAAE,MAAAA,CAAOC,WAAwB,EAAEJ,OAA2B,EAAEK,OAAuB,KAC1FC,SAAS,CAACF,WAAW,EAAEJ,OAAO,IAAI,CAAC,CAAC,EAAEK,OAAO,CAAC;EAChDC,SAAS;EACTC,cAAc,EAAE,gBAAgBC,SAASA,CAACC,aAAa,EAAET,OAAO,EAAEK,OAAO,EAAE;IACzE,WAAW,MAAMK,KAAK,IAAID,aAAa,EAAE;MACvC,MAAMH,SAAS,CAACI,KAAK,EAAEV,OAAO,EAAEK,OAAO,CAAC;IAC1C;EACF,CAAC;EACDN,KAAK,EAAE,CAAC,MAAM,KAAK,CAAC;EACpBC,OAAO,EAAE;IACPC,IAAI,EAAE,CAAC;EACT;AACF,CAAC;AAMD,SAASK,SAASA,CAChBF,WAAwB,EACxBJ,OAA2B,EAC3BK,OAAuB,EACjB;EACN,OAAO,IAAI;AACb"}
package/dist/index.d.ts CHANGED
@@ -22,7 +22,7 @@ export { NullWorkerLoader, NullLoader } from './null-loader';
22
22
  export { JSONLoader } from '@loaders.gl/loader-utils';
23
23
  export { default as _fetchProgress } from './lib/progress/fetch-progress';
24
24
  export { default as _BrowserFileSystem } from './lib/filesystems/browser-filesystem';
25
- export { FileSystem } from './lib/filesystems/filesystem';
25
+ export type { FileSystem } from './lib/filesystems/filesystem';
26
26
  export { _unregisterLoaders } from './lib/api/register-loaders';
27
27
  export { isBrowser, isWorker, self, window, global, document } from '@loaders.gl/loader-utils';
28
28
  export { assert } from '@loaders.gl/loader-utils';
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,YAAY,EACV,MAAM,EACN,gBAAgB,EAChB,aAAa,EACb,aAAa,EACb,MAAM,EACN,aAAa,EACb,QAAQ,EACR,YAAY,EACZ,iBAAiB,EACjB,WAAW,EACX,2BAA2B,EAC5B,MAAM,0BAA0B,CAAC;AAGlC,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,WAAW,EAAE,iBAAiB,EAAE,oBAAoB,EAAC,MAAM,wBAAwB,CAAC;AAC5F,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;AACnF,OAAO,EAAC,UAAU,EAAC,MAAM,8BAA8B,CAAC;AAGxD,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"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,YAAY,EACV,MAAM,EACN,gBAAgB,EAChB,aAAa,EACb,aAAa,EACb,MAAM,EACN,aAAa,EACb,QAAQ,EACR,YAAY,EACZ,iBAAiB,EACjB,WAAW,EACX,2BAA2B,EAC5B,MAAM,0BAA0B,CAAC;AAGlC,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,WAAW,EAAE,iBAAiB,EAAE,oBAAoB,EAAC,MAAM,wBAAwB,CAAC;AAC5F,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;AACnF,YAAY,EAAC,UAAU,EAAC,MAAM,8BAA8B,CAAC;AAG7D,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"}
@@ -1 +1 @@
1
- {"version":3,"file":"make-node-stream.d.ts","sourceRoot":"","sources":["../../../src/iterators/make-stream/make-node-stream.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,QAAQ,CAAC;AAC5C,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAEjC,cAAM,SAAS;CAAG;AAElB,KAAK,YAAY,GAAG,MAAM,CAAC,QAAQ,GAAG,SAAS,CAAC;AAGhD,MAAM,MAAM,iBAAiB,GAAG,eAAe,CAAC;AAEhD,4CAA4C;AAC5C,wBAAgB,UAAU,CAAC,WAAW,EACpC,MAAM,EAAE,QAAQ,CAAC,WAAW,CAAC,GAAG,aAAa,CAAC,WAAW,CAAC,EAC1D,OAAO,CAAC,EAAE,eAAe,GACxB,YAAY,CAKd"}
1
+ {"version":3,"file":"make-node-stream.d.ts","sourceRoot":"","sources":["../../../src/iterators/make-stream/make-node-stream.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,QAAQ,CAAC;AAC5C,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAEjC,cAAM,SAAS;CAAG;AAElB,KAAK,YAAY,GAAG,MAAM,CAAC,QAAQ,GAAG,SAAS,CAAC;AAGhD,MAAM,MAAM,iBAAiB,GAAG,eAAe,CAAC;AAEhD,4CAA4C;AAC5C,wBAAgB,UAAU,CAAC,WAAW,EACpC,MAAM,EAAE,QAAQ,CAAC,WAAW,CAAC,GAAG,aAAa,CAAC,WAAW,CAAC,EAC1D,OAAO,CAAC,EAAE,eAAe,GACxB,YAAY,CAQd"}
@@ -30,9 +30,12 @@ class _Readable {
30
30
  const Readable = Stream.Readable || _Readable;
31
31
  /** Builds a node stream from an iterator */
32
32
  function makeStream(source, options) {
33
+ // @ts-ignore AsyncGenerator
33
34
  const iterator = source[Symbol.asyncIterator]
34
- ? source[Symbol.asyncIterator]()
35
- : source[Symbol.iterator]();
35
+ ? // @ts-ignore AsyncGenerator
36
+ source[Symbol.asyncIterator]()
37
+ : // @ts-ignore AsyncGenerator
38
+ source[Symbol.iterator]();
36
39
  return new AsyncIterableReadable(iterator, options);
37
40
  }
38
41
  exports.makeStream = makeStream;
@@ -19,7 +19,6 @@ const parse_1 = require("./parse");
19
19
  * @param context
20
20
  */
21
21
  async function parseInBatches(data, loaders, options, context) {
22
- (0, loader_utils_1.assert)(!context || typeof context === 'object'); // parseInBatches no longer accepts final url
23
22
  const loaderArray = Array.isArray(loaders) ? loaders : undefined;
24
23
  // Signature: parseInBatches(data, options, url) - Uses registered loaders
25
24
  if (!Array.isArray(loaders) && !(0, normalize_loader_1.isLoaderObject)(loaders)) {
@@ -41,7 +40,7 @@ async function parseInBatches(data, loaders, options, context) {
41
40
  }
42
41
  // Normalize options
43
42
  options = (0, option_utils_1.normalizeOptions)(options, loader, loaderArray, url);
44
- context = (0, loader_context_1.getLoaderContext)({ url, parseInBatches, parse: parse_1.parse, loaders: loaderArray }, options, context || null);
43
+ context = (0, loader_context_1.getLoaderContext)({ url, _parseInBatches: parseInBatches, _parse: parse_1.parse, loaders: loaderArray }, options, context || null);
45
44
  return await parseWithLoaderInBatches(loader, data, options, context);
46
45
  }
47
46
  exports.parseInBatches = parseInBatches;
@@ -1 +1 @@
1
- {"version":3,"file":"parse-sync.d.ts","sourceRoot":"","sources":["../../../src/lib/api/parse-sync.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAoB,aAAa,EAAC,MAAM,0BAA0B,CAAC;AACtF,OAAO,KAAK,EAAC,aAAa,EAAE,YAAY,EAAC,MAAM,0BAA0B,CAAC;AAC1E,OAAO,KAAK,EAAC,iBAAiB,EAAE,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAWlF;;GAEG;AACH,wBAAgB,SAAS,CACvB,OAAO,SAAS,MAAM,EACtB,QAAQ,SAAS,aAAa,GAAG,iBAAiB,CAAC,OAAO,CAAC,EAE3D,IAAI,EAAE,YAAY,EAClB,MAAM,EAAE,OAAO,EACf,OAAO,CAAC,EAAE,QAAQ,EAClB,OAAO,CAAC,EAAE,aAAa,GACtB,gBAAgB,CAAC,OAAO,CAAC,CAAC;AAE7B;;GAEG;AACH,wBAAgB,SAAS,CACvB,IAAI,EAAE,YAAY,EAClB,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,GACtB,GAAG,CAAC;AAEP;;GAEG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,GAAG,CAAC"}
1
+ {"version":3,"file":"parse-sync.d.ts","sourceRoot":"","sources":["../../../src/lib/api/parse-sync.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,MAAM,EAAoB,aAAa,EAAC,MAAM,0BAA0B,CAAC;AACtF,OAAO,KAAK,EAAC,aAAa,EAAE,YAAY,EAAC,MAAM,0BAA0B,CAAC;AAC1E,OAAO,KAAK,EAAC,iBAAiB,EAAE,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAUlF;;GAEG;AACH,wBAAgB,SAAS,CACvB,OAAO,SAAS,MAAM,EACtB,QAAQ,SAAS,aAAa,GAAG,iBAAiB,CAAC,OAAO,CAAC,EAE3D,IAAI,EAAE,YAAY,EAClB,MAAM,EAAE,OAAO,EACf,OAAO,CAAC,EAAE,QAAQ,EAClB,OAAO,CAAC,EAAE,aAAa,GACtB,gBAAgB,CAAC,OAAO,CAAC,CAAC;AAE7B;;GAEG;AACH,wBAAgB,SAAS,CACvB,IAAI,EAAE,YAAY,EAClB,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,GACtB,GAAG,CAAC;AAEP;;GAEG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,GAAG,CAAC"}
@@ -1,7 +1,7 @@
1
1
  "use strict";
2
+ // loaders.gl, MIT license
2
3
  Object.defineProperty(exports, "__esModule", { value: true });
3
4
  exports.parseSync = void 0;
4
- const loader_utils_1 = require("@loaders.gl/loader-utils");
5
5
  const select_loader_1 = require("./select-loader");
6
6
  const normalize_loader_1 = require("../loader-utils/normalize-loader");
7
7
  const option_utils_1 = require("../loader-utils/option-utils");
@@ -12,7 +12,6 @@ const resource_utils_1 = require("../utils/resource-utils");
12
12
  * Parses `data` synchronously using a specified loader
13
13
  */
14
14
  function parseSync(data, loaders, options, context) {
15
- (0, loader_utils_1.assert)(!context || typeof context === 'object'); // parseSync no longer accepts final url
16
15
  // Signature: parseSync(data, options)
17
16
  // Uses registered loaders
18
17
  if (!Array.isArray(loaders) && !(0, normalize_loader_1.isLoaderObject)(loaders)) {
@@ -37,7 +36,7 @@ function parseSync(data, loaders, options, context) {
37
36
  const parse = () => {
38
37
  throw new Error('parseSync called parse (which is async');
39
38
  };
40
- context = (0, loader_context_1.getLoaderContext)({ url, parseSync, parse, loaders: loaders }, options, context || null);
39
+ context = (0, loader_context_1.getLoaderContext)({ url, _parseSync: parse, _parse: parse, loaders: loaders }, options, context || null);
41
40
  return parseWithLoaderSync(loader, data, options, context);
42
41
  }
43
42
  exports.parseSync = parseSync;
@@ -2,11 +2,11 @@ import type { Loader, LoaderContext, LoaderOptions } from '@loaders.gl/loader-ut
2
2
  import type { DataType } from '@loaders.gl/loader-utils';
3
3
  import type { LoaderOptionsType, LoaderReturnType } from '@loaders.gl/loader-utils';
4
4
  /**
5
- * Parses `data` asynchronously using the supplied loaders
5
+ * Parses `data` asynchronously using the supplied loader
6
6
  */
7
7
  export declare function parse<LoaderT extends Loader, OptionsT extends LoaderOptions = LoaderOptionsType<LoaderT>>(data: DataType | Promise<DataType>, loader: LoaderT, options?: OptionsT, context?: LoaderContext): Promise<LoaderReturnType<LoaderT>>;
8
8
  /**
9
- * Parses `data` asynchronously by matching one of the supplied loaders
9
+ * Parses `data` asynchronously by matching one of the supplied loader
10
10
  */
11
11
  export declare function parse(data: DataType | Promise<DataType>, loaders: Loader[], options?: LoaderOptions, context?: LoaderContext): Promise<any>;
12
12
  /**
@@ -20,7 +20,6 @@ const select_loader_1 = require("./select-loader");
20
20
  */
21
21
  // implementation signature
22
22
  async function parse(data, loaders, options, context) {
23
- (0, worker_utils_1.assert)(!context || typeof context === 'object'); // parse no longer accepts final url
24
23
  // Signature: parse(data, options, context | url)
25
24
  // Uses registered loaders
26
25
  if (loaders && !Array.isArray(loaders) && !(0, normalize_loader_1.isLoaderObject)(loaders)) {
@@ -43,9 +42,12 @@ async function parse(data, loaders, options, context) {
43
42
  return null;
44
43
  }
45
44
  // Normalize options
45
+ // @ts-expect-error
46
46
  options = (0, option_utils_1.normalizeOptions)(options, loader, candidateLoaders, url); // Could be invalid...
47
47
  // Get a context (if already present, will be unchanged)
48
- context = (0, loader_context_1.getLoaderContext)({ url, parse, loaders: candidateLoaders }, options, context || null);
48
+ context = (0, loader_context_1.getLoaderContext)(
49
+ // @ts-expect-error
50
+ { url, _parse: parse, loaders: candidateLoaders }, options, context || null);
49
51
  return await parseWithLoader(loader, data, options, context);
50
52
  }
51
53
  exports.parse = parse;
@@ -1,4 +1,4 @@
1
1
  import type { Writer, WriterOptions } from '@loaders.gl/loader-utils';
2
- export declare function save(data: any, url: any, writer: Writer, options: WriterOptions): Promise<void>;
3
- export declare function saveSync(data: any, url: any, writer: any, options: any): void;
2
+ export declare function save(data: unknown, url: string, writer: Writer, options: WriterOptions): Promise<void>;
3
+ export declare function saveSync(data: unknown, url: string, writer: Writer, options: WriterOptions): void;
4
4
  //# sourceMappingURL=save.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"save.d.ts","sourceRoot":"","sources":["../../../src/lib/api/save.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAIpE,wBAAsB,IAAI,CAAC,IAAI,KAAA,EAAE,GAAG,KAAA,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,iBAG3E;AAED,wBAAgB,QAAQ,CAAC,IAAI,KAAA,EAAE,GAAG,KAAA,EAAE,MAAM,KAAA,EAAE,OAAO,KAAA,QAGlD"}
1
+ {"version":3,"file":"save.d.ts","sourceRoot":"","sources":["../../../src/lib/api/save.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAIpE,wBAAsB,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,iBAG5F;AAED,wBAAgB,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,QAG1F"}
@@ -1 +1 @@
1
- {"version":3,"file":"select-loader.d.ts","sourceRoot":"","sources":["../../../src/lib/api/select-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,aAAa,EAAE,aAAa,EAAE,MAAM,EAAC,MAAM,0BAA0B,CAAC;AAenF;;;;;;;;GAQG;AACH,wBAAsB,YAAY,CAChC,IAAI,EAAE,QAAQ,GAAG,IAAI,GAAG,WAAW,GAAG,MAAM,EAC5C,OAAO,GAAE,MAAM,EAAE,GAAG,MAAW,EAC/B,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAwBxB;AAED;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,QAAQ,GAAG,IAAI,GAAG,WAAW,GAAG,MAAM,EAC5C,OAAO,GAAE,MAAM,EAAE,GAAG,MAAW,EAC/B,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,GACtB,MAAM,GAAG,IAAI,CAmCf"}
1
+ {"version":3,"file":"select-loader.d.ts","sourceRoot":"","sources":["../../../src/lib/api/select-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,aAAa,EAAE,aAAa,EAAE,MAAM,EAAC,MAAM,0BAA0B,CAAC;AAgBnF;;;;;;;;GAQG;AACH,wBAAsB,YAAY,CAChC,IAAI,EAAE,QAAQ,GAAG,IAAI,GAAG,WAAW,GAAG,MAAM,EAC5C,OAAO,GAAE,MAAM,EAAE,GAAG,MAAW,EAC/B,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAwBxB;AAED;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,QAAQ,GAAG,IAAI,GAAG,WAAW,GAAG,MAAM,EAC5C,OAAO,GAAE,MAAM,EAAE,GAAG,MAAW,EAC/B,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,GACtB,MAAM,GAAG,IAAI,CAmCf"}
@@ -103,11 +103,15 @@ function selectLoaderInternal(data, loaders, options, context) {
103
103
  loader = loader || findLoaderByMIMEType(loaders, type);
104
104
  reason = reason || (loader ? `matched MIME type ${type}` : '');
105
105
  // Look for loader via initial bytes (Note: not always accessible (e.g. Response, stream, async iterator)
106
+ // @ts-ignore Blob | Response
106
107
  loader = loader || findLoaderByInitialBytes(loaders, data);
108
+ // @ts-ignore Blob | Response
107
109
  reason = reason || (loader ? `matched initial data ${getFirstCharacters(data)}` : '');
108
110
  // Look up loader by fallback mime type
109
- loader = loader || findLoaderByMIMEType(loaders, options?.fallbackMimeType);
110
- reason = reason || (loader ? `matched fallback MIME type ${type}` : '');
111
+ if (options?.fallbackMimeType) {
112
+ loader = loader || findLoaderByMIMEType(loaders, options?.fallbackMimeType);
113
+ reason = reason || (loader ? `matched fallback MIME type ${type}` : '');
114
+ }
111
115
  if (reason) {
112
116
  log_1.log.log(1, `selectLoader selected ${loader?.name}: ${reason}.`);
113
117
  }
@@ -132,6 +136,7 @@ function getNoValidLoaderMessage(data) {
132
136
  message += url ? `${loader_utils_1.path.filename(url)}, ` : 'no url provided, ';
133
137
  message += `MIME type: ${type ? `"${type}"` : 'not provided'}, `;
134
138
  // First characters are only accessible when called on data (string or arrayBuffer).
139
+ // @ts-ignore Blob | Response
135
140
  const firstCharacters = data ? getFirstCharacters(data) : '';
136
141
  message += firstCharacters ? ` first bytes: "${firstCharacters}"` : 'first bytes: not available';
137
142
  message += ')';
@@ -217,7 +222,7 @@ function testBinary(data, byteOffset, loader, test) {
217
222
  }
218
223
  switch (typeof test) {
219
224
  case 'function':
220
- return test(data, loader);
225
+ return test(data);
221
226
  case 'string':
222
227
  // Magic bytes check: If `test` is a string, check if binary data starts with that strings
223
228
  const magic = getMagicString(data, byteOffset, test.length);
@@ -38,7 +38,7 @@ export default class BrowserFileSystem implements FileSystem {
38
38
  * Just removes the file from the list
39
39
  */
40
40
  unlink(path: string): Promise<void>;
41
- open(pathname: string, flags: any, mode?: any): Promise<any>;
41
+ open(pathname: string, flags: unknown, mode?: unknown): Promise<any>;
42
42
  /**
43
43
  * Read a range into a buffer
44
44
  * @todo - handle position memory
@@ -52,7 +52,7 @@ export default class BrowserFileSystem implements FileSystem {
52
52
  buffer: ArrayBuffer;
53
53
  }>;
54
54
  close(fd: number): Promise<void>;
55
- _getFile(path: any, used: any): File;
55
+ _getFile(path: string, used: boolean): File;
56
56
  }
57
57
  export {};
58
58
  //# sourceMappingURL=browser-filesystem.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"browser-filesystem.d.ts","sourceRoot":"","sources":["../../../src/lib/filesystems/browser-filesystem.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AAE7C,KAAK,wBAAwB,GAAG;IAC9B,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;CACtB,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,OAAO,OAAO,iBAAkB,YAAW,UAAU;IAC1D,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,KAAK,CAAkC;IAC/C,OAAO,CAAC,cAAc,CAAkC;IACxD,OAAO,CAAC,SAAS,CAAqC;IAEtD;;;;OAIG;gBACS,KAAK,EAAE,QAAQ,GAAG,IAAI,EAAE,EAAE,OAAO,CAAC,EAAE,wBAAwB;IAexE;;;OAGG;IACG,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC;IAkCnE;;;;OAIG;IACG,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IASlD;;OAEG;IACG,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,CAAC;IAQnE;;OAEG;IACG,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IASnC,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,KAAA,EAAE,IAAI,CAAC,KAAA,GAAG,OAAO,CAAC,GAAG,CAAC;IAIxD;;;;;;;OAOG;IACG,IAAI,CACR,EAAE,EAAE,GAAG,EACP,MAAM,EAAE,WAAW,EACnB,MAAM,GAAE,MAAU,EAClB,MAAM,GAAE,MAA0B,EAClC,QAAQ,GAAE,MAAM,GAAG,IAAW,GAC7B,OAAO,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,WAAW,CAAA;KAAC,CAAC;IAQ9C,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAStC,QAAQ,CAAC,IAAI,KAAA,EAAE,IAAI,KAAA;CAQpB"}
1
+ {"version":3,"file":"browser-filesystem.d.ts","sourceRoot":"","sources":["../../../src/lib/filesystems/browser-filesystem.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AAE7C,KAAK,wBAAwB,GAAG;IAC9B,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;CACtB,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,OAAO,OAAO,iBAAkB,YAAW,UAAU;IAC1D,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,KAAK,CAAkC;IAC/C,OAAO,CAAC,cAAc,CAAkC;IACxD,OAAO,CAAC,SAAS,CAAqC;IAEtD;;;;OAIG;gBACS,KAAK,EAAE,QAAQ,GAAG,IAAI,EAAE,EAAE,OAAO,CAAC,EAAE,wBAAwB;IAexE;;;OAGG;IACG,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC;IAkCnE;;;;OAIG;IACG,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IASlD;;OAEG;IACG,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,CAAC;IAQnE;;OAEG;IACG,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IASnC,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC;IAI1E;;;;;;;OAOG;IACG,IAAI,CACR,EAAE,EAAE,GAAG,EACP,MAAM,EAAE,WAAW,EACnB,MAAM,GAAE,MAAU,EAClB,MAAM,GAAE,MAA0B,EAClC,QAAQ,GAAE,MAAM,GAAG,IAAW,GAC7B,OAAO,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,WAAW,CAAA;KAAC,CAAC;IAQ9C,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAStC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,IAAI;CAQ5C"}
@@ -115,7 +115,7 @@ class BrowserFileSystem {
115
115
  // PRIVATE
116
116
  // Supports case independent paths, and file usage tracking
117
117
  _getFile(path, used) {
118
- // Prefer case match, but fall back to case indepent.
118
+ // Prefer case match, but fall back to case independent.
119
119
  const file = this.files[path] || this.lowerCaseFiles[path];
120
120
  if (file && used) {
121
121
  this.usedFiles[path] = true;
@@ -1 +1 @@
1
- {"version":3,"file":"filesystem.d.ts","sourceRoot":"","sources":["../../../src/lib/filesystems/filesystem.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,WAAW,GAAG,EAAE,CAAC;AAE7B,MAAM,MAAM,IAAI,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,OAAO,CAAC;CAC5B,CAAC;AAEF;;;GAGG;AACH,MAAM,WAAW,UAAU;IACzB;;;OAGG;IACH,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAC,SAAS,CAAC,EAAE,OAAO,CAAA;KAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAE9E;;;;;OAKG;IACH,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,CAAC,CAAC;IAElE;;;;OAIG;IACH,KAAK,CAAC,QAAQ,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;CACxE;AAED;;GAEG;AACH,MAAM,WAAW,0BAA2B,SAAQ,UAAU;IAC5D,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IACjE,KAAK,CAAC,EAAE,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAClC,KAAK,CAAC,EAAE,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAClC,IAAI,CACF,EAAE,EAAE,GAAG,EACP,MAAM,EAAE,WAAW,GAAG,eAAe,EACrC,MAAM,CAAC,EAAE,MAAM,EACf,MAAM,CAAC,EAAE,MAAM,EACf,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,WAAW,CAAA;KAAC,CAAC,CAAC;CACtD"}
1
+ {"version":3,"file":"filesystem.d.ts","sourceRoot":"","sources":["../../../src/lib/filesystems/filesystem.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,WAAW,GAAG,EAAE,CAAC;AAE7B,MAAM,MAAM,IAAI,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,OAAO,CAAC;CAC5B,CAAC;AAEF;;;GAGG;AACH,MAAM,WAAW,UAAU;IACzB;;;OAGG;IACH,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAC,SAAS,CAAC,EAAE,OAAO,CAAA;KAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAE9E;;;;;OAKG;IACH,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,CAAC,CAAC;IAElE;;;;OAIG;IACH,KAAK,CAAC,QAAQ,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;CACxE;AAED;;GAEG;AACH,MAAM,WAAW,0BAA2B,SAAQ,UAAU;IAC5D,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IACjE,KAAK,CAAC,EAAE,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAClC,KAAK,CAAC,EAAE,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAClC,IAAI,CACF,EAAE,EAAE,GAAG,EACP,MAAM,EAAE,WAAW,GAAG,eAAe,EACrC,MAAM,CAAC,EAAE,MAAM,EACf,MAAM,CAAC,EAAE,MAAM,EACf,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,WAAW,CAAA;KAAC,CAAC,CAAC;CACtD"}
@@ -1,2 +1,3 @@
1
1
  "use strict";
2
+ // loaders.gl, MIT license
2
3
  Object.defineProperty(exports, "__esModule", { value: true });
@@ -1 +1 @@
1
- {"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/lib/init.ts"],"names":[],"mappings":";AAgBA,wBAAkC"}
1
+ {"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/lib/init.ts"],"names":[],"mappings":";AAiBA,wBAAkC"}
package/dist/lib/init.js CHANGED
@@ -7,6 +7,7 @@ const version = typeof __VERSION__ !== 'undefined' ? __VERSION__ : '';
7
7
  // @ts-ignore
8
8
  if (!globalThis.loaders) {
9
9
  log_1.log.log(1, `loaders.gl ${version}`)();
10
+ // @ts-ignore TS2339: Property 'loaders' does not exist on type 'Window & typeof globalThis'.
10
11
  globalThis.loaders = Object.assign(globalThis.loaders || {}, {
11
12
  VERSION: version,
12
13
  log: log_1.log
@@ -1 +1 @@
1
- {"version":3,"file":"get-data.d.ts","sourceRoot":"","sources":["../../../src/lib/loader-utils/get-data.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,QAAQ,EACR,YAAY,EACZ,iBAAiB,EACjB,MAAM,EACN,aAAa,EACd,MAAM,0BAA0B,CAAC;AAiBlC,wBAAgB,kCAAkC,CAChD,IAAI,EAAE,YAAY,EAClB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,aAAa,GACrB,WAAW,GAAG,MAAM,CAyCtB;AAGD,wBAAsB,8BAA8B,CAClD,IAAI,EAAE,QAAQ,EACd,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,WAAW,GAAG,MAAM,CAAC,CA4B/B;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,iBAAiB,EACvB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC,CAyB7D;AAED,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,cAAc,CAAC,CAWxF"}
1
+ {"version":3,"file":"get-data.d.ts","sourceRoot":"","sources":["../../../src/lib/loader-utils/get-data.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,QAAQ,EACR,YAAY,EACZ,iBAAiB,EACjB,MAAM,EACN,aAAa,EACd,MAAM,0BAA0B,CAAC;AAiBlC,wBAAgB,kCAAkC,CAChD,IAAI,EAAE,YAAY,EAClB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,aAAa,GACrB,WAAW,GAAG,MAAM,CAyCtB;AAGD,wBAAsB,8BAA8B,CAClD,IAAI,EAAE,QAAQ,EACd,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,WAAW,GAAG,MAAM,CAAC,CA4B/B;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,iBAAiB,EACvB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC,CA0B7D;AAED,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,cAAc,CAAC,CAWxF"}
@@ -88,6 +88,7 @@ async function getAsyncIterableFromData(data, options) {
88
88
  return (0, make_iterator_1.makeIterator)(data, options);
89
89
  }
90
90
  if ((0, is_type_1.isAsyncIterable)(data)) {
91
+ // @ts-ignore
91
92
  return data[Symbol.asyncIterator]();
92
93
  }
93
94
  return getIterableFromData(data);
@@ -1,4 +1,6 @@
1
1
  import type { Loader, LoaderOptions, LoaderContext } from '@loaders.gl/loader-utils';
2
+ /** Properties for creating an updated context */
3
+ type LoaderContextProps = Omit<LoaderContext, 'fetch'> & Partial<Pick<LoaderContext, 'fetch'>>;
2
4
  /**
3
5
  * "sub" loaders invoked by other loaders get a "context" injected on `this`
4
6
  * The context will inject core methods like `parse` and contain information
@@ -8,6 +10,7 @@ import type { Loader, LoaderOptions, LoaderContext } from '@loaders.gl/loader-ut
8
10
  * @param options
9
11
  * @param previousContext
10
12
  */
11
- export declare function getLoaderContext(context: Omit<LoaderContext, 'fetch'> & Partial<Pick<LoaderContext, 'fetch'>>, options: LoaderOptions, parentContext: LoaderContext | null): LoaderContext;
12
- export declare function getLoadersFromContext(loaders: Loader[] | Loader | undefined, context?: LoaderContext): any;
13
+ export declare function getLoaderContext(context: LoaderContextProps, options: LoaderOptions, parentContext: LoaderContext | null): LoaderContext;
14
+ export declare function getLoadersFromContext(loaders: Loader[] | Loader | undefined, context?: LoaderContext): Loader | Loader[] | undefined;
15
+ export {};
13
16
  //# sourceMappingURL=loader-context.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"loader-context.d.ts","sourceRoot":"","sources":["../../../src/lib/loader-utils/loader-context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAE,aAAa,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAKnF;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC,EAC7E,OAAO,EAAE,aAAa,EACtB,aAAa,EAAE,aAAa,GAAG,IAAI,GAClC,aAAa,CA2Bf;AAGD,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,SAAS,EACtC,OAAO,CAAC,EAAE,aAAa,OAkBxB"}
1
+ {"version":3,"file":"loader-context.d.ts","sourceRoot":"","sources":["../../../src/lib/loader-utils/loader-context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAE,aAAa,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAKnF,iDAAiD;AACjD,KAAK,kBAAkB,GAAG,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC,CAAC;AAE/F;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,kBAAkB,EAC3B,OAAO,EAAE,aAAa,EACtB,aAAa,EAAE,aAAa,GAAG,IAAI,GAClC,aAAa,CA2Bf;AAGD,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,SAAS,EACtC,OAAO,CAAC,EAAE,aAAa,GACtB,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,CAiB/B"}
@@ -40,8 +40,8 @@ function getLoaderContext(context, options, parentContext) {
40
40
  exports.getLoaderContext = getLoaderContext;
41
41
  // eslint-disable-next-line complexity
42
42
  function getLoadersFromContext(loaders, context) {
43
- // A single non-array loader is force selected, but only on top-level (context === null)
44
- if (!context && loaders && !Array.isArray(loaders)) {
43
+ // A single loader (non-array) indicates no selection desired. Force select.
44
+ if (loaders && !Array.isArray(loaders)) {
45
45
  return loaders;
46
46
  }
47
47
  // Create a merged list
@@ -54,6 +54,6 @@ function getLoadersFromContext(loaders, context) {
54
54
  candidateLoaders = candidateLoaders ? [...candidateLoaders, ...contextLoaders] : contextLoaders;
55
55
  }
56
56
  // If no loaders, return null to look in globally registered loaders
57
- return candidateLoaders && candidateLoaders.length ? candidateLoaders : null;
57
+ return candidateLoaders && candidateLoaders.length ? candidateLoaders : undefined;
58
58
  }
59
59
  exports.getLoadersFromContext = getLoadersFromContext;
@@ -1,17 +1,19 @@
1
1
  import { Log } from '@probe.gl/log';
2
2
  export declare const probeLog: Log;
3
+ type LogFunction = () => void;
3
4
  export declare class NullLog {
4
- log(): () => void;
5
- info(): () => void;
6
- warn(): () => void;
7
- error(): () => void;
5
+ log(): LogFunction;
6
+ info(): LogFunction;
7
+ warn(): LogFunction;
8
+ error(): LogFunction;
8
9
  }
9
10
  export declare class ConsoleLog {
10
11
  console: any;
11
12
  constructor();
12
- log(...args: any[]): any;
13
- info(...args: any[]): any;
14
- warn(...args: any[]): any;
15
- error(...args: any[]): any;
13
+ log(...args: unknown[]): LogFunction;
14
+ info(...args: unknown[]): LogFunction;
15
+ warn(...args: unknown[]): LogFunction;
16
+ error(...args: unknown[]): LogFunction;
16
17
  }
18
+ export {};
17
19
  //# sourceMappingURL=loggers.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"loggers.d.ts","sourceRoot":"","sources":["../../../src/lib/loader-utils/loggers.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,GAAG,EAAC,MAAM,eAAe,CAAC;AAElC,eAAO,MAAM,QAAQ,KAA8B,CAAC;AAGpD,qBAAa,OAAO;IAClB,GAAG;IAGH,IAAI;IAGJ,IAAI;IAGJ,KAAK;CAGN;AAGD,qBAAa,UAAU;IACrB,OAAO,MAAC;;IAKR,GAAG,CAAC,GAAG,IAAI,OAAA;IAGX,IAAI,CAAC,GAAG,IAAI,OAAA;IAGZ,IAAI,CAAC,GAAG,IAAI,OAAA;IAGZ,KAAK,CAAC,GAAG,IAAI,OAAA;CAGd"}
1
+ {"version":3,"file":"loggers.d.ts","sourceRoot":"","sources":["../../../src/lib/loader-utils/loggers.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,GAAG,EAAC,MAAM,eAAe,CAAC;AAElC,eAAO,MAAM,QAAQ,KAA8B,CAAC;AAEpD,KAAK,WAAW,GAAG,MAAM,IAAI,CAAC;AAG9B,qBAAa,OAAO;IAClB,GAAG,IAAI,WAAW;IAGlB,IAAI,IAAI,WAAW;IAGnB,IAAI,IAAI,WAAW;IAGnB,KAAK,IAAI,WAAW;CAGrB;AAGD,qBAAa,UAAU;IACrB,OAAO,MAAC;;IAKR,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,WAAW;IAGpC,IAAI,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,WAAW;IAGrC,IAAI,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,WAAW;IAGrC,KAAK,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,WAAW;CAGvC"}
@@ -16,7 +16,7 @@ export declare function getGlobalLoaderState(): GlobalLoaderState;
16
16
  * NOTE: This use case is not reliable but can help when testing new versions of loaders.gl with existing frameworks
17
17
  * @returns global loader options merged with default loader options
18
18
  */
19
- export declare const getGlobalLoaderOptions: () => LoaderOptions;
19
+ export declare function getGlobalLoaderOptions(): LoaderOptions;
20
20
  /**
21
21
  * Set global loader options
22
22
  * @param options
@@ -1 +1 @@
1
- {"version":3,"file":"option-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/loader-utils/option-utils.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,MAAM,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAKpE;;GAEG;AACH,KAAK,iBAAiB,GAAG;IACvB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,aAAa,EAAE,aAAa,CAAC;CAC9B,CAAC;AAEF;;;GAGG;AACH,wBAAgB,oBAAoB,IAAI,iBAAiB,CASxD;AAED;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,QAAO,aAKzC,CAAC;AAEF;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI,CAI7D;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,MAAM,EAAE,EAClB,GAAG,CAAC,EAAE,MAAM,GACX,aAAa,CAMf"}
1
+ {"version":3,"file":"option-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/loader-utils/option-utils.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,MAAM,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAKpE;;GAEG;AACH,KAAK,iBAAiB,GAAG;IACvB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,aAAa,EAAE,aAAa,CAAC;CAC9B,CAAC;AAEF;;;GAGG;AACH,wBAAgB,oBAAoB,IAAI,iBAAiB,CASxD;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,IAAI,aAAa,CAKtD;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI,CAK7D;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,MAAM,EAAE,EAClB,GAAG,CAAC,EAAE,MAAM,GACX,aAAa,CAMf"}
@@ -24,12 +24,12 @@ exports.getGlobalLoaderState = getGlobalLoaderState;
24
24
  * NOTE: This use case is not reliable but can help when testing new versions of loaders.gl with existing frameworks
25
25
  * @returns global loader options merged with default loader options
26
26
  */
27
- const getGlobalLoaderOptions = () => {
27
+ function getGlobalLoaderOptions() {
28
28
  const state = getGlobalLoaderState();
29
29
  // Ensure all default loader options from this library are mentioned
30
30
  state.globalOptions = state.globalOptions || { ...option_defaults_1.DEFAULT_LOADER_OPTIONS };
31
31
  return state.globalOptions;
32
- };
32
+ }
33
33
  exports.getGlobalLoaderOptions = getGlobalLoaderOptions;
34
34
  /**
35
35
  * Set global loader options
@@ -37,7 +37,8 @@ exports.getGlobalLoaderOptions = getGlobalLoaderOptions;
37
37
  */
38
38
  function setGlobalOptions(options) {
39
39
  const state = getGlobalLoaderState();
40
- const globalOptions = (0, exports.getGlobalLoaderOptions)();
40
+ const globalOptions = getGlobalLoaderOptions();
41
+ // @ts-expect-error First param looks incorrect
41
42
  state.globalOptions = normalizeOptionsInternal(globalOptions, options);
42
43
  }
43
44
  exports.setGlobalOptions = setGlobalOptions;
@@ -66,11 +67,12 @@ function validateOptions(options, loaders) {
66
67
  validateOptionsObject(options, null, option_defaults_1.DEFAULT_LOADER_OPTIONS, option_defaults_1.REMOVED_LOADER_OPTIONS, loaders);
67
68
  for (const loader of loaders) {
68
69
  // Get the scoped, loader specific options from the user supplied options
69
- const idOptions = (options && options[loader.id]) || {};
70
+ const idOptions = ((options && options[loader.id]) || {});
70
71
  // Get scoped, loader specific default and deprecated options from the selected loader
71
72
  const loaderOptions = (loader.options && loader.options[loader.id]) || {};
72
73
  const deprecatedOptions = (loader.deprecatedOptions && loader.deprecatedOptions[loader.id]) || {};
73
74
  // Validate loader specific options
75
+ // @ts-ignore
74
76
  validateOptionsObject(idOptions, loader.id, loaderOptions, deprecatedOptions, loaders);
75
77
  }
76
78
  }
@@ -121,7 +123,7 @@ function normalizeOptionsInternal(loader, options, url) {
121
123
  if (mergedOptions.log === null) {
122
124
  mergedOptions.log = new loggers_1.NullLog();
123
125
  }
124
- mergeNestedFields(mergedOptions, (0, exports.getGlobalLoaderOptions)());
126
+ mergeNestedFields(mergedOptions, getGlobalLoaderOptions());
125
127
  mergeNestedFields(mergedOptions, options);
126
128
  return mergedOptions;
127
129
  }