@loaders.gl/core 3.4.0-alpha.1 → 3.4.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.
Files changed (194) hide show
  1. package/dist/dist.min.js +461 -248
  2. package/dist/es5/core-addons/write-file-browser.js +0 -2
  3. package/dist/es5/index.js.map +1 -1
  4. package/dist/es5/iterators/batch-iterators/timed-batch-iterator.js +65 -67
  5. package/dist/es5/iterators/batch-iterators/timed-batch-iterator.js.map +1 -1
  6. package/dist/es5/iterators/make-iterator/make-array-buffer-iterator.js +13 -24
  7. package/dist/es5/iterators/make-iterator/make-array-buffer-iterator.js.map +1 -1
  8. package/dist/es5/iterators/make-iterator/make-blob-iterator.js +22 -25
  9. package/dist/es5/iterators/make-iterator/make-blob-iterator.js.map +1 -1
  10. package/dist/es5/iterators/make-iterator/make-iterator.js.map +1 -1
  11. package/dist/es5/iterators/make-iterator/make-stream-iterator.js +88 -93
  12. package/dist/es5/iterators/make-iterator/make-stream-iterator.js.map +1 -1
  13. package/dist/es5/iterators/make-iterator/make-string-iterator.js +20 -24
  14. package/dist/es5/iterators/make-iterator/make-string-iterator.js.map +1 -1
  15. package/dist/es5/iterators/make-stream/make-dom-stream.js +30 -34
  16. package/dist/es5/iterators/make-stream/make-dom-stream.js.map +1 -1
  17. package/dist/es5/iterators/make-stream/make-node-stream.js +88 -87
  18. package/dist/es5/iterators/make-stream/make-node-stream.js.map +1 -1
  19. package/dist/es5/javascript-utils/is-type.js +0 -3
  20. package/dist/es5/javascript-utils/is-type.js.map +1 -1
  21. package/dist/es5/lib/api/encode.js +157 -166
  22. package/dist/es5/lib/api/encode.js.map +1 -1
  23. package/dist/es5/lib/api/load-in-batches.js +25 -31
  24. package/dist/es5/lib/api/load-in-batches.js.map +1 -1
  25. package/dist/es5/lib/api/load.js +35 -38
  26. package/dist/es5/lib/api/load.js.map +1 -1
  27. package/dist/es5/lib/api/loader-options.js.map +1 -1
  28. package/dist/es5/lib/api/parse-in-batches.js +192 -207
  29. package/dist/es5/lib/api/parse-in-batches.js.map +1 -1
  30. package/dist/es5/lib/api/parse-sync.js +0 -7
  31. package/dist/es5/lib/api/parse-sync.js.map +1 -1
  32. package/dist/es5/lib/api/parse.js +99 -107
  33. package/dist/es5/lib/api/parse.js.map +1 -1
  34. package/dist/es5/lib/api/register-loaders.js +1 -3
  35. package/dist/es5/lib/api/register-loaders.js.map +1 -1
  36. package/dist/es5/lib/api/save.js +13 -15
  37. package/dist/es5/lib/api/save.js.map +1 -1
  38. package/dist/es5/lib/api/select-loader.js +41 -58
  39. package/dist/es5/lib/api/select-loader.js.map +1 -1
  40. package/dist/es5/lib/fetch/fetch-error-message.js +29 -31
  41. package/dist/es5/lib/fetch/fetch-error-message.js.map +1 -1
  42. package/dist/es5/lib/fetch/fetch-file.js +23 -25
  43. package/dist/es5/lib/fetch/fetch-file.js.map +1 -1
  44. package/dist/es5/lib/fetch/read-array-buffer.js +41 -45
  45. package/dist/es5/lib/fetch/read-array-buffer.js.map +1 -1
  46. package/dist/es5/lib/fetch/read-file.js +0 -3
  47. package/dist/es5/lib/fetch/read-file.js.map +1 -1
  48. package/dist/es5/lib/fetch/write-file.js +15 -17
  49. package/dist/es5/lib/fetch/write-file.js.map +1 -1
  50. package/dist/es5/lib/filesystems/browser-filesystem.js +107 -124
  51. package/dist/es5/lib/filesystems/browser-filesystem.js.map +1 -1
  52. package/dist/es5/lib/filesystems/read-array-buffer.js +19 -21
  53. package/dist/es5/lib/filesystems/read-array-buffer.js.map +1 -1
  54. package/dist/es5/lib/init.js +1 -3
  55. package/dist/es5/lib/init.js.map +1 -1
  56. package/dist/es5/lib/loader-utils/check-errors.js +24 -26
  57. package/dist/es5/lib/loader-utils/check-errors.js.map +1 -1
  58. package/dist/es5/lib/loader-utils/get-data.js +130 -145
  59. package/dist/es5/lib/loader-utils/get-data.js.map +1 -1
  60. package/dist/es5/lib/loader-utils/get-fetch-function.js +26 -0
  61. package/dist/es5/lib/loader-utils/get-fetch-function.js.map +1 -0
  62. package/dist/es5/lib/loader-utils/loader-context.js +2 -5
  63. package/dist/es5/lib/loader-utils/loader-context.js.map +1 -1
  64. package/dist/es5/lib/loader-utils/loggers.js +0 -2
  65. package/dist/es5/lib/loader-utils/loggers.js.map +1 -1
  66. package/dist/es5/lib/loader-utils/normalize-loader.js +0 -3
  67. package/dist/es5/lib/loader-utils/normalize-loader.js.map +1 -1
  68. package/dist/es5/lib/loader-utils/option-defaults.js +0 -2
  69. package/dist/es5/lib/loader-utils/option-defaults.js.map +1 -1
  70. package/dist/es5/lib/loader-utils/option-utils.js +21 -55
  71. package/dist/es5/lib/loader-utils/option-utils.js.map +1 -1
  72. package/dist/es5/lib/progress/fetch-progress.js +92 -98
  73. package/dist/es5/lib/progress/fetch-progress.js.map +1 -1
  74. package/dist/es5/lib/utils/log.js +0 -1
  75. package/dist/es5/lib/utils/log.js.map +1 -1
  76. package/dist/es5/lib/utils/mime-type-utils.js +0 -3
  77. package/dist/es5/lib/utils/mime-type-utils.js.map +1 -1
  78. package/dist/es5/lib/utils/resource-utils.js +0 -4
  79. package/dist/es5/lib/utils/resource-utils.js.map +1 -1
  80. package/dist/es5/lib/utils/response-utils.js +118 -131
  81. package/dist/es5/lib/utils/response-utils.js.map +1 -1
  82. package/dist/es5/null-loader.js +57 -63
  83. package/dist/es5/null-loader.js.map +1 -1
  84. package/dist/es5/workers/null-worker.js.map +1 -1
  85. package/dist/esm/bundle.js +0 -1
  86. package/dist/esm/bundle.js.map +1 -1
  87. package/dist/esm/index.js +0 -12
  88. package/dist/esm/index.js.map +1 -1
  89. package/dist/esm/iterators/batch-iterators/timed-batch-iterator.js +0 -1
  90. package/dist/esm/iterators/batch-iterators/timed-batch-iterator.js.map +1 -1
  91. package/dist/esm/iterators/make-iterator/make-array-buffer-iterator.js +16 -17
  92. package/dist/esm/iterators/make-iterator/make-array-buffer-iterator.js.map +1 -1
  93. package/dist/esm/iterators/make-iterator/make-blob-iterator.js +0 -1
  94. package/dist/esm/iterators/make-iterator/make-blob-iterator.js.map +1 -1
  95. package/dist/esm/iterators/make-iterator/make-iterator.js +0 -1
  96. package/dist/esm/iterators/make-iterator/make-iterator.js.map +1 -1
  97. package/dist/esm/iterators/make-iterator/make-stream-iterator.js +0 -3
  98. package/dist/esm/iterators/make-iterator/make-stream-iterator.js.map +1 -1
  99. package/dist/esm/iterators/make-iterator/make-string-iterator.js +0 -2
  100. package/dist/esm/iterators/make-iterator/make-string-iterator.js.map +1 -1
  101. package/dist/esm/iterators/make-stream/make-dom-stream.js +1 -3
  102. package/dist/esm/iterators/make-stream/make-dom-stream.js.map +1 -1
  103. package/dist/esm/iterators/make-stream/make-node-stream.js +3 -2
  104. package/dist/esm/iterators/make-stream/make-node-stream.js.map +1 -1
  105. package/dist/esm/javascript-utils/is-type.js +0 -4
  106. package/dist/esm/javascript-utils/is-type.js.map +1 -1
  107. package/dist/esm/lib/api/encode.js +0 -9
  108. package/dist/esm/lib/api/encode.js.map +1 -1
  109. package/dist/esm/lib/api/load-in-batches.js +1 -5
  110. package/dist/esm/lib/api/load-in-batches.js.map +1 -1
  111. package/dist/esm/lib/api/load.js +1 -6
  112. package/dist/esm/lib/api/load.js.map +1 -1
  113. package/dist/esm/lib/api/parse-in-batches.js +2 -16
  114. package/dist/esm/lib/api/parse-in-batches.js.map +1 -1
  115. package/dist/esm/lib/api/parse-sync.js +0 -8
  116. package/dist/esm/lib/api/parse-sync.js.map +1 -1
  117. package/dist/esm/lib/api/parse.js +0 -12
  118. package/dist/esm/lib/api/parse.js.map +1 -1
  119. package/dist/esm/lib/api/register-loaders.js +0 -3
  120. package/dist/esm/lib/api/register-loaders.js.map +1 -1
  121. package/dist/esm/lib/api/save.js.map +1 -1
  122. package/dist/esm/lib/api/select-loader.js +0 -20
  123. package/dist/esm/lib/api/select-loader.js.map +1 -1
  124. package/dist/esm/lib/fetch/fetch-error-message.js.map +1 -1
  125. package/dist/esm/lib/fetch/fetch-file.js +0 -1
  126. package/dist/esm/lib/fetch/fetch-file.js.map +1 -1
  127. package/dist/esm/lib/fetch/read-array-buffer.js +0 -3
  128. package/dist/esm/lib/fetch/read-array-buffer.js.map +1 -1
  129. package/dist/esm/lib/fetch/read-file.js +0 -4
  130. package/dist/esm/lib/fetch/read-file.js.map +1 -1
  131. package/dist/esm/lib/fetch/write-file.js +0 -1
  132. package/dist/esm/lib/fetch/write-file.js.map +1 -1
  133. package/dist/esm/lib/filesystems/browser-filesystem.js +1 -11
  134. package/dist/esm/lib/filesystems/browser-filesystem.js.map +1 -1
  135. package/dist/esm/lib/filesystems/read-array-buffer.js +0 -2
  136. package/dist/esm/lib/filesystems/read-array-buffer.js.map +1 -1
  137. package/dist/esm/lib/init.js +1 -4
  138. package/dist/esm/lib/init.js.map +1 -1
  139. package/dist/esm/lib/loader-utils/check-errors.js +1 -2
  140. package/dist/esm/lib/loader-utils/check-errors.js.map +1 -1
  141. package/dist/esm/lib/loader-utils/get-data.js +0 -6
  142. package/dist/esm/lib/loader-utils/get-data.js.map +1 -1
  143. package/dist/esm/lib/loader-utils/get-fetch-function.js +18 -0
  144. package/dist/esm/lib/loader-utils/get-fetch-function.js.map +1 -0
  145. package/dist/esm/lib/loader-utils/loader-context.js +1 -5
  146. package/dist/esm/lib/loader-utils/loader-context.js.map +1 -1
  147. package/dist/esm/lib/loader-utils/loggers.js +0 -3
  148. package/dist/esm/lib/loader-utils/loggers.js.map +1 -1
  149. package/dist/esm/lib/loader-utils/normalize-loader.js +0 -3
  150. package/dist/esm/lib/loader-utils/normalize-loader.js.map +1 -1
  151. package/dist/esm/lib/loader-utils/option-defaults.js +0 -2
  152. package/dist/esm/lib/loader-utils/option-defaults.js.map +1 -1
  153. package/dist/esm/lib/loader-utils/option-utils.js +0 -32
  154. package/dist/esm/lib/loader-utils/option-utils.js.map +1 -1
  155. package/dist/esm/lib/progress/fetch-progress.js +2 -6
  156. package/dist/esm/lib/progress/fetch-progress.js.map +1 -1
  157. package/dist/esm/lib/utils/log.js +0 -1
  158. package/dist/esm/lib/utils/log.js.map +1 -1
  159. package/dist/esm/lib/utils/mime-type-utils.js +0 -4
  160. package/dist/esm/lib/utils/mime-type-utils.js.map +1 -1
  161. package/dist/esm/lib/utils/resource-utils.js +0 -4
  162. package/dist/esm/lib/utils/resource-utils.js.map +1 -1
  163. package/dist/esm/lib/utils/response-utils.js +1 -12
  164. package/dist/esm/lib/utils/response-utils.js.map +1 -1
  165. package/dist/esm/null-loader.js +1 -4
  166. package/dist/esm/null-loader.js.map +1 -1
  167. package/dist/iterators/make-stream/make-node-stream.d.ts +7 -2
  168. package/dist/iterators/make-stream/make-node-stream.d.ts.map +1 -1
  169. package/dist/iterators/make-stream/make-node-stream.js +28 -2
  170. package/dist/lib/api/encode.d.ts +5 -5
  171. package/dist/lib/api/encode.d.ts.map +1 -1
  172. package/dist/lib/api/encode.js +1 -0
  173. package/dist/lib/api/load-in-batches.js +2 -2
  174. package/dist/lib/api/load.d.ts.map +1 -1
  175. package/dist/lib/api/load.js +3 -2
  176. package/dist/lib/fetch/fetch-file.js +1 -1
  177. package/dist/lib/loader-utils/get-fetch-function.d.ts +9 -0
  178. package/dist/lib/loader-utils/get-fetch-function.d.ts.map +1 -0
  179. package/dist/lib/loader-utils/get-fetch-function.js +31 -0
  180. package/dist/lib/loader-utils/loader-context.js +2 -2
  181. package/dist/lib/loader-utils/option-utils.d.ts +5 -15
  182. package/dist/lib/loader-utils/option-utils.d.ts.map +1 -1
  183. package/dist/lib/loader-utils/option-utils.js +10 -31
  184. package/dist/lib/progress/fetch-progress.js +2 -2
  185. package/dist/null-worker.js +1 -1
  186. package/package.json +5 -5
  187. package/src/iterators/make-stream/make-node-stream.ts +8 -2
  188. package/src/lib/api/encode.ts +7 -6
  189. package/src/lib/api/load-in-batches.ts +1 -1
  190. package/src/lib/api/load.ts +3 -2
  191. package/src/lib/loader-utils/get-fetch-function.ts +38 -0
  192. package/src/lib/loader-utils/loader-context.ts +1 -1
  193. package/src/lib/loader-utils/option-utils.ts +17 -44
  194. package/src/lib/progress/fetch-progress.ts +2 -2
@@ -1 +1 @@
1
- {"version":3,"file":"option-utils.js","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"],"sources":["../../../../src/lib/loader-utils/option-utils.ts"],"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"],"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 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,5 +1,3 @@
1
-
2
-
3
1
  export default async function fetchProgress(response, onProgress) {
4
2
  let onDone = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : () => {};
5
3
  let onError = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : () => {};
@@ -12,14 +10,13 @@ export default async function fetchProgress(response, onProgress) {
12
10
  return response;
13
11
  }
14
12
  const contentLength = response.headers.get('content-length') || 0;
15
- const totalBytes = contentLength && parseInt(contentLength);
16
- if (!(contentLength > 0)) {
13
+ const totalBytes = contentLength ? parseInt(contentLength) : 0;
14
+ if (!(totalBytes > 0)) {
17
15
  return response;
18
16
  }
19
17
  if (typeof ReadableStream === 'undefined' || !body.getReader) {
20
18
  return response;
21
19
  }
22
-
23
20
  const progressStream = new ReadableStream({
24
21
  async start(controller) {
25
22
  const reader = body.getReader();
@@ -28,7 +25,6 @@ export default async function fetchProgress(response, onProgress) {
28
25
  });
29
26
  return new Response(progressStream);
30
27
  }
31
-
32
28
  async function read(controller, reader, loadedBytes, totalBytes, onProgress, onDone, onError) {
33
29
  try {
34
30
  const {
@@ -1 +1 @@
1
- {"version":3,"file":"fetch-progress.js","names":["fetchProgress","response","onProgress","onDone","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);\n if (!(contentLength > 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,aAAa,CACzCC,QAAsC,EACtCC,UAAe,EAGf;EAAA,IAFAC,MAAM,uEAAG,MAAM,CAAC,CAAC;EAAA,IACjBC,OAAO,uEAAG,MAAM,CAAC,CAAC;EAElBH,QAAQ,GAAG,MAAMA,QAAQ;EACzB,IAAI,CAACA,QAAQ,CAACI,EAAE,EAAE;IAEhB,OAAOJ,QAAQ;EACjB;EACA,MAAMK,IAAI,GAAGL,QAAQ,CAACK,IAAI;EAC1B,IAAI,CAACA,IAAI,EAAE;IAET,OAAOL,QAAQ;EACjB;EACA,MAAMM,aAAa,GAAGN,QAAQ,CAACO,OAAO,CAACC,GAAG,CAAC,gBAAgB,CAAC,IAAI,CAAC;EACjE,MAAMC,UAAU,GAAGH,aAAa,IAAII,QAAQ,CAACJ,aAAa,CAAC;EAC3D,IAAI,EAAEA,aAAa,GAAG,CAAC,CAAC,EAAE;IACxB,OAAON,QAAQ;EACjB;EAEA,IAAI,OAAOW,cAAc,KAAK,WAAW,IAAI,CAACN,IAAI,CAACO,SAAS,EAAE;IAC5D,OAAOZ,QAAQ;EACjB;;EAGA,MAAMa,cAAc,GAAG,IAAIF,cAAc,CAAC;IACxC,MAAMG,KAAK,CAACC,UAAU,EAAE;MACtB,MAAMC,MAAM,GAAGX,IAAI,CAACO,SAAS,EAAE;MAC/B,MAAMK,IAAI,CAACF,UAAU,EAAEC,MAAM,EAAE,CAAC,EAAEP,UAAU,EAAER,UAAU,EAAEC,MAAM,EAAEC,OAAO,CAAC;IAC5E;EACF,CAAC,CAAC;EAEF,OAAO,IAAIe,QAAQ,CAACL,cAAc,CAAC;AACrC;;AAKA,eAAeI,IAAI,CAACF,UAAU,EAAEC,MAAM,EAAEG,WAAW,EAAEV,UAAU,EAAER,UAAU,EAAEC,MAAM,EAAEC,OAAO,EAAE;EAC5F,IAAI;IACF,MAAM;MAACiB,IAAI;MAAEC;IAAK,CAAC,GAAG,MAAML,MAAM,CAACC,IAAI,EAAE;IACzC,IAAIG,IAAI,EAAE;MACRlB,MAAM,EAAE;MACRa,UAAU,CAACO,KAAK,EAAE;MAClB;IACF;IACAH,WAAW,IAAIE,KAAK,CAACE,UAAU;IAC/B,MAAMC,OAAO,GAAGC,IAAI,CAACC,KAAK,CAAEP,WAAW,GAAGV,UAAU,GAAI,GAAG,CAAC;IAC5DR,UAAU,CAACuB,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,EAAER,UAAU,EAAEC,MAAM,EAAEC,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(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,EAAE;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,EAAE;IACzC,IAAIG,IAAI,EAAE;MACRrB,MAAM,EAAE;MACRgB,UAAU,CAACO,KAAK,EAAE;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,3 @@
1
-
2
1
  import { Log } from '@probe.gl/log';
3
2
  export const log = new Log({
4
3
  id: 'loaders.gl'
@@ -1 +1 @@
1
- {"version":3,"file":"log.js","names":["Log","log","id"],"sources":["../../../../src/lib/utils/log.ts"],"sourcesContent":["// loaders.gl, MIT license\nimport {Log} from '@probe.gl/log';\n\nexport const log = new Log({id: 'loaders.gl'});\n"],"mappings":";AACA,SAAQA,GAAG,QAAO,eAAe;AAEjC,OAAO,MAAMC,GAAG,GAAG,IAAID,GAAG,CAAC;EAACE,EAAE,EAAE;AAAY,CAAC,CAAC"}
1
+ {"version":3,"file":"log.js","names":["Log","log","id"],"sources":["../../../../src/lib/utils/log.ts"],"sourcesContent":["// loaders.gl, MIT license\nimport {Log} from '@probe.gl/log';\n\nexport const log = new Log({id: 'loaders.gl'});\n"],"mappings":"AACA,SAAQA,GAAG,QAAO,eAAe;AAEjC,OAAO,MAAMC,GAAG,GAAG,IAAID,GAAG,CAAC;EAACE,EAAE,EAAE;AAAY,CAAC,CAAC"}
@@ -1,8 +1,5 @@
1
-
2
-
3
1
  const DATA_URL_PATTERN = /^data:([-\w.]+\/[-\w.+]+)(;|,)/;
4
2
  const MIME_TYPE_PATTERN = /^([-\w.]+\/[-\w.+]+)/;
5
-
6
3
  export function parseMIMEType(mimeString) {
7
4
  const matches = MIME_TYPE_PATTERN.exec(mimeString);
8
5
  if (matches) {
@@ -10,7 +7,6 @@ export function parseMIMEType(mimeString) {
10
7
  }
11
8
  return mimeString;
12
9
  }
13
-
14
10
  export function parseMIMETypeFromURL(url) {
15
11
  const matches = DATA_URL_PATTERN.exec(url);
16
12
  if (matches) {
@@ -1 +1 @@
1
- {"version":3,"file":"mime-type-utils.js","names":["DATA_URL_PATTERN","MIME_TYPE_PATTERN","parseMIMEType","mimeString","matches","exec","parseMIMETypeFromURL","url"],"sources":["../../../../src/lib/utils/mime-type-utils.ts"],"sourcesContent":["// TODO - build/integrate proper MIME type parsing\n// https://mimesniff.spec.whatwg.org/\n\nconst DATA_URL_PATTERN = /^data:([-\\w.]+\\/[-\\w.+]+)(;|,)/;\nconst MIME_TYPE_PATTERN = /^([-\\w.]+\\/[-\\w.+]+)/;\n\n/**\n * Remove extra data like `charset` from MIME types\n * @param mimeString\n * @returns A clean MIME type, or an empty string\n *\n * @todo - handle more advanced MIMETYpes, multiple types\n * @todo - extract charset etc\n */\nexport function parseMIMEType(mimeString: string): string {\n // If resource is a data url, extract any embedded mime type\n const matches = MIME_TYPE_PATTERN.exec(mimeString);\n if (matches) {\n return matches[1];\n }\n return mimeString;\n}\n\n/**\n * Extract MIME type from data URL\n *\n * @param mimeString\n * @returns A clean MIME type, or an empty string\n *\n * @todo - handle more advanced MIMETYpes, multiple types\n * @todo - extract charset etc\n */\nexport function parseMIMETypeFromURL(url: string): string {\n // If resource is a data URL, extract any embedded mime type\n const matches = DATA_URL_PATTERN.exec(url);\n if (matches) {\n return matches[1];\n }\n return '';\n}\n"],"mappings":";;AAGA,MAAMA,gBAAgB,GAAG,gCAAgC;AACzD,MAAMC,iBAAiB,GAAG,sBAAsB;;AAUhD,OAAO,SAASC,aAAa,CAACC,UAAkB,EAAU;EAExD,MAAMC,OAAO,GAAGH,iBAAiB,CAACI,IAAI,CAACF,UAAU,CAAC;EAClD,IAAIC,OAAO,EAAE;IACX,OAAOA,OAAO,CAAC,CAAC,CAAC;EACnB;EACA,OAAOD,UAAU;AACnB;;AAWA,OAAO,SAASG,oBAAoB,CAACC,GAAW,EAAU;EAExD,MAAMH,OAAO,GAAGJ,gBAAgB,CAACK,IAAI,CAACE,GAAG,CAAC;EAC1C,IAAIH,OAAO,EAAE;IACX,OAAOA,OAAO,CAAC,CAAC,CAAC;EACnB;EACA,OAAO,EAAE;AACX"}
1
+ {"version":3,"file":"mime-type-utils.js","names":["DATA_URL_PATTERN","MIME_TYPE_PATTERN","parseMIMEType","mimeString","matches","exec","parseMIMETypeFromURL","url"],"sources":["../../../../src/lib/utils/mime-type-utils.ts"],"sourcesContent":["// TODO - build/integrate proper MIME type parsing\n// https://mimesniff.spec.whatwg.org/\n\nconst DATA_URL_PATTERN = /^data:([-\\w.]+\\/[-\\w.+]+)(;|,)/;\nconst MIME_TYPE_PATTERN = /^([-\\w.]+\\/[-\\w.+]+)/;\n\n/**\n * Remove extra data like `charset` from MIME types\n * @param mimeString\n * @returns A clean MIME type, or an empty string\n *\n * @todo - handle more advanced MIMETYpes, multiple types\n * @todo - extract charset etc\n */\nexport function parseMIMEType(mimeString: string): string {\n // If resource is a data url, extract any embedded mime type\n const matches = MIME_TYPE_PATTERN.exec(mimeString);\n if (matches) {\n return matches[1];\n }\n return mimeString;\n}\n\n/**\n * Extract MIME type from data URL\n *\n * @param mimeString\n * @returns A clean MIME type, or an empty string\n *\n * @todo - handle more advanced MIMETYpes, multiple types\n * @todo - extract charset etc\n */\nexport function parseMIMETypeFromURL(url: string): string {\n // If resource is a data URL, extract any embedded mime type\n const matches = DATA_URL_PATTERN.exec(url);\n if (matches) {\n return matches[1];\n }\n return '';\n}\n"],"mappings":"AAGA,MAAMA,gBAAgB,GAAG,gCAAgC;AACzD,MAAMC,iBAAiB,GAAG,sBAAsB;AAUhD,OAAO,SAASC,aAAaA,CAACC,UAAkB,EAAU;EAExD,MAAMC,OAAO,GAAGH,iBAAiB,CAACI,IAAI,CAACF,UAAU,CAAC;EAClD,IAAIC,OAAO,EAAE;IACX,OAAOA,OAAO,CAAC,CAAC,CAAC;EACnB;EACA,OAAOD,UAAU;AACnB;AAWA,OAAO,SAASG,oBAAoBA,CAACC,GAAW,EAAU;EAExD,MAAMH,OAAO,GAAGJ,gBAAgB,CAACK,IAAI,CAACE,GAAG,CAAC;EAC1C,IAAIH,OAAO,EAAE;IACX,OAAOA,OAAO,CAAC,CAAC,CAAC;EACnB;EACA,OAAO,EAAE;AACX"}
@@ -1,7 +1,6 @@
1
1
  import { isResponse, isBlob } from '../../javascript-utils/is-type';
2
2
  import { parseMIMEType, parseMIMETypeFromURL } from './mime-type-utils';
3
3
  const QUERY_STRING_PATTERN = /\?.*/;
4
-
5
4
  export function getResourceUrlAndType(resource) {
6
5
  if (isResponse(resource)) {
7
6
  const url = stripQueryString(resource.url || '');
@@ -11,7 +10,6 @@ export function getResourceUrlAndType(resource) {
11
10
  type: parseMIMEType(contentTypeHeader) || parseMIMETypeFromURL(url)
12
11
  };
13
12
  }
14
-
15
13
  if (isBlob(resource)) {
16
14
  return {
17
15
  url: stripQueryString(resource.name || ''),
@@ -24,13 +22,11 @@ export function getResourceUrlAndType(resource) {
24
22
  type: parseMIMETypeFromURL(resource)
25
23
  };
26
24
  }
27
-
28
25
  return {
29
26
  url: '',
30
27
  type: ''
31
28
  };
32
29
  }
33
-
34
30
  export function getResourceContentLength(resource) {
35
31
  if (isResponse(resource)) {
36
32
  return resource.headers['content-length'] || -1;
@@ -1 +1 @@
1
- {"version":3,"file":"resource-utils.js","names":["isResponse","isBlob","parseMIMEType","parseMIMETypeFromURL","QUERY_STRING_PATTERN","getResourceUrlAndType","resource","url","stripQueryString","contentTypeHeader","headers","get","type","name","getResourceContentLength","size","length","ArrayBuffer","byteLength","isView","replace"],"sources":["../../../../src/lib/utils/resource-utils.ts"],"sourcesContent":["import {isResponse, isBlob} from '../../javascript-utils/is-type';\nimport {parseMIMEType, parseMIMETypeFromURL} from './mime-type-utils';\n\nconst QUERY_STRING_PATTERN = /\\?.*/;\n\n/**\n * Returns an object with `url` and (MIME) `type` fields\n * If it cannot determine url or type, the corresponding value will be an empty string\n *\n * @param resource Any type, but only Responses, string URLs and data URLs are processed\n *\n * @todo string parameters are assumed to be URLs\n */\nexport function getResourceUrlAndType(resource: any): {url: string; type: string} {\n // If resource is a response, it contains the information directly\n if (isResponse(resource)) {\n const url = stripQueryString(resource.url || '');\n const contentTypeHeader = resource.headers.get('content-type') || '';\n return {\n url,\n type: parseMIMEType(contentTypeHeader) || parseMIMETypeFromURL(url)\n };\n }\n\n // If the resource is a Blob or a File (subclass of Blob)\n if (isBlob(resource)) {\n return {\n // File objects have a \"name\" property. Blob objects don't have any\n // url (name) information\n url: stripQueryString(resource.name || ''),\n type: resource.type || ''\n };\n }\n\n if (typeof resource === 'string') {\n return {\n // TODO this could mess up data URL but it doesn't matter as it is just used for inference\n url: stripQueryString(resource),\n // If a data url\n type: parseMIMETypeFromURL(resource)\n };\n }\n\n // Unknown\n return {\n url: '',\n type: ''\n };\n}\n\n/**\n * Returns (approximate) content length for a resource if it can be determined.\n * Returns -1 if content length cannot be determined.\n * @param resource\n\n * @note string parameters are NOT assumed to be URLs\n */\nexport function getResourceContentLength(resource: any): number {\n if (isResponse(resource)) {\n return resource.headers['content-length'] || -1;\n }\n if (isBlob(resource)) {\n return resource.size;\n }\n if (typeof resource === 'string') {\n // TODO - handle data URL?\n return resource.length;\n }\n if (resource instanceof ArrayBuffer) {\n return resource.byteLength;\n }\n if (ArrayBuffer.isView(resource)) {\n return resource.byteLength;\n }\n return -1;\n}\n\nfunction stripQueryString(url) {\n return url.replace(QUERY_STRING_PATTERN, '');\n}\n"],"mappings":"AAAA,SAAQA,UAAU,EAAEC,MAAM,QAAO,gCAAgC;AACjE,SAAQC,aAAa,EAAEC,oBAAoB,QAAO,mBAAmB;AAErE,MAAMC,oBAAoB,GAAG,MAAM;;AAUnC,OAAO,SAASC,qBAAqB,CAACC,QAAa,EAA+B;EAEhF,IAAIN,UAAU,CAACM,QAAQ,CAAC,EAAE;IACxB,MAAMC,GAAG,GAAGC,gBAAgB,CAACF,QAAQ,CAACC,GAAG,IAAI,EAAE,CAAC;IAChD,MAAME,iBAAiB,GAAGH,QAAQ,CAACI,OAAO,CAACC,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE;IACpE,OAAO;MACLJ,GAAG;MACHK,IAAI,EAAEV,aAAa,CAACO,iBAAiB,CAAC,IAAIN,oBAAoB,CAACI,GAAG;IACpE,CAAC;EACH;;EAGA,IAAIN,MAAM,CAACK,QAAQ,CAAC,EAAE;IACpB,OAAO;MAGLC,GAAG,EAAEC,gBAAgB,CAACF,QAAQ,CAACO,IAAI,IAAI,EAAE,CAAC;MAC1CD,IAAI,EAAEN,QAAQ,CAACM,IAAI,IAAI;IACzB,CAAC;EACH;EAEA,IAAI,OAAON,QAAQ,KAAK,QAAQ,EAAE;IAChC,OAAO;MAELC,GAAG,EAAEC,gBAAgB,CAACF,QAAQ,CAAC;MAE/BM,IAAI,EAAET,oBAAoB,CAACG,QAAQ;IACrC,CAAC;EACH;;EAGA,OAAO;IACLC,GAAG,EAAE,EAAE;IACPK,IAAI,EAAE;EACR,CAAC;AACH;;AASA,OAAO,SAASE,wBAAwB,CAACR,QAAa,EAAU;EAC9D,IAAIN,UAAU,CAACM,QAAQ,CAAC,EAAE;IACxB,OAAOA,QAAQ,CAACI,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;EACjD;EACA,IAAIT,MAAM,CAACK,QAAQ,CAAC,EAAE;IACpB,OAAOA,QAAQ,CAACS,IAAI;EACtB;EACA,IAAI,OAAOT,QAAQ,KAAK,QAAQ,EAAE;IAEhC,OAAOA,QAAQ,CAACU,MAAM;EACxB;EACA,IAAIV,QAAQ,YAAYW,WAAW,EAAE;IACnC,OAAOX,QAAQ,CAACY,UAAU;EAC5B;EACA,IAAID,WAAW,CAACE,MAAM,CAACb,QAAQ,CAAC,EAAE;IAChC,OAAOA,QAAQ,CAACY,UAAU;EAC5B;EACA,OAAO,CAAC,CAAC;AACX;AAEA,SAASV,gBAAgB,CAACD,GAAG,EAAE;EAC7B,OAAOA,GAAG,CAACa,OAAO,CAAChB,oBAAoB,EAAE,EAAE,CAAC;AAC9C"}
1
+ {"version":3,"file":"resource-utils.js","names":["isResponse","isBlob","parseMIMEType","parseMIMETypeFromURL","QUERY_STRING_PATTERN","getResourceUrlAndType","resource","url","stripQueryString","contentTypeHeader","headers","get","type","name","getResourceContentLength","size","length","ArrayBuffer","byteLength","isView","replace"],"sources":["../../../../src/lib/utils/resource-utils.ts"],"sourcesContent":["import {isResponse, isBlob} from '../../javascript-utils/is-type';\nimport {parseMIMEType, parseMIMETypeFromURL} from './mime-type-utils';\n\nconst QUERY_STRING_PATTERN = /\\?.*/;\n\n/**\n * Returns an object with `url` and (MIME) `type` fields\n * If it cannot determine url or type, the corresponding value will be an empty string\n *\n * @param resource Any type, but only Responses, string URLs and data URLs are processed\n *\n * @todo string parameters are assumed to be URLs\n */\nexport function getResourceUrlAndType(resource: any): {url: string; type: string} {\n // If resource is a response, it contains the information directly\n if (isResponse(resource)) {\n const url = stripQueryString(resource.url || '');\n const contentTypeHeader = resource.headers.get('content-type') || '';\n return {\n url,\n type: parseMIMEType(contentTypeHeader) || parseMIMETypeFromURL(url)\n };\n }\n\n // If the resource is a Blob or a File (subclass of Blob)\n if (isBlob(resource)) {\n return {\n // File objects have a \"name\" property. Blob objects don't have any\n // url (name) information\n url: stripQueryString(resource.name || ''),\n type: resource.type || ''\n };\n }\n\n if (typeof resource === 'string') {\n return {\n // TODO this could mess up data URL but it doesn't matter as it is just used for inference\n url: stripQueryString(resource),\n // If a data url\n type: parseMIMETypeFromURL(resource)\n };\n }\n\n // Unknown\n return {\n url: '',\n type: ''\n };\n}\n\n/**\n * Returns (approximate) content length for a resource if it can be determined.\n * Returns -1 if content length cannot be determined.\n * @param resource\n\n * @note string parameters are NOT assumed to be URLs\n */\nexport function getResourceContentLength(resource: any): number {\n if (isResponse(resource)) {\n return resource.headers['content-length'] || -1;\n }\n if (isBlob(resource)) {\n return resource.size;\n }\n if (typeof resource === 'string') {\n // TODO - handle data URL?\n return resource.length;\n }\n if (resource instanceof ArrayBuffer) {\n return resource.byteLength;\n }\n if (ArrayBuffer.isView(resource)) {\n return resource.byteLength;\n }\n return -1;\n}\n\nfunction stripQueryString(url) {\n return url.replace(QUERY_STRING_PATTERN, '');\n}\n"],"mappings":"AAAA,SAAQA,UAAU,EAAEC,MAAM,QAAO,gCAAgC;AACjE,SAAQC,aAAa,EAAEC,oBAAoB,QAAO,mBAAmB;AAErE,MAAMC,oBAAoB,GAAG,MAAM;AAUnC,OAAO,SAASC,qBAAqBA,CAACC,QAAa,EAA+B;EAEhF,IAAIN,UAAU,CAACM,QAAQ,CAAC,EAAE;IACxB,MAAMC,GAAG,GAAGC,gBAAgB,CAACF,QAAQ,CAACC,GAAG,IAAI,EAAE,CAAC;IAChD,MAAME,iBAAiB,GAAGH,QAAQ,CAACI,OAAO,CAACC,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE;IACpE,OAAO;MACLJ,GAAG;MACHK,IAAI,EAAEV,aAAa,CAACO,iBAAiB,CAAC,IAAIN,oBAAoB,CAACI,GAAG;IACpE,CAAC;EACH;EAGA,IAAIN,MAAM,CAACK,QAAQ,CAAC,EAAE;IACpB,OAAO;MAGLC,GAAG,EAAEC,gBAAgB,CAACF,QAAQ,CAACO,IAAI,IAAI,EAAE,CAAC;MAC1CD,IAAI,EAAEN,QAAQ,CAACM,IAAI,IAAI;IACzB,CAAC;EACH;EAEA,IAAI,OAAON,QAAQ,KAAK,QAAQ,EAAE;IAChC,OAAO;MAELC,GAAG,EAAEC,gBAAgB,CAACF,QAAQ,CAAC;MAE/BM,IAAI,EAAET,oBAAoB,CAACG,QAAQ;IACrC,CAAC;EACH;EAGA,OAAO;IACLC,GAAG,EAAE,EAAE;IACPK,IAAI,EAAE;EACR,CAAC;AACH;AASA,OAAO,SAASE,wBAAwBA,CAACR,QAAa,EAAU;EAC9D,IAAIN,UAAU,CAACM,QAAQ,CAAC,EAAE;IACxB,OAAOA,QAAQ,CAACI,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;EACjD;EACA,IAAIT,MAAM,CAACK,QAAQ,CAAC,EAAE;IACpB,OAAOA,QAAQ,CAACS,IAAI;EACtB;EACA,IAAI,OAAOT,QAAQ,KAAK,QAAQ,EAAE;IAEhC,OAAOA,QAAQ,CAACU,MAAM;EACxB;EACA,IAAIV,QAAQ,YAAYW,WAAW,EAAE;IACnC,OAAOX,QAAQ,CAACY,UAAU;EAC5B;EACA,IAAID,WAAW,CAACE,MAAM,CAACb,QAAQ,CAAC,EAAE;IAChC,OAAOA,QAAQ,CAACY,UAAU;EAC5B;EACA,OAAO,CAAC,CAAC;AACX;AAEA,SAASV,gBAAgBA,CAACD,GAAG,EAAE;EAC7B,OAAOA,GAAG,CAACa,OAAO,CAAChB,oBAAoB,EAAE,EAAE,CAAC;AAC9C"}
@@ -1,17 +1,14 @@
1
1
  import { isResponse } from '../../javascript-utils/is-type';
2
2
  import { getResourceContentLength, getResourceUrlAndType } from './resource-utils';
3
-
4
3
  export async function makeResponse(resource) {
5
4
  if (isResponse(resource)) {
6
5
  return resource;
7
6
  }
8
-
9
7
  const headers = {};
10
8
  const contentLength = getResourceContentLength(resource);
11
9
  if (contentLength >= 0) {
12
10
  headers['content-length'] = String(contentLength);
13
11
  }
14
-
15
12
  const {
16
13
  url,
17
14
  type
@@ -19,16 +16,13 @@ export async function makeResponse(resource) {
19
16
  if (type) {
20
17
  headers['content-type'] = type;
21
18
  }
22
-
23
19
  const initialDataUrl = await getInitialDataUrl(resource);
24
20
  if (initialDataUrl) {
25
21
  headers['x-first-bytes'] = initialDataUrl;
26
22
  }
27
-
28
23
  if (typeof resource === 'string') {
29
24
  resource = new TextEncoder().encode(resource);
30
25
  }
31
-
32
26
  const response = new Response(resource, {
33
27
  headers
34
28
  });
@@ -37,14 +31,12 @@ export async function makeResponse(resource) {
37
31
  });
38
32
  return response;
39
33
  }
40
-
41
34
  export async function checkResponse(response) {
42
35
  if (!response.ok) {
43
36
  const message = await getResponseError(response);
44
37
  throw new Error(message);
45
38
  }
46
39
  }
47
-
48
40
  export function checkResponseSync(response) {
49
41
  if (!response.ok) {
50
42
  let message = "".concat(response.status, " ").concat(response.statusText);
@@ -52,7 +44,6 @@ export function checkResponseSync(response) {
52
44
  throw new Error(message);
53
45
  }
54
46
  }
55
-
56
47
  async function getResponseError(response) {
57
48
  let message = "Failed to fetch resource ".concat(response.url, " (").concat(response.status, "): ");
58
49
  try {
@@ -63,8 +54,7 @@ async function getResponseError(response) {
63
54
  }
64
55
  message += text;
65
56
  message = message.length > 60 ? "".concat(message.slice(0, 60), "...") : message;
66
- } catch (error) {
67
- }
57
+ } catch (error) {}
68
58
  return message;
69
59
  }
70
60
  async function getInitialDataUrl(resource) {
@@ -90,7 +80,6 @@ async function getInitialDataUrl(resource) {
90
80
  }
91
81
  return null;
92
82
  }
93
-
94
83
  function arrayBufferToBase64(buffer) {
95
84
  let binary = '';
96
85
  const bytes = new Uint8Array(buffer);
@@ -1 +1 @@
1
- {"version":3,"file":"response-utils.js","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"],"sources":["../../../../src/lib/utils/response-utils.ts"],"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"],"mappings":"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"}
1
+ {"version":3,"file":"response-utils.js","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","concat","status","statusText","length","slice","contentType","get","text","includes","error","INITIAL_DATA_LENGTH","Blob","blobSlice","Promise","resolve","reader","FileReader","onload","event","_event$target","target","result","readAsDataURL","ArrayBuffer","base64","arrayBufferToBase64","buffer","binary","bytes","Uint8Array","i","byteLength","fromCharCode","btoa"],"sources":["../../../../src/lib/utils/response-utils.ts"],"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"],"mappings":"AAAA,SAAQA,UAAU,QAAO,gCAAgC;AACzD,SAAQC,wBAAwB,EAAEC,qBAAqB,QAAO,kBAAkB;AAQhF,OAAO,eAAeC,YAAYA,CAACC,QAAa,EAAqB;EACnE,IAAIJ,UAAU,CAACI,QAAQ,CAAC,EAAE;IACxB,OAAOA,QAAQ;EACjB;EAGA,MAAMC,OAAmC,GAAG,CAAC,CAAC;EAE9C,MAAMC,aAAa,GAAGL,wBAAwB,CAACG,QAAQ,CAAC;EACxD,IAAIE,aAAa,IAAI,CAAC,EAAE;IACtBD,OAAO,CAAC,gBAAgB,CAAC,GAAGE,MAAM,CAACD,aAAa,CAAC;EACnD;EAIA,MAAM;IAACE,GAAG;IAAEC;EAAI,CAAC,GAAGP,qBAAqB,CAACE,QAAQ,CAAC;EACnD,IAAIK,IAAI,EAAE;IACRJ,OAAO,CAAC,cAAc,CAAC,GAAGI,IAAI;EAChC;EAGA,MAAMC,cAAc,GAAG,MAAMC,iBAAiB,CAACP,QAAQ,CAAC;EACxD,IAAIM,cAAc,EAAE;IAClBL,OAAO,CAAC,eAAe,CAAC,GAAGK,cAAc;EAC3C;EAIA,IAAI,OAAON,QAAQ,KAAK,QAAQ,EAAE;IAEhCA,QAAQ,GAAG,IAAIQ,WAAW,EAAE,CAACC,MAAM,CAACT,QAAQ,CAAC;EAC/C;EAGA,MAAMU,QAAQ,GAAG,IAAIC,QAAQ,CAACX,QAAQ,EAAE;IAACC;EAAO,CAAC,CAAC;EAElDW,MAAM,CAACC,cAAc,CAACH,QAAQ,EAAE,KAAK,EAAE;IAACI,KAAK,EAAEV;EAAG,CAAC,CAAC;EACpD,OAAOM,QAAQ;AACjB;AAMA,OAAO,eAAeK,aAAaA,CAACL,QAAkB,EAAiB;EACrE,IAAI,CAACA,QAAQ,CAACM,EAAE,EAAE;IAChB,MAAMC,OAAO,GAAG,MAAMC,gBAAgB,CAACR,QAAQ,CAAC;IAChD,MAAM,IAAIS,KAAK,CAACF,OAAO,CAAC;EAC1B;AACF;AAMA,OAAO,SAASG,iBAAiBA,CAACV,QAAkB,EAAQ;EAC1D,IAAI,CAACA,QAAQ,CAACM,EAAE,EAAE;IAChB,IAAIC,OAAO,MAAAI,MAAA,CAAMX,QAAQ,CAACY,MAAM,OAAAD,MAAA,CAAIX,QAAQ,CAACa,UAAU,CAAE;IACzDN,OAAO,GAAGA,OAAO,CAACO,MAAM,GAAG,EAAE,MAAAH,MAAA,CAAMJ,OAAO,CAACQ,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,WAAQR,OAAO;IACtE,MAAM,IAAIE,KAAK,CAACF,OAAO,CAAC;EAC1B;AACF;AAIA,eAAeC,gBAAgBA,CAACR,QAAQ,EAAmB;EACzD,IAAIO,OAAO,+BAAAI,MAAA,CAA+BX,QAAQ,CAACN,GAAG,QAAAiB,MAAA,CAAKX,QAAQ,CAACY,MAAM,QAAK;EAC/E,IAAI;IACF,MAAMI,WAAW,GAAGhB,QAAQ,CAACT,OAAO,CAAC0B,GAAG,CAAC,cAAc,CAAC;IACxD,IAAIC,IAAI,GAAGlB,QAAQ,CAACa,UAAU;IAC9B,IAAIG,WAAW,CAACG,QAAQ,CAAC,kBAAkB,CAAC,EAAE;MAC5CD,IAAI,QAAAP,MAAA,CAAQ,MAAMX,QAAQ,CAACkB,IAAI,EAAE,CAAE;IACrC;IACAX,OAAO,IAAIW,IAAI;IACfX,OAAO,GAAGA,OAAO,CAACO,MAAM,GAAG,EAAE,MAAAH,MAAA,CAAMJ,OAAO,CAACQ,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,WAAQR,OAAO;EACxE,CAAC,CAAC,OAAOa,KAAK,EAAE,CAEhB;EACA,OAAOb,OAAO;AAChB;AAEA,eAAeV,iBAAiBA,CAACP,QAAQ,EAA0B;EACjE,MAAM+B,mBAAmB,GAAG,CAAC;EAC7B,IAAI,OAAO/B,QAAQ,KAAK,QAAQ,EAAE;IAChC,gBAAAqB,MAAA,CAAgBrB,QAAQ,CAACyB,KAAK,CAAC,CAAC,EAAEM,mBAAmB,CAAC;EACxD;EACA,IAAI/B,QAAQ,YAAYgC,IAAI,EAAE;IAC5B,MAAMC,SAAS,GAAGjC,QAAQ,CAACyB,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;IACtC,OAAO,MAAM,IAAIS,OAAO,CAAEC,OAAO,IAAK;MACpC,MAAMC,MAAM,GAAG,IAAIC,UAAU,EAAE;MAC/BD,MAAM,CAACE,MAAM,GAAIC,KAAK;QAAA,IAAAC,aAAA;QAAA,OAAKL,OAAO,CAACI,KAAK,aAALA,KAAK,wBAAAC,aAAA,GAALD,KAAK,CAAEE,MAAM,cAAAD,aAAA,uBAAbA,aAAA,CAAeE,MAAM,CAAW;MAAA;MACnEN,MAAM,CAACO,aAAa,CAACV,SAAS,CAAC;IACjC,CAAC,CAAC;EACJ;EACA,IAAIjC,QAAQ,YAAY4C,WAAW,EAAE;IACnC,MAAMnB,KAAK,GAAGzB,QAAQ,CAACyB,KAAK,CAAC,CAAC,EAAEM,mBAAmB,CAAC;IACpD,MAAMc,MAAM,GAAGC,mBAAmB,CAACrB,KAAK,CAAC;IACzC,sBAAAJ,MAAA,CAAsBwB,MAAM;EAC9B;EACA,OAAO,IAAI;AACb;AAGA,SAASC,mBAAmBA,CAACC,MAAM,EAAE;EACnC,IAAIC,MAAM,GAAG,EAAE;EACf,MAAMC,KAAK,GAAG,IAAIC,UAAU,CAACH,MAAM,CAAC;EACpC,KAAK,IAAII,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGF,KAAK,CAACG,UAAU,EAAED,CAAC,EAAE,EAAE;IACzCH,MAAM,IAAI7C,MAAM,CAACkD,YAAY,CAACJ,KAAK,CAACE,CAAC,CAAC,CAAC;EACzC;EACA,OAAOG,IAAI,CAACN,MAAM,CAAC;AACrB"}
@@ -1,5 +1,4 @@
1
-
2
- const VERSION = typeof "3.4.0-alpha.1" !== 'undefined' ? "3.4.0-alpha.1" : 'latest';
1
+ const VERSION = typeof "3.4.0-alpha.3" !== 'undefined' ? "3.4.0-alpha.3" : 'latest';
3
2
  export const NullWorkerLoader = {
4
3
  name: 'Null loader',
5
4
  id: 'null',
@@ -13,7 +12,6 @@ export const NullWorkerLoader = {
13
12
  null: {}
14
13
  }
15
14
  };
16
-
17
15
  function parseSync(arrayBuffer, options, context) {
18
16
  if (!options.null.echoParameters) return null;
19
17
  context = context && JSON.parse(JSON.stringify(context));
@@ -23,7 +21,6 @@ function parseSync(arrayBuffer, options, context) {
23
21
  context
24
22
  };
25
23
  }
26
-
27
24
  export const NullLoader = {
28
25
  name: 'Null loader',
29
26
  id: 'null',
@@ -1 +1 @@
1
- {"version":3,"file":"null-loader.js","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"],"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 {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"],"mappings":";AAEA,MAAMA,OAAO,GAAG,sBAAkB,KAAK,WAAW,qBAAiB,QAAQ;AAO3E,OAAO,MAAMC,gBAAwB,GAAG;EACtCC,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;;AAMD,SAASC,SAAS,CAACC,WAAW,EAAEH,OAAO,EAAEI,OAAO,EAAE;EAChD,IAAI,CAACJ,OAAO,CAACC,IAAI,CAACI,cAAc,EAAE,OAAO,IAAI;EAC7CD,OAAO,GAAGA,OAAO,IAAIE,IAAI,CAACC,KAAK,CAACD,IAAI,CAACE,SAAS,CAACJ,OAAO,CAAC,CAAC;EACxD,OAAO;IAACD,WAAW;IAAEH,OAAO;IAAEI;EAAO,CAAC;AACxC;;AAKA,OAAO,MAAMK,UAA4B,GAAG;EAC1CjB,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;EACpBS,KAAK,EAAE,OAAOJ,WAAW,EAAEH,OAAO,EAAEI,OAAO,KAAKF,SAAS,CAACC,WAAW,EAAEH,OAAO,EAAEI,OAAO,CAAC;EACxFF,SAAS;EACTQ,cAAc,EAAE,gBAAgBC,SAAS,CAACC,aAAa,EAAEZ,OAAO,EAAEI,OAAO,EAAE;IACzE,WAAW,MAAMS,KAAK,IAAID,aAAa,EAAE;MACvC,MAAMV,SAAS,CAACW,KAAK,EAAEb,OAAO,EAAEI,OAAO,CAAC;IAC1C;EACF,CAAC;EACDL,KAAK,EAAE,CAAC,MAAM,KAAK,CAAC;EACpBC,OAAO,EAAE;IACPC,IAAI,EAAE;MACJI,cAAc,EAAE;IAClB;EACF;AACF,CAAC"}
1
+ {"version":3,"file":"null-loader.js","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"],"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 {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"],"mappings":"AAEA,MAAMA,OAAO,GAAG,sBAAkB,KAAK,WAAW,qBAAiB,QAAQ;AAO3E,OAAO,MAAMC,gBAAwB,GAAG;EACtCC,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;AAMD,SAASC,SAASA,CAACC,WAAW,EAAEH,OAAO,EAAEI,OAAO,EAAE;EAChD,IAAI,CAACJ,OAAO,CAACC,IAAI,CAACI,cAAc,EAAE,OAAO,IAAI;EAC7CD,OAAO,GAAGA,OAAO,IAAIE,IAAI,CAACC,KAAK,CAACD,IAAI,CAACE,SAAS,CAACJ,OAAO,CAAC,CAAC;EACxD,OAAO;IAACD,WAAW;IAAEH,OAAO;IAAEI;EAAO,CAAC;AACxC;AAKA,OAAO,MAAMK,UAA4B,GAAG;EAC1CjB,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;EACpBS,KAAK,EAAE,MAAAA,CAAOJ,WAAW,EAAEH,OAAO,EAAEI,OAAO,KAAKF,SAAS,CAACC,WAAW,EAAEH,OAAO,EAAEI,OAAO,CAAC;EACxFF,SAAS;EACTQ,cAAc,EAAE,gBAAgBC,SAASA,CAACC,aAAa,EAAEZ,OAAO,EAAEI,OAAO,EAAE;IACzE,WAAW,MAAMS,KAAK,IAAID,aAAa,EAAE;MACvC,MAAMV,SAAS,CAACW,KAAK,EAAEb,OAAO,EAAEI,OAAO,CAAC;IAC1C;EACF,CAAC;EACDL,KAAK,EAAE,CAAC,MAAM,KAAK,CAAC;EACpBC,OAAO,EAAE;IACPC,IAAI,EAAE;MACJI,cAAc,EAAE;IAClB;EACF;AACF,CAAC"}
@@ -1,6 +1,11 @@
1
1
  /// <reference types="node" />
2
- import { Readable, ReadableOptions } from 'stream';
2
+ import type { ReadableOptions } from 'stream';
3
+ import * as Stream from 'stream';
4
+ declare class _Readable {
5
+ }
6
+ type ReadableType = Stream.Readable | _Readable;
3
7
  export type MakeStreamOptions = ReadableOptions;
4
8
  /** Builds a node stream from an iterator */
5
- export declare function makeStream<ArrayBuffer>(source: Iterable<ArrayBuffer> | AsyncIterable<ArrayBuffer>, options?: ReadableOptions): Readable;
9
+ export declare function makeStream<ArrayBuffer>(source: Iterable<ArrayBuffer> | AsyncIterable<ArrayBuffer>, options?: ReadableOptions): ReadableType;
10
+ export {};
6
11
  //# sourceMappingURL=make-node-stream.d.ts.map
@@ -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,EAAC,QAAQ,EAAE,eAAe,EAAC,MAAM,QAAQ,CAAC;AAEjD,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,QAAQ,CAKV"}
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,7 +1,33 @@
1
1
  "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __importStar = (this && this.__importStar) || function (mod) {
19
+ if (mod && mod.__esModule) return mod;
20
+ var result = {};
21
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
+ __setModuleDefault(result, mod);
23
+ return result;
24
+ };
2
25
  Object.defineProperty(exports, "__esModule", { value: true });
3
26
  exports.makeStream = void 0;
4
- const stream_1 = require("stream");
27
+ const Stream = __importStar(require("stream"));
28
+ class _Readable {
29
+ }
30
+ const Readable = Stream.Readable || _Readable;
5
31
  /** Builds a node stream from an iterator */
6
32
  function makeStream(source, options) {
7
33
  const iterator = source[Symbol.asyncIterator]
@@ -10,7 +36,7 @@ function makeStream(source, options) {
10
36
  return new AsyncIterableReadable(iterator, options);
11
37
  }
12
38
  exports.makeStream = makeStream;
13
- class AsyncIterableReadable extends stream_1.Readable {
39
+ class AsyncIterableReadable extends Readable {
14
40
  constructor(it, options) {
15
41
  super(options);
16
42
  this._iterator = it;
@@ -1,23 +1,23 @@
1
- import { Writer, LoaderOptions } from '@loaders.gl/loader-utils';
1
+ import { Writer, WriterOptions } from '@loaders.gl/loader-utils';
2
2
  /**
3
3
  * Encode loaded data into a binary ArrayBuffer using the specified Writer.
4
4
  */
5
- export declare function encode(data: any, writer: Writer, options?: LoaderOptions): Promise<ArrayBuffer>;
5
+ export declare function encode(data: any, writer: Writer, options?: WriterOptions): Promise<ArrayBuffer>;
6
6
  /**
7
7
  * Encode loaded data into a binary ArrayBuffer using the specified Writer.
8
8
  */
9
- export declare function encodeSync(data: any, writer: Writer, options?: LoaderOptions): ArrayBuffer;
9
+ export declare function encodeSync(data: any, writer: Writer, options?: WriterOptions): ArrayBuffer;
10
10
  /**
11
11
  * Encode loaded data to text using the specified Writer
12
12
  * @note This is a convenience function not intended for production use on large input data.
13
13
  * It is not optimized for performance. Data maybe converted from text to binary and back.
14
14
  * @throws if the writer does not generate text output
15
15
  */
16
- export declare function encodeText(data: any, writer: Writer, options?: LoaderOptions): Promise<string>;
16
+ export declare function encodeText(data: any, writer: Writer, options?: WriterOptions): Promise<string>;
17
17
  /**
18
18
  * Encode loaded data into a sequence (iterator) of binary ArrayBuffers using the specified Writer.
19
19
  */
20
- export declare function encodeInBatches(data: any, writer: Writer, options?: LoaderOptions): AsyncIterable<ArrayBuffer>;
20
+ export declare function encodeInBatches(data: any, writer: Writer, options?: WriterOptions): AsyncIterable<ArrayBuffer>;
21
21
  /**
22
22
  * Encode data stored in a file (on disk) to another file.
23
23
  * @note Node.js only. This function enables using command-line converters as "writers".
@@ -1 +1 @@
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"}
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,CAsDtB;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"}
@@ -13,6 +13,7 @@ const loader_options_1 = require("./loader-options");
13
13
  */
14
14
  async function encode(data, writer, options) {
15
15
  const globalOptions = (0, loader_options_1.getLoaderOptions)();
16
+ // const globalOptions: WriterOptions = {}; // getWriterOptions();
16
17
  options = { ...globalOptions, ...options };
17
18
  if ((0, loader_utils_1.canEncodeWithWorker)(writer, options)) {
18
19
  return await (0, worker_utils_1.processOnWorker)(writer, data, options);
@@ -2,7 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.loadInBatches = void 0;
4
4
  const normalize_loader_1 = require("../loader-utils/normalize-loader");
5
- const option_utils_1 = require("../loader-utils/option-utils");
5
+ const get_fetch_function_1 = require("../loader-utils/get-fetch-function");
6
6
  const parse_in_batches_1 = require("./parse-in-batches");
7
7
  function loadInBatches(files, loaders, options, context) {
8
8
  // Signature: load(url, options)
@@ -12,7 +12,7 @@ function loadInBatches(files, loaders, options, context) {
12
12
  loaders = null;
13
13
  }
14
14
  // Select fetch function
15
- const fetch = (0, option_utils_1.getFetchFunction)(options || {});
15
+ const fetch = (0, get_fetch_function_1.getFetchFunction)(options || {});
16
16
  // Single url/file
17
17
  if (!Array.isArray(files)) {
18
18
  return loadOneFileInBatches(files, loaders, options, fetch);
@@ -1 +1 @@
1
- {"version":3,"file":"load.d.ts","sourceRoot":"","sources":["../../../src/lib/api/load.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAO7F;;;;;;;;GAQG;AAEH,wBAAsB,IAAI,CACxB,GAAG,EAAE,MAAM,GAAG,QAAQ,EACtB,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,aAAa,EAC3C,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,GAAG,CAAC,CA0Bd"}
1
+ {"version":3,"file":"load.d.ts","sourceRoot":"","sources":["../../../src/lib/api/load.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAO7F;;;;;;;;GAQG;AAEH,wBAAsB,IAAI,CACxB,GAAG,EAAE,MAAM,GAAG,QAAQ,EACtB,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,aAAa,EAC3C,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,GAAG,CAAC,CA2Bd"}
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.load = void 0;
4
4
  const is_type_1 = require("../../javascript-utils/is-type");
5
5
  const normalize_loader_1 = require("../loader-utils/normalize-loader");
6
- const option_utils_1 = require("../loader-utils/option-utils");
6
+ const get_fetch_function_1 = require("../loader-utils/get-fetch-function");
7
7
  const parse_1 = require("./parse");
8
8
  /**
9
9
  * Parses `data` using a specified loader
@@ -23,7 +23,7 @@ async function load(url, loaders, options, context) {
23
23
  loaders = undefined;
24
24
  }
25
25
  // Select fetch function
26
- const fetch = (0, option_utils_1.getFetchFunction)(options);
26
+ const fetch = (0, get_fetch_function_1.getFetchFunction)(options);
27
27
  // at this point, `url` could be already loaded binary data
28
28
  let data = url;
29
29
  // url is a string, fetch the url
@@ -33,6 +33,7 @@ async function load(url, loaders, options, context) {
33
33
  }
34
34
  if ((0, is_type_1.isBlob)(url)) {
35
35
  // The fetch response object will contain blob.name
36
+ // @ts-expect-error TODO - This may not work for overridden fetch functions
36
37
  data = await fetch(url);
37
38
  }
38
39
  // Data is loaded (at least we have a `Response` object) so time to hand over to `parse`
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.fetchFile = void 0;
4
4
  const loader_utils_1 = require("@loaders.gl/loader-utils");
5
5
  const response_utils_1 = require("../utils/response-utils");
6
- // import {getErrorMessageFromResponse} from './fetch-error-message';
6
+ // import {getErrorMessageFromResponse} from './fetch-error-message.js';
7
7
  /**
8
8
  * fetch compatible function
9
9
  * Reads file data from:
@@ -0,0 +1,9 @@
1
+ import type { LoaderContext, LoaderOptions } from '@loaders.gl/loader-utils';
2
+ import { fetchFile } from '../fetch/fetch-file';
3
+ /**
4
+ * Gets the current fetch function from options and context
5
+ * @param options
6
+ * @param context
7
+ */
8
+ export declare function getFetchFunction(options?: LoaderOptions, context?: Omit<LoaderContext, 'fetch'> & Partial<Pick<LoaderContext, 'fetch'>>): ((url: string, options?: RequestInit | undefined) => Promise<Response>) | typeof fetchFile;
9
+ //# sourceMappingURL=get-fetch-function.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"get-fetch-function.d.ts","sourceRoot":"","sources":["../../../src/lib/loader-utils/get-fetch-function.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,aAAa,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAE3E,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAG9C;;;;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,8FAuB/E"}
@@ -0,0 +1,31 @@
1
+ "use strict";
2
+ // loaders.gl, MIT license
3
+ Object.defineProperty(exports, "__esModule", { value: true });
4
+ exports.getFetchFunction = void 0;
5
+ const is_type_1 = require("../../javascript-utils/is-type");
6
+ const fetch_file_1 = require("../fetch/fetch-file");
7
+ const option_utils_1 = require("./option-utils");
8
+ /**
9
+ * Gets the current fetch function from options and context
10
+ * @param options
11
+ * @param context
12
+ */
13
+ function getFetchFunction(options, context) {
14
+ const globalOptions = (0, option_utils_1.getGlobalLoaderOptions)();
15
+ const fetchOptions = options || globalOptions;
16
+ // options.fetch can be a function
17
+ if (typeof fetchOptions.fetch === 'function') {
18
+ return fetchOptions.fetch;
19
+ }
20
+ // options.fetch can be an options object
21
+ if ((0, is_type_1.isObject)(fetchOptions.fetch)) {
22
+ return (url) => (0, fetch_file_1.fetchFile)(url, fetchOptions);
23
+ }
24
+ // else refer to context (from parent loader) if available
25
+ if (context?.fetch) {
26
+ return context?.fetch;
27
+ }
28
+ // else return the default fetch function
29
+ return fetch_file_1.fetchFile;
30
+ }
31
+ exports.getFetchFunction = getFetchFunction;