@loaders.gl/core 4.0.0-alpha.6 → 4.0.0-alpha.8

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 (72) hide show
  1. package/dist/dist.min.js +97 -65
  2. package/dist/es5/lib/api/load.js.map +1 -1
  3. package/dist/es5/lib/api/parse-in-batches.js +15 -14
  4. package/dist/es5/lib/api/parse-in-batches.js.map +1 -1
  5. package/dist/es5/lib/api/parse-sync.js +3 -4
  6. package/dist/es5/lib/api/parse-sync.js.map +1 -1
  7. package/dist/es5/lib/api/parse.js +3 -3
  8. package/dist/es5/lib/api/parse.js.map +1 -1
  9. package/dist/es5/lib/api/select-loader.js +6 -7
  10. package/dist/es5/lib/api/select-loader.js.map +1 -1
  11. package/dist/es5/lib/init.js +1 -1
  12. package/dist/es5/lib/loader-utils/loader-context.js +16 -8
  13. package/dist/es5/lib/loader-utils/loader-context.js.map +1 -1
  14. package/dist/es5/lib/utils/resource-utils.js +31 -27
  15. package/dist/es5/lib/utils/resource-utils.js.map +1 -1
  16. package/dist/es5/lib/utils/response-utils.js +6 -5
  17. package/dist/es5/lib/utils/response-utils.js.map +1 -1
  18. package/dist/es5/lib/utils/url-utils.js +16 -0
  19. package/dist/es5/lib/utils/url-utils.js.map +1 -0
  20. package/dist/es5/null-loader.js +1 -1
  21. package/dist/esm/lib/api/load.js.map +1 -1
  22. package/dist/esm/lib/api/parse-in-batches.js +6 -7
  23. package/dist/esm/lib/api/parse-in-batches.js.map +1 -1
  24. package/dist/esm/lib/api/parse-sync.js +4 -6
  25. package/dist/esm/lib/api/parse-sync.js.map +1 -1
  26. package/dist/esm/lib/api/parse.js +3 -5
  27. package/dist/esm/lib/api/parse.js.map +1 -1
  28. package/dist/esm/lib/api/select-loader.js +7 -10
  29. package/dist/esm/lib/api/select-loader.js.map +1 -1
  30. package/dist/esm/lib/init.js +1 -1
  31. package/dist/esm/lib/loader-utils/loader-context.js +16 -8
  32. package/dist/esm/lib/loader-utils/loader-context.js.map +1 -1
  33. package/dist/esm/lib/utils/resource-utils.js +29 -26
  34. package/dist/esm/lib/utils/resource-utils.js.map +1 -1
  35. package/dist/esm/lib/utils/response-utils.js +3 -5
  36. package/dist/esm/lib/utils/response-utils.js.map +1 -1
  37. package/dist/esm/lib/utils/url-utils.js +9 -0
  38. package/dist/esm/lib/utils/url-utils.js.map +1 -0
  39. package/dist/esm/null-loader.js +1 -1
  40. package/dist/lib/api/load.d.ts +2 -1
  41. package/dist/lib/api/load.d.ts.map +1 -1
  42. package/dist/lib/api/parse-in-batches.d.ts.map +1 -1
  43. package/dist/lib/api/parse-in-batches.js +4 -7
  44. package/dist/lib/api/parse-sync.d.ts.map +1 -1
  45. package/dist/lib/api/parse-sync.js +3 -3
  46. package/dist/lib/api/parse.js +2 -2
  47. package/dist/lib/api/select-loader.d.ts.map +1 -1
  48. package/dist/lib/api/select-loader.js +6 -3
  49. package/dist/lib/fetch/fetch-file.js +1 -1
  50. package/dist/lib/loader-utils/loader-context.d.ts +1 -1
  51. package/dist/lib/loader-utils/loader-context.d.ts.map +1 -1
  52. package/dist/lib/loader-utils/loader-context.js +17 -7
  53. package/dist/lib/utils/resource-utils.d.ts +17 -8
  54. package/dist/lib/utils/resource-utils.d.ts.map +1 -1
  55. package/dist/lib/utils/resource-utils.js +46 -34
  56. package/dist/lib/utils/response-utils.d.ts.map +1 -1
  57. package/dist/lib/utils/response-utils.js +2 -1
  58. package/dist/lib/utils/url-utils.d.ts +3 -0
  59. package/dist/lib/utils/url-utils.d.ts.map +1 -0
  60. package/dist/lib/utils/url-utils.js +14 -0
  61. package/dist/null-worker-node.js +234 -0
  62. package/dist/null-worker.js +1 -1
  63. package/package.json +7 -6
  64. package/src/lib/api/load.ts +1 -1
  65. package/src/lib/api/parse-in-batches.ts +8 -9
  66. package/src/lib/api/parse-sync.ts +8 -4
  67. package/src/lib/api/parse.ts +3 -3
  68. package/src/lib/api/select-loader.ts +7 -4
  69. package/src/lib/loader-utils/loader-context.ts +19 -8
  70. package/src/lib/utils/resource-utils.ts +54 -34
  71. package/src/lib/utils/response-utils.ts +3 -2
  72. package/src/lib/utils/url-utils.ts +12 -0
@@ -3,11 +3,12 @@ import { isLoaderObject } from '../loader-utils/normalize-loader';
3
3
  import { normalizeOptions } from '../loader-utils/option-utils';
4
4
  import { getLoaderContext } from '../loader-utils/loader-context';
5
5
  import { getAsyncIterableFromData } from '../loader-utils/get-data';
6
- import { getResourceUrlAndType } from '../utils/resource-utils';
6
+ import { getResourceUrl } from '../utils/resource-utils';
7
7
  import { selectLoader } from './select-loader';
8
8
  import { parse } from './parse';
9
9
  export async function parseInBatches(data, loaders, options, context) {
10
10
  assert(!context || typeof context === 'object');
11
+ const loaderArray = Array.isArray(loaders) ? loaders : undefined;
11
12
  if (!Array.isArray(loaders) && !isLoaderObject(loaders)) {
12
13
  context = undefined;
13
14
  options = loaders;
@@ -15,20 +16,18 @@ export async function parseInBatches(data, loaders, options, context) {
15
16
  }
16
17
  data = await data;
17
18
  options = options || {};
18
- const {
19
- url
20
- } = getResourceUrlAndType(data);
19
+ const url = getResourceUrl(data);
21
20
  const loader = await selectLoader(data, loaders, options);
22
21
  if (!loader) {
23
22
  return null;
24
23
  }
25
- options = normalizeOptions(options, loader, loaders, url);
24
+ options = normalizeOptions(options, loader, loaderArray, url);
26
25
  context = getLoaderContext({
27
26
  url,
28
27
  parseInBatches,
29
28
  parse,
30
- loaders: loaders
31
- }, options, context);
29
+ loaders: loaderArray
30
+ }, options, context || null);
32
31
  return await parseWithLoaderInBatches(loader, data, options, context);
33
32
  }
34
33
  async function parseWithLoaderInBatches(loader, data, options, context) {
@@ -1 +1 @@
1
- {"version":3,"file":"parse-in-batches.js","names":["assert","concatenateArrayBuffersAsync","isLoaderObject","normalizeOptions","getLoaderContext","getAsyncIterableFromData","getResourceUrlAndType","selectLoader","parse","parseInBatches","data","loaders","options","context","Array","isArray","undefined","url","loader","parseWithLoaderInBatches","outputIterator","parseToOutputIterator","metadata","metadataBatch","batchType","_loader","_context","bytesUsed","makeMetadataBatchIterator","iterator","inputIterator","transformedIterator","applyInputTransforms","transforms","parseChunkInBatches","arrayBuffer","parsedData","mimeType","mimeTypes","batch","shape","length","arguments","iteratorChain","transformBatches"],"sources":["../../../../src/lib/api/parse-in-batches.ts"],"sourcesContent":["import type {Batch} from '@loaders.gl/schema';\nimport type {\n BatchableDataType,\n Loader,\n LoaderWithParser,\n LoaderContext,\n LoaderOptions\n} from '@loaders.gl/loader-utils';\nimport {assert, concatenateArrayBuffersAsync} from '@loaders.gl/loader-utils';\nimport {isLoaderObject} from '../loader-utils/normalize-loader';\nimport {normalizeOptions} from '../loader-utils/option-utils';\nimport {getLoaderContext} from '../loader-utils/loader-context';\nimport {getAsyncIterableFromData} from '../loader-utils/get-data';\nimport {getResourceUrlAndType} from '../utils/resource-utils';\nimport {selectLoader} from './select-loader';\n\n// Ensure `parse` is available in context if loader falls back to `parse`\nimport {parse} from './parse';\n\n/**\n * Parses `data` using a specified loader\n * @param data\n * @param loaders\n * @param options\n * @param context\n */\nexport async function parseInBatches(\n data: BatchableDataType,\n loaders?: Loader | Loader[] | LoaderOptions,\n options?: LoaderOptions,\n context?: LoaderContext\n): Promise<AsyncIterable<any>> {\n assert(!context || typeof context === 'object'); // parseInBatches no longer accepts final url\n\n // Signature: parseInBatches(data, options, url) - Uses registered loaders\n if (!Array.isArray(loaders) && !isLoaderObject(loaders)) {\n context = undefined; // context not supported in short signature\n options = loaders as LoaderOptions;\n loaders = undefined;\n }\n\n data = await data; // Resolve any promise\n options = options || {};\n\n // Extract a url for auto detection\n const {url} = getResourceUrlAndType(data);\n\n // Chooses a loader and normalizes it\n // Note - only uses URL and contentType for streams and iterator inputs\n const loader = await selectLoader(data as ArrayBuffer, loaders as Loader[], options);\n // Note: if options.nothrow was set, it is possible that no loader was found, if so just return null\n if (!loader) {\n // @ts-ignore\n return null;\n }\n\n // Normalize options\n // @ts-ignore\n options = normalizeOptions(options, loader, loaders, url);\n // @ts-ignore\n context = getLoaderContext(\n // @ts-ignore\n {url, parseInBatches, parse, loaders: loaders as Loader[]},\n options,\n context\n );\n\n return await parseWithLoaderInBatches(loader as LoaderWithParser, data, options, context);\n}\n\n/**\n * Loader has been selected and context has been prepared, see if we need to emit a metadata batch\n */\nasync function parseWithLoaderInBatches(\n loader: LoaderWithParser,\n data: BatchableDataType,\n options: LoaderOptions,\n context: LoaderContext\n): Promise<AsyncIterable<any>> {\n const outputIterator = await parseToOutputIterator(loader, data, options, context);\n\n // Generate metadata batch if requested\n if (!options.metadata) {\n return outputIterator;\n }\n\n const metadataBatch = {\n batchType: 'metadata',\n metadata: {\n _loader: loader,\n _context: context\n },\n // Populate with some default fields to avoid crashing\n data: [],\n bytesUsed: 0\n };\n\n async function* makeMetadataBatchIterator(iterator) {\n yield metadataBatch;\n yield* iterator;\n }\n\n return makeMetadataBatchIterator(outputIterator);\n}\n\n/**\n * Prep work is done, now it is time to start parsing into an output operator\n * The approach depends on which parse function the loader exposes\n * `parseInBatches` (preferred), `parse` (fallback)\n */\nasync function parseToOutputIterator(\n loader: LoaderWithParser,\n data: BatchableDataType,\n options: LoaderOptions,\n context: LoaderContext\n): Promise<AsyncIterable<any>> {\n // Get an iterator from the input\n const inputIterator = await getAsyncIterableFromData(data, options);\n\n // Apply any iterator transforms (options.transforms)\n const transformedIterator = await applyInputTransforms(inputIterator, options?.transforms || []);\n\n // If loader supports parseInBatches, we are done\n if (loader.parseInBatches) {\n return loader.parseInBatches(transformedIterator, options, context);\n }\n\n // Fallback: load atomically using `parse` concatenating input iterator into single chunk\n async function* parseChunkInBatches() {\n const arrayBuffer = await concatenateArrayBuffersAsync(transformedIterator);\n // Call `parse` instead of `loader.parse` to ensure we can call workers etc.\n const parsedData = await parse(\n arrayBuffer,\n loader,\n // TODO - Hack: supply loaders MIME type to ensure we match it\n {...options, mimeType: loader.mimeTypes[0]},\n context\n );\n // yield a single batch, the output from loader.parse()\n // TODO - run through batch builder to apply options etc...\n const batch: Batch = {\n mimeType: loader.mimeTypes[0],\n shape: Array.isArray(parsedData) ? 'row-table' : 'unknown',\n batchType: 'data',\n data: parsedData,\n length: Array.isArray(parsedData) ? parsedData.length : 1\n };\n yield batch;\n }\n\n return parseChunkInBatches();\n}\n\ntype TransformBatches = (\n asyncIterator: AsyncIterable<ArrayBuffer> | Iterable<ArrayBuffer>\n) => AsyncIterable<ArrayBuffer>;\n\n/**\n * Create an iterator chain with any transform iterators (crypto, decompression)\n * @param inputIterator\n * @param options\n */\nasync function applyInputTransforms(\n inputIterator: AsyncIterable<ArrayBuffer> | Iterable<ArrayBuffer>,\n transforms: TransformBatches[] = []\n): Promise<AsyncIterable<ArrayBuffer> | Iterable<ArrayBuffer>> {\n let iteratorChain = inputIterator;\n for await (const transformBatches of transforms) {\n iteratorChain = transformBatches(iteratorChain);\n }\n return iteratorChain;\n}\n"],"mappings":"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"}
1
+ {"version":3,"file":"parse-in-batches.js","names":["assert","concatenateArrayBuffersAsync","isLoaderObject","normalizeOptions","getLoaderContext","getAsyncIterableFromData","getResourceUrl","selectLoader","parse","parseInBatches","data","loaders","options","context","loaderArray","Array","isArray","undefined","url","loader","parseWithLoaderInBatches","outputIterator","parseToOutputIterator","metadata","metadataBatch","batchType","_loader","_context","bytesUsed","makeMetadataBatchIterator","iterator","inputIterator","transformedIterator","applyInputTransforms","transforms","parseChunkInBatches","arrayBuffer","parsedData","mimeType","mimeTypes","batch","shape","length","arguments","iteratorChain","transformBatches"],"sources":["../../../../src/lib/api/parse-in-batches.ts"],"sourcesContent":["import type {Batch} from '@loaders.gl/schema';\nimport type {\n BatchableDataType,\n Loader,\n LoaderWithParser,\n LoaderContext,\n LoaderOptions\n} from '@loaders.gl/loader-utils';\nimport {assert, concatenateArrayBuffersAsync} from '@loaders.gl/loader-utils';\nimport {isLoaderObject} from '../loader-utils/normalize-loader';\nimport {normalizeOptions} from '../loader-utils/option-utils';\nimport {getLoaderContext} from '../loader-utils/loader-context';\nimport {getAsyncIterableFromData} from '../loader-utils/get-data';\nimport {getResourceUrl} from '../utils/resource-utils';\nimport {selectLoader} from './select-loader';\n\n// Ensure `parse` is available in context if loader falls back to `parse`\nimport {parse} from './parse';\n\n/**\n * Parses `data` using a specified loader\n * @param data\n * @param loaders\n * @param options\n * @param context\n */\nexport async function parseInBatches(\n data: BatchableDataType,\n loaders?: Loader | Loader[] | LoaderOptions,\n options?: LoaderOptions,\n context?: LoaderContext\n): Promise<AsyncIterable<any>> {\n assert(!context || typeof context === 'object'); // parseInBatches no longer accepts final url\n\n const loaderArray = Array.isArray(loaders) ? loaders : undefined;\n\n // Signature: parseInBatches(data, options, url) - Uses registered loaders\n if (!Array.isArray(loaders) && !isLoaderObject(loaders)) {\n context = undefined; // context not supported in short signature\n options = loaders as LoaderOptions;\n loaders = undefined;\n }\n\n data = await data; // Resolve any promise\n options = options || {};\n\n // Extract a url for auto detection\n const url = getResourceUrl(data);\n\n // Chooses a loader and normalizes it\n // Note - only uses URL and contentType for streams and iterator inputs\n const loader = await selectLoader(data as ArrayBuffer, loaders as Loader | Loader[], options);\n // Note: if options.nothrow was set, it is possible that no loader was found, if so just return null\n if (!loader) {\n // @ts-ignore\n return null;\n }\n\n // Normalize options\n options = normalizeOptions(options, loader, loaderArray, url);\n context = getLoaderContext(\n {url, parseInBatches, parse, loaders: loaderArray},\n options,\n context || null\n );\n\n return await parseWithLoaderInBatches(loader as LoaderWithParser, data, options, context);\n}\n\n/**\n * Loader has been selected and context has been prepared, see if we need to emit a metadata batch\n */\nasync function parseWithLoaderInBatches(\n loader: LoaderWithParser,\n data: BatchableDataType,\n options: LoaderOptions,\n context: LoaderContext\n): Promise<AsyncIterable<any>> {\n const outputIterator = await parseToOutputIterator(loader, data, options, context);\n\n // Generate metadata batch if requested\n if (!options.metadata) {\n return outputIterator;\n }\n\n const metadataBatch = {\n batchType: 'metadata',\n metadata: {\n _loader: loader,\n _context: context\n },\n // Populate with some default fields to avoid crashing\n data: [],\n bytesUsed: 0\n };\n\n async function* makeMetadataBatchIterator(iterator) {\n yield metadataBatch;\n yield* iterator;\n }\n\n return makeMetadataBatchIterator(outputIterator);\n}\n\n/**\n * Prep work is done, now it is time to start parsing into an output operator\n * The approach depends on which parse function the loader exposes\n * `parseInBatches` (preferred), `parse` (fallback)\n */\nasync function parseToOutputIterator(\n loader: LoaderWithParser,\n data: BatchableDataType,\n options: LoaderOptions,\n context: LoaderContext\n): Promise<AsyncIterable<any>> {\n // Get an iterator from the input\n const inputIterator = await getAsyncIterableFromData(data, options);\n\n // Apply any iterator transforms (options.transforms)\n const transformedIterator = await applyInputTransforms(inputIterator, options?.transforms || []);\n\n // If loader supports parseInBatches, we are done\n if (loader.parseInBatches) {\n return loader.parseInBatches(transformedIterator, options, context);\n }\n\n // Fallback: load atomically using `parse` concatenating input iterator into single chunk\n async function* parseChunkInBatches() {\n const arrayBuffer = await concatenateArrayBuffersAsync(transformedIterator);\n // Call `parse` instead of `loader.parse` to ensure we can call workers etc.\n const parsedData = await parse(\n arrayBuffer,\n loader,\n // TODO - Hack: supply loaders MIME type to ensure we match it\n {...options, mimeType: loader.mimeTypes[0]},\n context\n );\n // yield a single batch, the output from loader.parse()\n // TODO - run through batch builder to apply options etc...\n const batch: Batch = {\n mimeType: loader.mimeTypes[0],\n shape: Array.isArray(parsedData) ? 'row-table' : 'unknown',\n batchType: 'data',\n data: parsedData,\n length: Array.isArray(parsedData) ? parsedData.length : 1\n };\n yield batch;\n }\n\n return parseChunkInBatches();\n}\n\ntype TransformBatches = (\n asyncIterator: AsyncIterable<ArrayBuffer> | Iterable<ArrayBuffer>\n) => AsyncIterable<ArrayBuffer>;\n\n/**\n * Create an iterator chain with any transform iterators (crypto, decompression)\n * @param inputIterator\n * @param options\n */\nasync function applyInputTransforms(\n inputIterator: AsyncIterable<ArrayBuffer> | Iterable<ArrayBuffer>,\n transforms: TransformBatches[] = []\n): Promise<AsyncIterable<ArrayBuffer> | Iterable<ArrayBuffer>> {\n let iteratorChain = inputIterator;\n for await (const transformBatches of transforms) {\n iteratorChain = transformBatches(iteratorChain);\n }\n return iteratorChain;\n}\n"],"mappings":"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"}
@@ -4,7 +4,7 @@ import { isLoaderObject } from '../loader-utils/normalize-loader';
4
4
  import { normalizeOptions } from '../loader-utils/option-utils';
5
5
  import { getArrayBufferOrStringFromDataSync } from '../loader-utils/get-data';
6
6
  import { getLoaderContext, getLoadersFromContext } from '../loader-utils/loader-context';
7
- import { getResourceUrlAndType } from '../utils/resource-utils';
7
+ import { getResourceUrl } from '../utils/resource-utils';
8
8
  export function parseSync(data, loaders, options, context) {
9
9
  assert(!context || typeof context === 'object');
10
10
  if (!Array.isArray(loaders) && !isLoaderObject(loaders)) {
@@ -20,18 +20,16 @@ export function parseSync(data, loaders, options, context) {
20
20
  return null;
21
21
  }
22
22
  options = normalizeOptions(options, loader, candidateLoaders);
23
- const {
24
- url
25
- } = getResourceUrlAndType(data);
23
+ const url = getResourceUrl(data);
26
24
  const parse = () => {
27
- throw new Error('parseSync called parse');
25
+ throw new Error('parseSync called parse (which is async');
28
26
  };
29
27
  context = getLoaderContext({
30
28
  url,
31
29
  parseSync,
32
30
  parse,
33
31
  loaders: loaders
34
- }, options);
32
+ }, options, context || null);
35
33
  return parseWithLoaderSync(loader, data, options, context);
36
34
  }
37
35
  function parseWithLoaderSync(loader, data, options, context) {
@@ -1 +1 @@
1
- {"version":3,"file":"parse-sync.js","names":["assert","selectLoaderSync","isLoaderObject","normalizeOptions","getArrayBufferOrStringFromDataSync","getLoaderContext","getLoadersFromContext","getResourceUrlAndType","parseSync","data","loaders","options","context","Array","isArray","undefined","typedLoaders","candidateLoaders","loader","url","parse","Error","parseWithLoaderSync","parseTextSync","ArrayBuffer","concat","name"],"sources":["../../../../src/lib/api/parse-sync.ts"],"sourcesContent":["import type {\n SyncDataType,\n Loader,\n LoaderWithParser,\n LoaderContext,\n LoaderOptions\n} from '@loaders.gl/loader-utils';\nimport {assert} from '@loaders.gl/loader-utils';\nimport {selectLoaderSync} from './select-loader';\nimport {isLoaderObject} from '../loader-utils/normalize-loader';\nimport {normalizeOptions} from '../loader-utils/option-utils';\nimport {getArrayBufferOrStringFromDataSync} from '../loader-utils/get-data';\nimport {getLoaderContext, getLoadersFromContext} from '../loader-utils/loader-context';\nimport {getResourceUrlAndType} from '../utils/resource-utils';\n\n/**\n * Parses `data` synchronously using a specified loader\n * @param data\n * @param loaders\n * @param options\n * @param context\n */\nexport function parseSync(\n data: SyncDataType,\n loaders?: Loader | Loader[] | LoaderOptions,\n options?: LoaderOptions,\n context?: LoaderContext\n): any {\n assert(!context || typeof context === 'object'); // parseSync no longer accepts final url\n\n // Signature: parseSync(data, options)\n // Uses registered loaders\n if (!Array.isArray(loaders) && !isLoaderObject(loaders)) {\n context = undefined; // context not supported in short signature\n options = loaders as LoaderOptions;\n loaders = undefined;\n }\n\n options = options || {};\n\n // Chooses a loader (and normalizes it)\n // Also use any loaders in the context, new loaders take priority\n const typedLoaders = loaders as Loader | Loader[] | undefined;\n const candidateLoaders = getLoadersFromContext(typedLoaders, context);\n const loader = selectLoaderSync(data, candidateLoaders, options);\n // Note: if nothrow option was set, it is possible that no loader was found, if so just return null\n if (!loader) {\n return null;\n }\n\n // Normalize options\n options = normalizeOptions(options, loader, candidateLoaders);\n\n // Extract a url for auto detection\n const {url} = getResourceUrlAndType(data);\n\n const parse = () => {\n throw new Error('parseSync called parse');\n };\n context = getLoaderContext({url, parseSync, parse, loaders: loaders as Loader[]}, options);\n\n return parseWithLoaderSync(loader as LoaderWithParser, data, options, context);\n}\n\n// TODO - should accept loader.parseSync/parse and generate 1 chunk asyncIterator\nfunction parseWithLoaderSync(\n loader: LoaderWithParser,\n data: SyncDataType,\n options: LoaderOptions,\n context: LoaderContext\n) {\n data = getArrayBufferOrStringFromDataSync(data, loader, options);\n\n if (loader.parseTextSync && typeof data === 'string') {\n return loader.parseTextSync(data, options); // , context, loader);\n }\n\n if (loader.parseSync && data instanceof ArrayBuffer) {\n return loader.parseSync(data, options, context); // , loader);\n }\n\n // TBD - If synchronous parser not available, return null\n throw new Error(\n `${loader.name} loader: 'parseSync' not supported by this loader, use 'parse' instead. ${\n context.url || ''\n }`\n );\n}\n"],"mappings":"AAOA,SAAQA,MAAM,QAAO,0BAA0B;AAC/C,SAAQC,gBAAgB,QAAO,iBAAiB;AAChD,SAAQC,cAAc,QAAO,kCAAkC;AAC/D,SAAQC,gBAAgB,QAAO,8BAA8B;AAC7D,SAAQC,kCAAkC,QAAO,0BAA0B;AAC3E,SAAQC,gBAAgB,EAAEC,qBAAqB,QAAO,gCAAgC;AACtF,SAAQC,qBAAqB,QAAO,yBAAyB;AAS7D,OAAO,SAASC,SAASA,CACvBC,IAAkB,EAClBC,OAA2C,EAC3CC,OAAuB,EACvBC,OAAuB,EAClB;EACLZ,MAAM,CAAC,CAACY,OAAO,IAAI,OAAOA,OAAO,KAAK,QAAQ,CAAC;EAI/C,IAAI,CAACC,KAAK,CAACC,OAAO,CAACJ,OAAO,CAAC,IAAI,CAACR,cAAc,CAACQ,OAAO,CAAC,EAAE;IACvDE,OAAO,GAAGG,SAAS;IACnBJ,OAAO,GAAGD,OAAwB;IAClCA,OAAO,GAAGK,SAAS;EACrB;EAEAJ,OAAO,GAAGA,OAAO,IAAI,CAAC,CAAC;EAIvB,MAAMK,YAAY,GAAGN,OAAwC;EAC7D,MAAMO,gBAAgB,GAAGX,qBAAqB,CAACU,YAAY,EAAEJ,OAAO,CAAC;EACrE,MAAMM,MAAM,GAAGjB,gBAAgB,CAACQ,IAAI,EAAEQ,gBAAgB,EAAEN,OAAO,CAAC;EAEhE,IAAI,CAACO,MAAM,EAAE;IACX,OAAO,IAAI;EACb;EAGAP,OAAO,GAAGR,gBAAgB,CAACQ,OAAO,EAAEO,MAAM,EAAED,gBAAgB,CAAC;EAG7D,MAAM;IAACE;EAAG,CAAC,GAAGZ,qBAAqB,CAACE,IAAI,CAAC;EAEzC,MAAMW,KAAK,GAAGA,CAAA,KAAM;IAClB,MAAM,IAAIC,KAAK,CAAC,wBAAwB,CAAC;EAC3C,CAAC;EACDT,OAAO,GAAGP,gBAAgB,CAAC;IAACc,GAAG;IAAEX,SAAS;IAAEY,KAAK;IAAEV,OAAO,EAAEA;EAAmB,CAAC,EAAEC,OAAO,CAAC;EAE1F,OAAOW,mBAAmB,CAACJ,MAAM,EAAsBT,IAAI,EAAEE,OAAO,EAAEC,OAAO,CAAC;AAChF;AAGA,SAASU,mBAAmBA,CAC1BJ,MAAwB,EACxBT,IAAkB,EAClBE,OAAsB,EACtBC,OAAsB,EACtB;EACAH,IAAI,GAAGL,kCAAkC,CAACK,IAAI,EAAES,MAAM,EAAEP,OAAO,CAAC;EAEhE,IAAIO,MAAM,CAACK,aAAa,IAAI,OAAOd,IAAI,KAAK,QAAQ,EAAE;IACpD,OAAOS,MAAM,CAACK,aAAa,CAACd,IAAI,EAAEE,OAAO,CAAC;EAC5C;EAEA,IAAIO,MAAM,CAACV,SAAS,IAAIC,IAAI,YAAYe,WAAW,EAAE;IACnD,OAAON,MAAM,CAACV,SAAS,CAACC,IAAI,EAAEE,OAAO,EAAEC,OAAO,CAAC;EACjD;EAGA,MAAM,IAAIS,KAAK,IAAAI,MAAA,CACVP,MAAM,CAACQ,IAAI,8EAAAD,MAAA,CACZb,OAAO,CAACO,GAAG,IAAI,EAAE,CAErB,CAAC;AACH"}
1
+ {"version":3,"file":"parse-sync.js","names":["assert","selectLoaderSync","isLoaderObject","normalizeOptions","getArrayBufferOrStringFromDataSync","getLoaderContext","getLoadersFromContext","getResourceUrl","parseSync","data","loaders","options","context","Array","isArray","undefined","typedLoaders","candidateLoaders","loader","url","parse","Error","parseWithLoaderSync","parseTextSync","ArrayBuffer","concat","name"],"sources":["../../../../src/lib/api/parse-sync.ts"],"sourcesContent":["import type {\n SyncDataType,\n Loader,\n LoaderWithParser,\n LoaderContext,\n LoaderOptions\n} from '@loaders.gl/loader-utils';\nimport {assert} from '@loaders.gl/loader-utils';\nimport {selectLoaderSync} from './select-loader';\nimport {isLoaderObject} from '../loader-utils/normalize-loader';\nimport {normalizeOptions} from '../loader-utils/option-utils';\nimport {getArrayBufferOrStringFromDataSync} from '../loader-utils/get-data';\nimport {getLoaderContext, getLoadersFromContext} from '../loader-utils/loader-context';\nimport {getResourceUrl} from '../utils/resource-utils';\n\n/**\n * Parses `data` synchronously using a specified loader\n * @param data\n * @param loaders\n * @param options\n * @param context\n */\nexport function parseSync(\n data: SyncDataType,\n loaders?: Loader | Loader[] | LoaderOptions,\n options?: LoaderOptions,\n context?: LoaderContext\n): any {\n assert(!context || typeof context === 'object'); // parseSync no longer accepts final url\n\n // Signature: parseSync(data, options)\n // Uses registered loaders\n if (!Array.isArray(loaders) && !isLoaderObject(loaders)) {\n context = undefined; // context not supported in short signature\n options = loaders as LoaderOptions;\n loaders = undefined;\n }\n\n options = options || {};\n\n // Chooses a loader (and normalizes it)\n // Also use any loaders in the context, new loaders take priority\n const typedLoaders = loaders as Loader | Loader[] | undefined;\n const candidateLoaders = getLoadersFromContext(typedLoaders, context);\n const loader = selectLoaderSync(data, candidateLoaders, options);\n // Note: if nothrow option was set, it is possible that no loader was found, if so just return null\n if (!loader) {\n return null;\n }\n\n // Normalize options\n options = normalizeOptions(options, loader, candidateLoaders);\n\n // Extract a url for auto detection\n const url = getResourceUrl(data);\n\n const parse = () => {\n throw new Error('parseSync called parse (which is async');\n };\n context = getLoaderContext(\n {url, parseSync, parse, loaders: loaders as Loader[]},\n options,\n context || null\n );\n\n return parseWithLoaderSync(loader as LoaderWithParser, data, options, context);\n}\n\n// TODO - should accept loader.parseSync/parse and generate 1 chunk asyncIterator\nfunction parseWithLoaderSync(\n loader: LoaderWithParser,\n data: SyncDataType,\n options: LoaderOptions,\n context: LoaderContext\n) {\n data = getArrayBufferOrStringFromDataSync(data, loader, options);\n\n if (loader.parseTextSync && typeof data === 'string') {\n return loader.parseTextSync(data, options); // , context, loader);\n }\n\n if (loader.parseSync && data instanceof ArrayBuffer) {\n return loader.parseSync(data, options, context); // , loader);\n }\n\n // TBD - If synchronous parser not available, return null\n throw new Error(\n `${loader.name} loader: 'parseSync' not supported by this loader, use 'parse' instead. ${\n context.url || ''\n }`\n );\n}\n"],"mappings":"AAOA,SAAQA,MAAM,QAAO,0BAA0B;AAC/C,SAAQC,gBAAgB,QAAO,iBAAiB;AAChD,SAAQC,cAAc,QAAO,kCAAkC;AAC/D,SAAQC,gBAAgB,QAAO,8BAA8B;AAC7D,SAAQC,kCAAkC,QAAO,0BAA0B;AAC3E,SAAQC,gBAAgB,EAAEC,qBAAqB,QAAO,gCAAgC;AACtF,SAAQC,cAAc,QAAO,yBAAyB;AAStD,OAAO,SAASC,SAASA,CACvBC,IAAkB,EAClBC,OAA2C,EAC3CC,OAAuB,EACvBC,OAAuB,EAClB;EACLZ,MAAM,CAAC,CAACY,OAAO,IAAI,OAAOA,OAAO,KAAK,QAAQ,CAAC;EAI/C,IAAI,CAACC,KAAK,CAACC,OAAO,CAACJ,OAAO,CAAC,IAAI,CAACR,cAAc,CAACQ,OAAO,CAAC,EAAE;IACvDE,OAAO,GAAGG,SAAS;IACnBJ,OAAO,GAAGD,OAAwB;IAClCA,OAAO,GAAGK,SAAS;EACrB;EAEAJ,OAAO,GAAGA,OAAO,IAAI,CAAC,CAAC;EAIvB,MAAMK,YAAY,GAAGN,OAAwC;EAC7D,MAAMO,gBAAgB,GAAGX,qBAAqB,CAACU,YAAY,EAAEJ,OAAO,CAAC;EACrE,MAAMM,MAAM,GAAGjB,gBAAgB,CAACQ,IAAI,EAAEQ,gBAAgB,EAAEN,OAAO,CAAC;EAEhE,IAAI,CAACO,MAAM,EAAE;IACX,OAAO,IAAI;EACb;EAGAP,OAAO,GAAGR,gBAAgB,CAACQ,OAAO,EAAEO,MAAM,EAAED,gBAAgB,CAAC;EAG7D,MAAME,GAAG,GAAGZ,cAAc,CAACE,IAAI,CAAC;EAEhC,MAAMW,KAAK,GAAGA,CAAA,KAAM;IAClB,MAAM,IAAIC,KAAK,CAAC,wCAAwC,CAAC;EAC3D,CAAC;EACDT,OAAO,GAAGP,gBAAgB,CACxB;IAACc,GAAG;IAAEX,SAAS;IAAEY,KAAK;IAAEV,OAAO,EAAEA;EAAmB,CAAC,EACrDC,OAAO,EACPC,OAAO,IAAI,IACb,CAAC;EAED,OAAOU,mBAAmB,CAACJ,MAAM,EAAsBT,IAAI,EAAEE,OAAO,EAAEC,OAAO,CAAC;AAChF;AAGA,SAASU,mBAAmBA,CAC1BJ,MAAwB,EACxBT,IAAkB,EAClBE,OAAsB,EACtBC,OAAsB,EACtB;EACAH,IAAI,GAAGL,kCAAkC,CAACK,IAAI,EAAES,MAAM,EAAEP,OAAO,CAAC;EAEhE,IAAIO,MAAM,CAACK,aAAa,IAAI,OAAOd,IAAI,KAAK,QAAQ,EAAE;IACpD,OAAOS,MAAM,CAACK,aAAa,CAACd,IAAI,EAAEE,OAAO,CAAC;EAC5C;EAEA,IAAIO,MAAM,CAACV,SAAS,IAAIC,IAAI,YAAYe,WAAW,EAAE;IACnD,OAAON,MAAM,CAACV,SAAS,CAACC,IAAI,EAAEE,OAAO,EAAEC,OAAO,CAAC;EACjD;EAGA,MAAM,IAAIS,KAAK,IAAAI,MAAA,CACVP,MAAM,CAACQ,IAAI,8EAAAD,MAAA,CACZb,OAAO,CAACO,GAAG,IAAI,EAAE,CAErB,CAAC;AACH"}
@@ -5,7 +5,7 @@ import { isResponse } from '../../javascript-utils/is-type';
5
5
  import { normalizeOptions } from '../loader-utils/option-utils';
6
6
  import { getArrayBufferOrStringFromData } from '../loader-utils/get-data';
7
7
  import { getLoaderContext, getLoadersFromContext } from '../loader-utils/loader-context';
8
- import { getResourceUrlAndType } from '../utils/resource-utils';
8
+ import { getResourceUrl } from '../utils/resource-utils';
9
9
  import { selectLoader } from './select-loader';
10
10
  export async function parse(data, loaders, options, context) {
11
11
  assert(!context || typeof context === 'object');
@@ -16,9 +16,7 @@ export async function parse(data, loaders, options, context) {
16
16
  }
17
17
  data = await data;
18
18
  options = options || {};
19
- const {
20
- url
21
- } = getResourceUrlAndType(data);
19
+ const url = getResourceUrl(data);
22
20
  const typedLoaders = loaders;
23
21
  const candidateLoaders = getLoadersFromContext(typedLoaders, context);
24
22
  const loader = await selectLoader(data, candidateLoaders, options);
@@ -30,7 +28,7 @@ export async function parse(data, loaders, options, context) {
30
28
  url,
31
29
  parse,
32
30
  loaders: candidateLoaders
33
- }, options, context);
31
+ }, options, context || null);
34
32
  return await parseWithLoader(loader, data, options, context);
35
33
  }
36
34
  async function parseWithLoader(loader, data, options, context) {
@@ -1 +1 @@
1
- {"version":3,"file":"parse.js","names":["assert","validateWorkerVersion","parseWithWorker","canParseWithWorker","isLoaderObject","isResponse","normalizeOptions","getArrayBufferOrStringFromData","getLoaderContext","getLoadersFromContext","getResourceUrlAndType","selectLoader","parse","data","loaders","options","context","Array","isArray","undefined","url","typedLoaders","candidateLoaders","loader","parseWithLoader","response","ok","redirected","status","statusText","type","headers","Object","fromEntries","entries","parseTextSync","dataType","parseText","parseSync","Error","concat","id"],"sources":["../../../../src/lib/api/parse.ts"],"sourcesContent":["// loaders.gl, MIT license\n\nimport type {DataType, Loader, LoaderContext, LoaderOptions} from '@loaders.gl/loader-utils';\nimport type {LoaderOptionsType, LoaderReturnType} from '@loaders.gl/loader-utils';\nimport {assert, validateWorkerVersion} from '@loaders.gl/worker-utils';\nimport {parseWithWorker, canParseWithWorker} from '@loaders.gl/loader-utils';\nimport {isLoaderObject} from '../loader-utils/normalize-loader';\nimport {isResponse} from '../../javascript-utils/is-type';\nimport {normalizeOptions} from '../loader-utils/option-utils';\nimport {getArrayBufferOrStringFromData} from '../loader-utils/get-data';\nimport {getLoaderContext, getLoadersFromContext} from '../loader-utils/loader-context';\nimport {getResourceUrlAndType} from '../utils/resource-utils';\nimport {selectLoader} from './select-loader';\n\n// type LoaderArrayType<T> = T extends (infer Loader)[] ? LoaderOptionsType<Loader> : T\n\nexport async function parse<\n LoaderT extends Loader,\n OptionsT extends LoaderOptions = LoaderOptionsType<LoaderT>\n>(\n data: DataType | Promise<DataType>,\n loader: LoaderT,\n options?: OptionsT,\n context?: LoaderContext\n): Promise<LoaderReturnType<LoaderT>>;\n\nexport async function parse(\n data: DataType | Promise<DataType>,\n loaders: Loader[],\n options?: LoaderOptions,\n context?: LoaderContext\n): Promise<any>;\n\nexport async function parse(\n data: DataType | Promise<DataType>,\n options?: LoaderOptions\n): Promise<any>;\n\n/**\n * Parses `data` using a specified loader\n * @param data\n * @param loaders\n * @param options\n * @param context\n */\n// implementation signature\nexport async function parse(\n data: DataType | Promise<DataType>,\n loaders?: Loader | Loader[] | LoaderOptions,\n options?: LoaderOptions,\n context?: LoaderContext\n): Promise<any> {\n assert(!context || typeof context === 'object'); // parse no longer accepts final url\n\n // Signature: parse(data, options, context | url)\n // Uses registered loaders\n if (loaders && !Array.isArray(loaders) && !isLoaderObject(loaders)) {\n context = undefined; // context not supported in short signature\n options = loaders as LoaderOptions;\n loaders = undefined;\n }\n\n data = await data; // Resolve any promise\n options = options || ({} as LoaderOptions); // Could be invalid...\n\n // Extract a url for auto detection\n const {url} = getResourceUrlAndType(data);\n\n // Chooses a loader (and normalizes it)\n // Also use any loaders in the context, new loaders take priority\n const typedLoaders = loaders as Loader | Loader[] | undefined;\n const candidateLoaders = getLoadersFromContext(typedLoaders, context);\n // todo hacky type cast\n const loader = await selectLoader(data as ArrayBuffer, candidateLoaders, options);\n // Note: if no loader was found, if so just return null\n if (!loader) {\n return null;\n }\n\n // Normalize options\n options = normalizeOptions(options, loader, candidateLoaders, url); // Could be invalid...\n\n // Get a context (if already present, will be unchanged)\n context = getLoaderContext({url, parse, loaders: candidateLoaders}, options, context);\n\n return await parseWithLoader(loader, data, options, context);\n}\n\n// TODO: support progress and abort\n// TODO - should accept loader.parseAsyncIterator and concatenate.\nasync function parseWithLoader(loader, data, options, context) {\n validateWorkerVersion(loader);\n\n if (isResponse(data)) {\n // Serialize to support passing the response to web worker\n const response = data as Response;\n const {ok, redirected, status, statusText, type, url} = response;\n const headers = Object.fromEntries(response.headers.entries());\n context.response = {headers, ok, redirected, status, statusText, type, url};\n }\n\n data = await getArrayBufferOrStringFromData(data, loader, options);\n\n // First check for synchronous text parser, wrap results in promises\n if (loader.parseTextSync && typeof data === 'string') {\n options.dataType = 'text';\n return loader.parseTextSync(data, options, context, loader);\n }\n\n // If we have a workerUrl and the loader can parse the given options efficiently in a worker\n if (canParseWithWorker(loader, options)) {\n return await parseWithWorker(loader, data, options, context, parse);\n }\n\n // Check for asynchronous parser\n if (loader.parseText && typeof data === 'string') {\n return await loader.parseText(data, options, context, loader);\n }\n\n if (loader.parse) {\n return await loader.parse(data, options, context, loader);\n }\n\n // This should not happen, all sync loaders should also offer `parse` function\n assert(!loader.parseSync);\n\n // TBD - If asynchronous parser not available, return null\n throw new Error(`${loader.id} loader - no parser found and worker is disabled`);\n}\n"],"mappings":"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"}
1
+ {"version":3,"file":"parse.js","names":["assert","validateWorkerVersion","parseWithWorker","canParseWithWorker","isLoaderObject","isResponse","normalizeOptions","getArrayBufferOrStringFromData","getLoaderContext","getLoadersFromContext","getResourceUrl","selectLoader","parse","data","loaders","options","context","Array","isArray","undefined","url","typedLoaders","candidateLoaders","loader","parseWithLoader","response","ok","redirected","status","statusText","type","headers","Object","fromEntries","entries","parseTextSync","dataType","parseText","parseSync","Error","concat","id"],"sources":["../../../../src/lib/api/parse.ts"],"sourcesContent":["// loaders.gl, MIT license\n\nimport type {DataType, Loader, LoaderContext, LoaderOptions} from '@loaders.gl/loader-utils';\nimport type {LoaderOptionsType, LoaderReturnType} from '@loaders.gl/loader-utils';\nimport {assert, validateWorkerVersion} from '@loaders.gl/worker-utils';\nimport {parseWithWorker, canParseWithWorker} from '@loaders.gl/loader-utils';\nimport {isLoaderObject} from '../loader-utils/normalize-loader';\nimport {isResponse} from '../../javascript-utils/is-type';\nimport {normalizeOptions} from '../loader-utils/option-utils';\nimport {getArrayBufferOrStringFromData} from '../loader-utils/get-data';\nimport {getLoaderContext, getLoadersFromContext} from '../loader-utils/loader-context';\nimport {getResourceUrl} from '../utils/resource-utils';\nimport {selectLoader} from './select-loader';\n\n// type LoaderArrayType<T> = T extends (infer Loader)[] ? LoaderOptionsType<Loader> : T\n\nexport async function parse<\n LoaderT extends Loader,\n OptionsT extends LoaderOptions = LoaderOptionsType<LoaderT>\n>(\n data: DataType | Promise<DataType>,\n loader: LoaderT,\n options?: OptionsT,\n context?: LoaderContext\n): Promise<LoaderReturnType<LoaderT>>;\n\nexport async function parse(\n data: DataType | Promise<DataType>,\n loaders: Loader[],\n options?: LoaderOptions,\n context?: LoaderContext\n): Promise<any>;\n\nexport async function parse(\n data: DataType | Promise<DataType>,\n options?: LoaderOptions\n): Promise<any>;\n\n/**\n * Parses `data` using a specified loader\n * @param data\n * @param loaders\n * @param options\n * @param context\n */\n// implementation signature\nexport async function parse(\n data: DataType | Promise<DataType>,\n loaders?: Loader | Loader[] | LoaderOptions,\n options?: LoaderOptions,\n context?: LoaderContext\n): Promise<any> {\n assert(!context || typeof context === 'object'); // parse no longer accepts final url\n\n // Signature: parse(data, options, context | url)\n // Uses registered loaders\n if (loaders && !Array.isArray(loaders) && !isLoaderObject(loaders)) {\n context = undefined; // context not supported in short signature\n options = loaders as LoaderOptions;\n loaders = undefined;\n }\n\n data = await data; // Resolve any promise\n options = options || ({} as LoaderOptions); // Could be invalid...\n\n // Extract a url for auto detection\n const url = getResourceUrl(data);\n\n // Chooses a loader (and normalizes it)\n // Also use any loaders in the context, new loaders take priority\n const typedLoaders = loaders as Loader | Loader[] | undefined;\n const candidateLoaders = getLoadersFromContext(typedLoaders, context);\n // todo hacky type cast\n const loader = await selectLoader(data as ArrayBuffer, candidateLoaders, options);\n // Note: if no loader was found, if so just return null\n if (!loader) {\n return null;\n }\n\n // Normalize options\n options = normalizeOptions(options, loader, candidateLoaders, url); // Could be invalid...\n\n // Get a context (if already present, will be unchanged)\n context = getLoaderContext({url, parse, loaders: candidateLoaders}, options, context || null);\n\n return await parseWithLoader(loader, data, options, context);\n}\n\n// TODO: support progress and abort\n// TODO - should accept loader.parseAsyncIterator and concatenate.\nasync function parseWithLoader(loader, data, options, context) {\n validateWorkerVersion(loader);\n\n if (isResponse(data)) {\n // Serialize to support passing the response to web worker\n const response = data as Response;\n const {ok, redirected, status, statusText, type, url} = response;\n const headers = Object.fromEntries(response.headers.entries());\n context.response = {headers, ok, redirected, status, statusText, type, url};\n }\n\n data = await getArrayBufferOrStringFromData(data, loader, options);\n\n // First check for synchronous text parser, wrap results in promises\n if (loader.parseTextSync && typeof data === 'string') {\n options.dataType = 'text';\n return loader.parseTextSync(data, options, context, loader);\n }\n\n // If we have a workerUrl and the loader can parse the given options efficiently in a worker\n if (canParseWithWorker(loader, options)) {\n return await parseWithWorker(loader, data, options, context, parse);\n }\n\n // Check for asynchronous parser\n if (loader.parseText && typeof data === 'string') {\n return await loader.parseText(data, options, context, loader);\n }\n\n if (loader.parse) {\n return await loader.parse(data, options, context, loader);\n }\n\n // This should not happen, all sync loaders should also offer `parse` function\n assert(!loader.parseSync);\n\n // TBD - If asynchronous parser not available, return null\n throw new Error(`${loader.id} loader - no parser found and worker is disabled`);\n}\n"],"mappings":"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"}
@@ -1,9 +1,10 @@
1
1
  import { compareArrayBuffers, path } from '@loaders.gl/loader-utils';
2
2
  import { normalizeLoader } from '../loader-utils/normalize-loader';
3
3
  import { log } from '../utils/log';
4
- import { getResourceUrlAndType } from '../utils/resource-utils';
4
+ import { getResourceUrl, getResourceMIMEType } from '../utils/resource-utils';
5
5
  import { getRegisteredLoaders } from './register-loaders';
6
6
  import { isBlob } from '../../javascript-utils/is-type';
7
+ import { stripQueryString } from '../utils/url-utils';
7
8
  const EXT_PATTERN = /\.([^.]+)$/;
8
9
  export async function selectLoader(data) {
9
10
  let loaders = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
@@ -53,11 +54,9 @@ export function selectLoaderSync(data) {
53
54
  return loader;
54
55
  }
55
56
  function selectLoaderInternal(data, loaders, options, context) {
56
- const {
57
- url,
58
- type
59
- } = getResourceUrlAndType(data);
60
- const testUrl = url || (context === null || context === void 0 ? void 0 : context.url);
57
+ const url = getResourceUrl(data);
58
+ const type = getResourceMIMEType(data);
59
+ const testUrl = stripQueryString(url) || (context === null || context === void 0 ? void 0 : context.url);
61
60
  let loader = null;
62
61
  let reason = '';
63
62
  if (options !== null && options !== void 0 && options.mimeType) {
@@ -87,10 +86,8 @@ function validHTTPResponse(data) {
87
86
  return true;
88
87
  }
89
88
  function getNoValidLoaderMessage(data) {
90
- const {
91
- url,
92
- type
93
- } = getResourceUrlAndType(data);
89
+ const url = getResourceUrl(data);
90
+ const type = getResourceMIMEType(data);
94
91
  let message = 'No valid loader found (';
95
92
  message += url ? "".concat(path.filename(url), ", ") : 'no url provided, ';
96
93
  message += "MIME type: ".concat(type ? "\"".concat(type, "\"") : 'not provided', ", ");
@@ -1 +1 @@
1
- {"version":3,"file":"select-loader.js","names":["compareArrayBuffers","path","normalizeLoader","log","getResourceUrlAndType","getRegisteredLoaders","isBlob","EXT_PATTERN","selectLoader","data","loaders","arguments","length","undefined","options","context","validHTTPResponse","loader","selectLoaderSync","nothrow","slice","arrayBuffer","Error","getNoValidLoaderMessage","Array","isArray","candidateLoaders","concat","ignoreRegisteredLoaders","push","normalizeLoaders","selectLoaderInternal","url","type","testUrl","reason","mimeType","findLoaderByMIMEType","findLoaderByUrl","findLoaderByInitialBytes","getFirstCharacters","fallbackMimeType","_loader","name","Response","status","message","filename","firstCharacters","match","exec","extension","findLoaderByExtension","toLowerCase","loaderExtension","extensions","mimeTypes","includes","id","testDataAgainstText","ArrayBuffer","isView","testDataAgainstBinary","buffer","byteOffset","testText","tests","some","test","startsWith","testBinary","byteLength","magic","getMagicString","dataView","DataView","i","String","fromCharCode","getUint8"],"sources":["../../../../src/lib/api/select-loader.ts"],"sourcesContent":["import type {LoaderContext, LoaderOptions, Loader} from '@loaders.gl/loader-utils';\nimport {compareArrayBuffers, path} from '@loaders.gl/loader-utils';\nimport {normalizeLoader} from '../loader-utils/normalize-loader';\nimport {log} from '../utils/log';\nimport {getResourceUrlAndType} from '../utils/resource-utils';\nimport {getRegisteredLoaders} from './register-loaders';\nimport {isBlob} from '../../javascript-utils/is-type';\n\nconst EXT_PATTERN = /\\.([^.]+)$/;\n\n// TODO - Need a variant that peeks at streams for parseInBatches\n// TODO - Detect multiple matching loaders? Use heuristics to grade matches?\n// TODO - Allow apps to pass context to disambiguate between multiple matches (e.g. multiple .json formats)?\n\n/**\n * Find a loader that matches file extension and/or initial file content\n * Search the loaders array argument for a loader that matches url extension or initial data\n * Returns: a normalized loader\n * @param data data to assist\n * @param loaders\n * @param options\n * @param context used internally, applications should not provide this parameter\n */\nexport async function selectLoader(\n data: Response | Blob | ArrayBuffer | string,\n loaders: Loader[] | Loader = [],\n options?: LoaderOptions,\n context?: LoaderContext\n): Promise<Loader | null> {\n if (!validHTTPResponse(data)) {\n return null;\n }\n\n // First make a sync attempt, disabling exceptions\n let loader = selectLoaderSync(data, loaders, {...options, nothrow: true}, context);\n if (loader) {\n return loader;\n }\n\n // For Blobs and Files, try to asynchronously read a small initial slice and test again with that\n // to see if we can detect by initial content\n if (isBlob(data)) {\n data = await (data as Blob).slice(0, 10).arrayBuffer();\n loader = selectLoaderSync(data, loaders, options, context);\n }\n\n // no loader available\n if (!loader && !options?.nothrow) {\n throw new Error(getNoValidLoaderMessage(data));\n }\n\n return loader;\n}\n\n/**\n * Find a loader that matches file extension and/or initial file content\n * Search the loaders array argument for a loader that matches url extension or initial data\n * Returns: a normalized loader\n * @param data data to assist\n * @param loaders\n * @param options\n * @param context used internally, applications should not provide this parameter\n */\nexport function selectLoaderSync(\n data: Response | Blob | ArrayBuffer | string,\n loaders: Loader[] | Loader = [],\n options?: LoaderOptions,\n context?: LoaderContext\n): Loader | null {\n if (!validHTTPResponse(data)) {\n return null;\n }\n\n // eslint-disable-next-line complexity\n // if only a single loader was provided (not as array), force its use\n // TODO - Should this behavior be kept and documented?\n if (loaders && !Array.isArray(loaders)) {\n // TODO - remove support for legacy loaders\n return normalizeLoader(loaders);\n }\n\n // Build list of candidate loaders that will be searched in order for a match\n let candidateLoaders: Loader[] = [];\n // First search supplied loaders\n if (loaders) {\n candidateLoaders = candidateLoaders.concat(loaders);\n }\n // Then fall back to registered loaders\n if (!options?.ignoreRegisteredLoaders) {\n candidateLoaders.push(...getRegisteredLoaders());\n }\n\n // TODO - remove support for legacy loaders\n normalizeLoaders(candidateLoaders);\n\n const loader = selectLoaderInternal(data, candidateLoaders, options, context);\n\n // no loader available\n if (!loader && !options?.nothrow) {\n throw new Error(getNoValidLoaderMessage(data));\n }\n\n return loader;\n}\n\n/** Implements loaders selection logic */\n// eslint-disable-next-line complexity\nfunction selectLoaderInternal(\n data: Response | Blob | ArrayBuffer | string,\n loaders: Loader[],\n options?: LoaderOptions,\n context?: LoaderContext\n) {\n const {url, type} = getResourceUrlAndType(data);\n\n const testUrl = url || context?.url;\n\n let loader: Loader | null = null;\n let reason: string = '';\n\n // if options.mimeType is supplied, it takes precedence\n if (options?.mimeType) {\n loader = findLoaderByMIMEType(loaders, options?.mimeType);\n reason = `match forced by supplied MIME type ${options?.mimeType}`;\n }\n\n // Look up loader by url\n loader = loader || findLoaderByUrl(loaders, testUrl);\n reason = reason || (loader ? `matched url ${testUrl}` : '');\n\n // Look up loader by mime type\n loader = loader || findLoaderByMIMEType(loaders, type);\n reason = reason || (loader ? `matched MIME type ${type}` : '');\n\n // Look for loader via initial bytes (Note: not always accessible (e.g. Response, stream, async iterator)\n loader = loader || findLoaderByInitialBytes(loaders, data);\n reason = reason || (loader ? `matched initial data ${getFirstCharacters(data)}` : '');\n\n // Look up loader by fallback mime type\n loader = loader || findLoaderByMIMEType(loaders, options?.fallbackMimeType);\n reason = reason || (loader ? `matched fallback MIME type ${type}` : '');\n\n if (reason) {\n log.log(1, `selectLoader selected ${loader?.name}: ${reason}.`);\n }\n\n return loader;\n}\n\n/** Check HTTP Response */\nfunction validHTTPResponse(data: any): boolean {\n // HANDLE HTTP status\n if (data instanceof Response) {\n // 204 - NO CONTENT. This handles cases where e.g. a tile server responds with 204 for a missing tile\n if (data.status === 204) {\n return false;\n }\n }\n return true;\n}\n\n/** Generate a helpful message to help explain why loader selection failed. */\nfunction getNoValidLoaderMessage(data): string {\n const {url, type} = getResourceUrlAndType(data);\n\n let message = 'No valid loader found (';\n message += url ? `${path.filename(url)}, ` : 'no url provided, ';\n message += `MIME type: ${type ? `\"${type}\"` : 'not provided'}, `;\n // First characters are only accessible when called on data (string or arrayBuffer).\n const firstCharacters: string = data ? getFirstCharacters(data) : '';\n message += firstCharacters ? ` first bytes: \"${firstCharacters}\"` : 'first bytes: not available';\n message += ')';\n return message;\n}\n\nfunction normalizeLoaders(loaders: Loader[]): void {\n for (const loader of loaders) {\n normalizeLoader(loader);\n }\n}\n\n// TODO - Would be nice to support http://example.com/file.glb?parameter=1\n// E.g: x = new URL('http://example.com/file.glb?load=1'; x.pathname\nfunction findLoaderByUrl(loaders: Loader[], url?: string): Loader | null {\n // Get extension\n const match = url && EXT_PATTERN.exec(url);\n const extension = match && match[1];\n return extension ? findLoaderByExtension(loaders, extension) : null;\n}\n\nfunction findLoaderByExtension(loaders: Loader[], extension: string): Loader | null {\n extension = extension.toLowerCase();\n\n for (const loader of loaders) {\n for (const loaderExtension of loader.extensions) {\n if (loaderExtension.toLowerCase() === extension) {\n return loader;\n }\n }\n }\n return null;\n}\n\nfunction findLoaderByMIMEType(loaders, mimeType) {\n for (const loader of loaders) {\n if (loader.mimeTypes && loader.mimeTypes.includes(mimeType)) {\n return loader;\n }\n\n // Support referring to loaders using the \"unregistered tree\"\n // https://en.wikipedia.org/wiki/Media_type#Unregistered_tree\n if (mimeType === `application/x.${loader.id}`) {\n return loader;\n }\n }\n return null;\n}\n\nfunction findLoaderByInitialBytes(loaders, data) {\n if (!data) {\n return null;\n }\n\n for (const loader of loaders) {\n if (typeof data === 'string') {\n if (testDataAgainstText(data, loader)) {\n return loader;\n }\n } else if (ArrayBuffer.isView(data)) {\n // Typed Arrays can have offsets into underlying buffer\n if (testDataAgainstBinary(data.buffer, data.byteOffset, loader)) {\n return loader;\n }\n } else if (data instanceof ArrayBuffer) {\n const byteOffset = 0;\n if (testDataAgainstBinary(data, byteOffset, loader)) {\n return loader;\n }\n }\n // TODO Handle streaming case (requires creating a new AsyncIterator)\n }\n return null;\n}\n\nfunction testDataAgainstText(data, loader) {\n if (loader.testText) {\n return loader.testText(data);\n }\n\n const tests = Array.isArray(loader.tests) ? loader.tests : [loader.tests];\n return tests.some((test) => data.startsWith(test));\n}\n\nfunction testDataAgainstBinary(data, byteOffset, loader) {\n const tests = Array.isArray(loader.tests) ? loader.tests : [loader.tests];\n return tests.some((test) => testBinary(data, byteOffset, loader, test));\n}\n\nfunction testBinary(data, byteOffset, loader, test) {\n if (test instanceof ArrayBuffer) {\n return compareArrayBuffers(test, data, test.byteLength);\n }\n switch (typeof test) {\n case 'function':\n return test(data, loader);\n\n case 'string':\n // Magic bytes check: If `test` is a string, check if binary data starts with that strings\n const magic = getMagicString(data, byteOffset, test.length);\n return test === magic;\n\n default:\n return false;\n }\n}\n\nfunction getFirstCharacters(data, length: number = 5) {\n if (typeof data === 'string') {\n return data.slice(0, length);\n } else if (ArrayBuffer.isView(data)) {\n // Typed Arrays can have offsets into underlying buffer\n return getMagicString(data.buffer, data.byteOffset, length);\n } else if (data instanceof ArrayBuffer) {\n const byteOffset = 0;\n return getMagicString(data, byteOffset, length);\n }\n return '';\n}\n\nfunction getMagicString(arrayBuffer, byteOffset, length) {\n if (arrayBuffer.byteLength < byteOffset + length) {\n return '';\n }\n const dataView = new DataView(arrayBuffer);\n let magic = '';\n for (let i = 0; i < length; i++) {\n magic += String.fromCharCode(dataView.getUint8(byteOffset + i));\n }\n return magic;\n}\n"],"mappings":"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"}
1
+ {"version":3,"file":"select-loader.js","names":["compareArrayBuffers","path","normalizeLoader","log","getResourceUrl","getResourceMIMEType","getRegisteredLoaders","isBlob","stripQueryString","EXT_PATTERN","selectLoader","data","loaders","arguments","length","undefined","options","context","validHTTPResponse","loader","selectLoaderSync","nothrow","slice","arrayBuffer","Error","getNoValidLoaderMessage","Array","isArray","candidateLoaders","concat","ignoreRegisteredLoaders","push","normalizeLoaders","selectLoaderInternal","url","type","testUrl","reason","mimeType","findLoaderByMIMEType","findLoaderByUrl","findLoaderByInitialBytes","getFirstCharacters","fallbackMimeType","_loader","name","Response","status","message","filename","firstCharacters","match","exec","extension","findLoaderByExtension","toLowerCase","loaderExtension","extensions","mimeTypes","includes","id","testDataAgainstText","ArrayBuffer","isView","testDataAgainstBinary","buffer","byteOffset","testText","tests","some","test","startsWith","testBinary","byteLength","magic","getMagicString","dataView","DataView","i","String","fromCharCode","getUint8"],"sources":["../../../../src/lib/api/select-loader.ts"],"sourcesContent":["import type {LoaderContext, LoaderOptions, Loader} from '@loaders.gl/loader-utils';\nimport {compareArrayBuffers, path} from '@loaders.gl/loader-utils';\nimport {normalizeLoader} from '../loader-utils/normalize-loader';\nimport {log} from '../utils/log';\nimport {getResourceUrl, getResourceMIMEType} from '../utils/resource-utils';\nimport {getRegisteredLoaders} from './register-loaders';\nimport {isBlob} from '../../javascript-utils/is-type';\nimport {stripQueryString} from '../utils/url-utils';\n\nconst EXT_PATTERN = /\\.([^.]+)$/;\n\n// TODO - Need a variant that peeks at streams for parseInBatches\n// TODO - Detect multiple matching loaders? Use heuristics to grade matches?\n// TODO - Allow apps to pass context to disambiguate between multiple matches (e.g. multiple .json formats)?\n\n/**\n * Find a loader that matches file extension and/or initial file content\n * Search the loaders array argument for a loader that matches url extension or initial data\n * Returns: a normalized loader\n * @param data data to assist\n * @param loaders\n * @param options\n * @param context used internally, applications should not provide this parameter\n */\nexport async function selectLoader(\n data: Response | Blob | ArrayBuffer | string,\n loaders: Loader[] | Loader = [],\n options?: LoaderOptions,\n context?: LoaderContext\n): Promise<Loader | null> {\n if (!validHTTPResponse(data)) {\n return null;\n }\n\n // First make a sync attempt, disabling exceptions\n let loader = selectLoaderSync(data, loaders, {...options, nothrow: true}, context);\n if (loader) {\n return loader;\n }\n\n // For Blobs and Files, try to asynchronously read a small initial slice and test again with that\n // to see if we can detect by initial content\n if (isBlob(data)) {\n data = await (data as Blob).slice(0, 10).arrayBuffer();\n loader = selectLoaderSync(data, loaders, options, context);\n }\n\n // no loader available\n if (!loader && !options?.nothrow) {\n throw new Error(getNoValidLoaderMessage(data));\n }\n\n return loader;\n}\n\n/**\n * Find a loader that matches file extension and/or initial file content\n * Search the loaders array argument for a loader that matches url extension or initial data\n * Returns: a normalized loader\n * @param data data to assist\n * @param loaders\n * @param options\n * @param context used internally, applications should not provide this parameter\n */\nexport function selectLoaderSync(\n data: Response | Blob | ArrayBuffer | string,\n loaders: Loader[] | Loader = [],\n options?: LoaderOptions,\n context?: LoaderContext\n): Loader | null {\n if (!validHTTPResponse(data)) {\n return null;\n }\n\n // eslint-disable-next-line complexity\n // if only a single loader was provided (not as array), force its use\n // TODO - Should this behavior be kept and documented?\n if (loaders && !Array.isArray(loaders)) {\n // TODO - remove support for legacy loaders\n return normalizeLoader(loaders);\n }\n\n // Build list of candidate loaders that will be searched in order for a match\n let candidateLoaders: Loader[] = [];\n // First search supplied loaders\n if (loaders) {\n candidateLoaders = candidateLoaders.concat(loaders);\n }\n // Then fall back to registered loaders\n if (!options?.ignoreRegisteredLoaders) {\n candidateLoaders.push(...getRegisteredLoaders());\n }\n\n // TODO - remove support for legacy loaders\n normalizeLoaders(candidateLoaders);\n\n const loader = selectLoaderInternal(data, candidateLoaders, options, context);\n\n // no loader available\n if (!loader && !options?.nothrow) {\n throw new Error(getNoValidLoaderMessage(data));\n }\n\n return loader;\n}\n\n/** Implements loaders selection logic */\n// eslint-disable-next-line complexity\nfunction selectLoaderInternal(\n data: Response | Blob | ArrayBuffer | string,\n loaders: Loader[],\n options?: LoaderOptions,\n context?: LoaderContext\n) {\n const url = getResourceUrl(data);\n const type = getResourceMIMEType(data);\n\n const testUrl = stripQueryString(url) || context?.url;\n\n let loader: Loader | null = null;\n let reason: string = '';\n\n // if options.mimeType is supplied, it takes precedence\n if (options?.mimeType) {\n loader = findLoaderByMIMEType(loaders, options?.mimeType);\n reason = `match forced by supplied MIME type ${options?.mimeType}`;\n }\n\n // Look up loader by url\n loader = loader || findLoaderByUrl(loaders, testUrl);\n reason = reason || (loader ? `matched url ${testUrl}` : '');\n\n // Look up loader by mime type\n loader = loader || findLoaderByMIMEType(loaders, type);\n reason = reason || (loader ? `matched MIME type ${type}` : '');\n\n // Look for loader via initial bytes (Note: not always accessible (e.g. Response, stream, async iterator)\n loader = loader || findLoaderByInitialBytes(loaders, data);\n reason = reason || (loader ? `matched initial data ${getFirstCharacters(data)}` : '');\n\n // Look up loader by fallback mime type\n loader = loader || findLoaderByMIMEType(loaders, options?.fallbackMimeType);\n reason = reason || (loader ? `matched fallback MIME type ${type}` : '');\n\n if (reason) {\n log.log(1, `selectLoader selected ${loader?.name}: ${reason}.`);\n }\n\n return loader;\n}\n\n/** Check HTTP Response */\nfunction validHTTPResponse(data: any): boolean {\n // HANDLE HTTP status\n if (data instanceof Response) {\n // 204 - NO CONTENT. This handles cases where e.g. a tile server responds with 204 for a missing tile\n if (data.status === 204) {\n return false;\n }\n }\n return true;\n}\n\n/** Generate a helpful message to help explain why loader selection failed. */\nfunction getNoValidLoaderMessage(data): string {\n const url = getResourceUrl(data);\n const type = getResourceMIMEType(data);\n\n let message = 'No valid loader found (';\n message += url ? `${path.filename(url)}, ` : 'no url provided, ';\n message += `MIME type: ${type ? `\"${type}\"` : 'not provided'}, `;\n // First characters are only accessible when called on data (string or arrayBuffer).\n const firstCharacters: string = data ? getFirstCharacters(data) : '';\n message += firstCharacters ? ` first bytes: \"${firstCharacters}\"` : 'first bytes: not available';\n message += ')';\n return message;\n}\n\nfunction normalizeLoaders(loaders: Loader[]): void {\n for (const loader of loaders) {\n normalizeLoader(loader);\n }\n}\n\n// TODO - Would be nice to support http://example.com/file.glb?parameter=1\n// E.g: x = new URL('http://example.com/file.glb?load=1'; x.pathname\nfunction findLoaderByUrl(loaders: Loader[], url?: string): Loader | null {\n // Get extension\n const match = url && EXT_PATTERN.exec(url);\n const extension = match && match[1];\n return extension ? findLoaderByExtension(loaders, extension) : null;\n}\n\nfunction findLoaderByExtension(loaders: Loader[], extension: string): Loader | null {\n extension = extension.toLowerCase();\n\n for (const loader of loaders) {\n for (const loaderExtension of loader.extensions) {\n if (loaderExtension.toLowerCase() === extension) {\n return loader;\n }\n }\n }\n return null;\n}\n\nfunction findLoaderByMIMEType(loaders, mimeType) {\n for (const loader of loaders) {\n if (loader.mimeTypes && loader.mimeTypes.includes(mimeType)) {\n return loader;\n }\n\n // Support referring to loaders using the \"unregistered tree\"\n // https://en.wikipedia.org/wiki/Media_type#Unregistered_tree\n if (mimeType === `application/x.${loader.id}`) {\n return loader;\n }\n }\n return null;\n}\n\nfunction findLoaderByInitialBytes(loaders, data) {\n if (!data) {\n return null;\n }\n\n for (const loader of loaders) {\n if (typeof data === 'string') {\n if (testDataAgainstText(data, loader)) {\n return loader;\n }\n } else if (ArrayBuffer.isView(data)) {\n // Typed Arrays can have offsets into underlying buffer\n if (testDataAgainstBinary(data.buffer, data.byteOffset, loader)) {\n return loader;\n }\n } else if (data instanceof ArrayBuffer) {\n const byteOffset = 0;\n if (testDataAgainstBinary(data, byteOffset, loader)) {\n return loader;\n }\n }\n // TODO Handle streaming case (requires creating a new AsyncIterator)\n }\n return null;\n}\n\nfunction testDataAgainstText(data, loader) {\n if (loader.testText) {\n return loader.testText(data);\n }\n\n const tests = Array.isArray(loader.tests) ? loader.tests : [loader.tests];\n return tests.some((test) => data.startsWith(test));\n}\n\nfunction testDataAgainstBinary(data, byteOffset, loader) {\n const tests = Array.isArray(loader.tests) ? loader.tests : [loader.tests];\n return tests.some((test) => testBinary(data, byteOffset, loader, test));\n}\n\nfunction testBinary(data, byteOffset, loader, test) {\n if (test instanceof ArrayBuffer) {\n return compareArrayBuffers(test, data, test.byteLength);\n }\n switch (typeof test) {\n case 'function':\n return test(data, loader);\n\n case 'string':\n // Magic bytes check: If `test` is a string, check if binary data starts with that strings\n const magic = getMagicString(data, byteOffset, test.length);\n return test === magic;\n\n default:\n return false;\n }\n}\n\nfunction getFirstCharacters(data, length: number = 5) {\n if (typeof data === 'string') {\n return data.slice(0, length);\n } else if (ArrayBuffer.isView(data)) {\n // Typed Arrays can have offsets into underlying buffer\n return getMagicString(data.buffer, data.byteOffset, length);\n } else if (data instanceof ArrayBuffer) {\n const byteOffset = 0;\n return getMagicString(data, byteOffset, length);\n }\n return '';\n}\n\nfunction getMagicString(arrayBuffer, byteOffset, length) {\n if (arrayBuffer.byteLength < byteOffset + length) {\n return '';\n }\n const dataView = new DataView(arrayBuffer);\n let magic = '';\n for (let i = 0; i < length; i++) {\n magic += String.fromCharCode(dataView.getUint8(byteOffset + i));\n }\n return magic;\n}\n"],"mappings":"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"}
@@ -1,5 +1,5 @@
1
1
  import { log } from './utils/log';
2
- const version = typeof "4.0.0-alpha.6" !== 'undefined' ? "4.0.0-alpha.6" : '';
2
+ const version = typeof "4.0.0-alpha.8" !== 'undefined' ? "4.0.0-alpha.8" : '';
3
3
  if (!globalThis.loaders) {
4
4
  log.log(1, "loaders.gl ".concat(version))();
5
5
  globalThis.loaders = Object.assign(globalThis.loaders || {}, {
@@ -1,17 +1,25 @@
1
1
  import { getFetchFunction } from './get-fetch-function';
2
- export function getLoaderContext(context, options) {
3
- let previousContext = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
4
- if (previousContext) {
5
- return previousContext;
2
+ import { extractQueryString, stripQueryString } from '../utils/url-utils';
3
+ import { path } from '@loaders.gl/loader-utils';
4
+ export function getLoaderContext(context, options, parentContext) {
5
+ if (parentContext) {
6
+ return parentContext;
6
7
  }
7
- const resolvedContext = {
8
+ const newContext = {
8
9
  fetch: getFetchFunction(options, context),
9
10
  ...context
10
11
  };
11
- if (!Array.isArray(resolvedContext.loaders)) {
12
- resolvedContext.loaders = null;
12
+ if (newContext.url) {
13
+ const baseUrl = stripQueryString(newContext.url);
14
+ newContext.baseUrl = baseUrl;
15
+ newContext.queryString = extractQueryString(newContext.url);
16
+ newContext.filename = path.filename(baseUrl);
17
+ newContext.baseUrl = path.dirname(baseUrl);
13
18
  }
14
- return resolvedContext;
19
+ if (!Array.isArray(newContext.loaders)) {
20
+ newContext.loaders = null;
21
+ }
22
+ return newContext;
15
23
  }
16
24
  export function getLoadersFromContext(loaders, context) {
17
25
  if (!context && loaders && !Array.isArray(loaders)) {
@@ -1 +1 @@
1
- {"version":3,"file":"loader-context.js","names":["getFetchFunction","getLoaderContext","context","options","previousContext","arguments","length","undefined","resolvedContext","fetch","Array","isArray","loaders","getLoadersFromContext","candidateLoaders","contextLoaders"],"sources":["../../../../src/lib/loader-utils/loader-context.ts"],"sourcesContent":["import type {Loader, LoaderOptions, LoaderContext} from '@loaders.gl/loader-utils';\nimport {getFetchFunction} from './get-fetch-function';\n\n/**\n * \"sub\" loaders invoked by other loaders get a \"context\" injected on `this`\n * The context will inject core methods like `parse` and contain information\n * about loaders and options passed in to the top-level `parse` call.\n *\n * @param context\n * @param options\n * @param previousContext\n */\nexport function getLoaderContext(\n context: Omit<LoaderContext, 'fetch'> & Partial<Pick<LoaderContext, 'fetch'>>,\n options?: LoaderOptions,\n previousContext: LoaderContext | null = null\n): LoaderContext {\n // For recursive calls, we already have a context\n // TODO - add any additional loaders to context?\n if (previousContext) {\n return previousContext;\n }\n\n const resolvedContext: LoaderContext = {\n fetch: getFetchFunction(options, context),\n ...context\n };\n\n // Recursive loading does not use single loader\n if (!Array.isArray(resolvedContext.loaders)) {\n resolvedContext.loaders = null;\n }\n\n return resolvedContext;\n}\n\n// eslint-disable-next-line complexity\nexport function getLoadersFromContext(\n loaders: Loader[] | Loader | undefined,\n context?: LoaderContext\n) {\n // A single non-array loader is force selected, but only on top-level (context === null)\n if (!context && loaders && !Array.isArray(loaders)) {\n return loaders;\n }\n\n // Create a merged list\n let candidateLoaders;\n if (loaders) {\n candidateLoaders = Array.isArray(loaders) ? loaders : [loaders];\n }\n if (context && context.loaders) {\n const contextLoaders = Array.isArray(context.loaders) ? context.loaders : [context.loaders];\n candidateLoaders = candidateLoaders ? [...candidateLoaders, ...contextLoaders] : contextLoaders;\n }\n // If no loaders, return null to look in globally registered loaders\n return candidateLoaders && candidateLoaders.length ? candidateLoaders : null;\n}\n"],"mappings":"AACA,SAAQA,gBAAgB,QAAO,sBAAsB;AAWrD,OAAO,SAASC,gBAAgBA,CAC9BC,OAA6E,EAC7EC,OAAuB,EAER;EAAA,IADfC,eAAqC,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,IAAI;EAI5C,IAAID,eAAe,EAAE;IACnB,OAAOA,eAAe;EACxB;EAEA,MAAMI,eAA8B,GAAG;IACrCC,KAAK,EAAET,gBAAgB,CAACG,OAAO,EAAED,OAAO,CAAC;IACzC,GAAGA;EACL,CAAC;EAGD,IAAI,CAACQ,KAAK,CAACC,OAAO,CAACH,eAAe,CAACI,OAAO,CAAC,EAAE;IAC3CJ,eAAe,CAACI,OAAO,GAAG,IAAI;EAChC;EAEA,OAAOJ,eAAe;AACxB;AAGA,OAAO,SAASK,qBAAqBA,CACnCD,OAAsC,EACtCV,OAAuB,EACvB;EAEA,IAAI,CAACA,OAAO,IAAIU,OAAO,IAAI,CAACF,KAAK,CAACC,OAAO,CAACC,OAAO,CAAC,EAAE;IAClD,OAAOA,OAAO;EAChB;EAGA,IAAIE,gBAAgB;EACpB,IAAIF,OAAO,EAAE;IACXE,gBAAgB,GAAGJ,KAAK,CAACC,OAAO,CAACC,OAAO,CAAC,GAAGA,OAAO,GAAG,CAACA,OAAO,CAAC;EACjE;EACA,IAAIV,OAAO,IAAIA,OAAO,CAACU,OAAO,EAAE;IAC9B,MAAMG,cAAc,GAAGL,KAAK,CAACC,OAAO,CAACT,OAAO,CAACU,OAAO,CAAC,GAAGV,OAAO,CAACU,OAAO,GAAG,CAACV,OAAO,CAACU,OAAO,CAAC;IAC3FE,gBAAgB,GAAGA,gBAAgB,GAAG,CAAC,GAAGA,gBAAgB,EAAE,GAAGC,cAAc,CAAC,GAAGA,cAAc;EACjG;EAEA,OAAOD,gBAAgB,IAAIA,gBAAgB,CAACR,MAAM,GAAGQ,gBAAgB,GAAG,IAAI;AAC9E"}
1
+ {"version":3,"file":"loader-context.js","names":["getFetchFunction","extractQueryString","stripQueryString","path","getLoaderContext","context","options","parentContext","newContext","fetch","url","baseUrl","queryString","filename","dirname","Array","isArray","loaders","getLoadersFromContext","candidateLoaders","contextLoaders","length"],"sources":["../../../../src/lib/loader-utils/loader-context.ts"],"sourcesContent":["import type {Loader, LoaderOptions, LoaderContext} from '@loaders.gl/loader-utils';\nimport {getFetchFunction} from './get-fetch-function';\nimport {extractQueryString, stripQueryString} from '../utils/url-utils';\nimport {path} from '@loaders.gl/loader-utils';\n\n/**\n * \"sub\" loaders invoked by other loaders get a \"context\" injected on `this`\n * The context will inject core methods like `parse` and contain information\n * about loaders and options passed in to the top-level `parse` call.\n *\n * @param context\n * @param options\n * @param previousContext\n */\nexport function getLoaderContext(\n context: Omit<LoaderContext, 'fetch'> & Partial<Pick<LoaderContext, 'fetch'>>,\n options: LoaderOptions,\n parentContext: LoaderContext | null\n): LoaderContext {\n // For recursive calls, we already have a context\n // TODO - add any additional loaders to context?\n if (parentContext) {\n return parentContext;\n }\n\n const newContext: LoaderContext = {\n fetch: getFetchFunction(options, context),\n ...context\n };\n\n // Parse URLs so that subloaders can easily generate correct strings\n if (newContext.url) {\n const baseUrl = stripQueryString(newContext.url);\n newContext.baseUrl = baseUrl;\n newContext.queryString = extractQueryString(newContext.url);\n newContext.filename = path.filename(baseUrl);\n newContext.baseUrl = path.dirname(baseUrl);\n }\n\n // Recursive loading does not use single loader\n if (!Array.isArray(newContext.loaders)) {\n newContext.loaders = null;\n }\n\n return newContext;\n}\n\n// eslint-disable-next-line complexity\nexport function getLoadersFromContext(\n loaders: Loader[] | Loader | undefined,\n context?: LoaderContext\n) {\n // A single non-array loader is force selected, but only on top-level (context === null)\n if (!context && loaders && !Array.isArray(loaders)) {\n return loaders;\n }\n\n // Create a merged list\n let candidateLoaders;\n if (loaders) {\n candidateLoaders = Array.isArray(loaders) ? loaders : [loaders];\n }\n if (context && context.loaders) {\n const contextLoaders = Array.isArray(context.loaders) ? context.loaders : [context.loaders];\n candidateLoaders = candidateLoaders ? [...candidateLoaders, ...contextLoaders] : contextLoaders;\n }\n // If no loaders, return null to look in globally registered loaders\n return candidateLoaders && candidateLoaders.length ? candidateLoaders : null;\n}\n"],"mappings":"AACA,SAAQA,gBAAgB,QAAO,sBAAsB;AACrD,SAAQC,kBAAkB,EAAEC,gBAAgB,QAAO,oBAAoB;AACvE,SAAQC,IAAI,QAAO,0BAA0B;AAW7C,OAAO,SAASC,gBAAgBA,CAC9BC,OAA6E,EAC7EC,OAAsB,EACtBC,aAAmC,EACpB;EAGf,IAAIA,aAAa,EAAE;IACjB,OAAOA,aAAa;EACtB;EAEA,MAAMC,UAAyB,GAAG;IAChCC,KAAK,EAAET,gBAAgB,CAACM,OAAO,EAAED,OAAO,CAAC;IACzC,GAAGA;EACL,CAAC;EAGD,IAAIG,UAAU,CAACE,GAAG,EAAE;IAClB,MAAMC,OAAO,GAAGT,gBAAgB,CAACM,UAAU,CAACE,GAAG,CAAC;IAChDF,UAAU,CAACG,OAAO,GAAGA,OAAO;IAC5BH,UAAU,CAACI,WAAW,GAAGX,kBAAkB,CAACO,UAAU,CAACE,GAAG,CAAC;IAC3DF,UAAU,CAACK,QAAQ,GAAGV,IAAI,CAACU,QAAQ,CAACF,OAAO,CAAC;IAC5CH,UAAU,CAACG,OAAO,GAAGR,IAAI,CAACW,OAAO,CAACH,OAAO,CAAC;EAC5C;EAGA,IAAI,CAACI,KAAK,CAACC,OAAO,CAACR,UAAU,CAACS,OAAO,CAAC,EAAE;IACtCT,UAAU,CAACS,OAAO,GAAG,IAAI;EAC3B;EAEA,OAAOT,UAAU;AACnB;AAGA,OAAO,SAASU,qBAAqBA,CACnCD,OAAsC,EACtCZ,OAAuB,EACvB;EAEA,IAAI,CAACA,OAAO,IAAIY,OAAO,IAAI,CAACF,KAAK,CAACC,OAAO,CAACC,OAAO,CAAC,EAAE;IAClD,OAAOA,OAAO;EAChB;EAGA,IAAIE,gBAAgB;EACpB,IAAIF,OAAO,EAAE;IACXE,gBAAgB,GAAGJ,KAAK,CAACC,OAAO,CAACC,OAAO,CAAC,GAAGA,OAAO,GAAG,CAACA,OAAO,CAAC;EACjE;EACA,IAAIZ,OAAO,IAAIA,OAAO,CAACY,OAAO,EAAE;IAC9B,MAAMG,cAAc,GAAGL,KAAK,CAACC,OAAO,CAACX,OAAO,CAACY,OAAO,CAAC,GAAGZ,OAAO,CAACY,OAAO,GAAG,CAACZ,OAAO,CAACY,OAAO,CAAC;IAC3FE,gBAAgB,GAAGA,gBAAgB,GAAG,CAAC,GAAGA,gBAAgB,EAAE,GAAGC,cAAc,CAAC,GAAGA,cAAc;EACjG;EAEA,OAAOD,gBAAgB,IAAIA,gBAAgB,CAACE,MAAM,GAAGF,gBAAgB,GAAG,IAAI;AAC9E"}
@@ -1,38 +1,44 @@
1
1
  import { isResponse, isBlob } from '../../javascript-utils/is-type';
2
2
  import { parseMIMEType, parseMIMETypeFromURL } from './mime-type-utils';
3
- const QUERY_STRING_PATTERN = /\?.*/;
4
- export function getResourceUrlAndType(resource) {
3
+ import { stripQueryString } from './url-utils';
4
+ export function getResourceUrl(resource) {
5
5
  if (isResponse(resource)) {
6
- const url = stripQueryString(resource.url || '');
7
- const contentTypeHeader = resource.headers.get('content-type') || '';
8
- return {
9
- url,
10
- type: parseMIMEType(contentTypeHeader) || parseMIMETypeFromURL(url)
11
- };
6
+ const response = resource;
7
+ return response.url;
12
8
  }
13
9
  if (isBlob(resource)) {
14
- return {
15
- url: stripQueryString(resource.name || ''),
16
- type: resource.type || ''
17
- };
10
+ const blob = resource;
11
+ return blob.name || '';
18
12
  }
19
13
  if (typeof resource === 'string') {
20
- return {
21
- url: stripQueryString(resource),
22
- type: parseMIMETypeFromURL(resource)
23
- };
24
- }
25
- return {
26
- url: '',
27
- type: ''
28
- };
14
+ return resource;
15
+ }
16
+ return '';
17
+ }
18
+ export function getResourceMIMEType(resource) {
19
+ if (isResponse(resource)) {
20
+ const response = resource;
21
+ const contentTypeHeader = response.headers.get('content-type') || '';
22
+ const noQueryUrl = stripQueryString(response.url);
23
+ return parseMIMEType(contentTypeHeader) || parseMIMETypeFromURL(noQueryUrl);
24
+ }
25
+ if (isBlob(resource)) {
26
+ const blob = resource;
27
+ return blob.type || '';
28
+ }
29
+ if (typeof resource === 'string') {
30
+ return parseMIMETypeFromURL(resource);
31
+ }
32
+ return '';
29
33
  }
30
34
  export function getResourceContentLength(resource) {
31
35
  if (isResponse(resource)) {
32
- return resource.headers['content-length'] || -1;
36
+ const response = resource;
37
+ return response.headers['content-length'] || -1;
33
38
  }
34
39
  if (isBlob(resource)) {
35
- return resource.size;
40
+ const blob = resource;
41
+ return blob.size;
36
42
  }
37
43
  if (typeof resource === 'string') {
38
44
  return resource.length;
@@ -45,7 +51,4 @@ export function getResourceContentLength(resource) {
45
51
  }
46
52
  return -1;
47
53
  }
48
- function stripQueryString(url) {
49
- return url.replace(QUERY_STRING_PATTERN, '');
50
- }
51
54
  //# sourceMappingURL=resource-utils.js.map
@@ -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,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
+ {"version":3,"file":"resource-utils.js","names":["isResponse","isBlob","parseMIMEType","parseMIMETypeFromURL","stripQueryString","getResourceUrl","resource","response","url","blob","name","getResourceMIMEType","contentTypeHeader","headers","get","noQueryUrl","type","getResourceContentLength","size","length","ArrayBuffer","byteLength","isView"],"sources":["../../../../src/lib/utils/resource-utils.ts"],"sourcesContent":["// loaders.gl, MIT license\n\nimport {isResponse, isBlob} from '../../javascript-utils/is-type';\nimport {parseMIMEType, parseMIMETypeFromURL} from './mime-type-utils';\nimport {stripQueryString} from './url-utils';\n\n/**\n * A loadable resource. Includes:\n * `Response`, `Blob` (`File` is a subclass), string URLs and data URLs\n */\nexport type Resource = Response | Blob | string;\n\n/**\n * Returns the URL associated with this resource.\n * The returned value may include a query string and need further processing.\n * If it cannot determine url, the corresponding value will be an empty string\n *\n * @todo string parameters are assumed to be URLs\n */\nexport function getResourceUrl(resource: unknown): string {\n // If resource is a `Response`, it contains the information directly as a field\n if (isResponse(resource)) {\n const response = resource as Response;\n return response.url;\n }\n\n // If the resource is a Blob or a File (subclass of Blob)\n if (isBlob(resource)) {\n const blob = resource as Blob;\n // File objects have a \"name\" property. Blob objects don't have any\n // url (name) information\n return blob.name || '';\n }\n\n if (typeof resource === 'string') {\n return resource;\n }\n\n // Unknown\n return '';\n}\n\n/**\n * Returns the URL associated with this resource.\n * The returned value may include a query string and need further processing.\n * If it cannot determine url, the corresponding value will be an empty string\n *\n * @todo string parameters are assumed to be URLs\n */\nexport function getResourceMIMEType(resource: unknown): string {\n // If resource is a response, it contains the information directly\n if (isResponse(resource)) {\n const response = resource as Response;\n const contentTypeHeader = response.headers.get('content-type') || '';\n const noQueryUrl = stripQueryString(response.url);\n return parseMIMEType(contentTypeHeader) || parseMIMETypeFromURL(noQueryUrl);\n }\n\n // If the resource is a Blob or a File (subclass of Blob)\n if (isBlob(resource)) {\n const blob = resource as Blob;\n return blob.type || '';\n }\n\n if (typeof resource === 'string') {\n return parseMIMETypeFromURL(resource);\n }\n\n // Unknown\n return '';\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: unknown): number {\n if (isResponse(resource)) {\n const response = resource as Response;\n return response.headers['content-length'] || -1;\n }\n if (isBlob(resource)) {\n const blob = resource as Blob;\n return blob.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"],"mappings":"AAEA,SAAQA,UAAU,EAAEC,MAAM,QAAO,gCAAgC;AACjE,SAAQC,aAAa,EAAEC,oBAAoB,QAAO,mBAAmB;AACrE,SAAQC,gBAAgB,QAAO,aAAa;AAe5C,OAAO,SAASC,cAAcA,CAACC,QAAiB,EAAU;EAExD,IAAIN,UAAU,CAACM,QAAQ,CAAC,EAAE;IACxB,MAAMC,QAAQ,GAAGD,QAAoB;IACrC,OAAOC,QAAQ,CAACC,GAAG;EACrB;EAGA,IAAIP,MAAM,CAACK,QAAQ,CAAC,EAAE;IACpB,MAAMG,IAAI,GAAGH,QAAgB;IAG7B,OAAOG,IAAI,CAACC,IAAI,IAAI,EAAE;EACxB;EAEA,IAAI,OAAOJ,QAAQ,KAAK,QAAQ,EAAE;IAChC,OAAOA,QAAQ;EACjB;EAGA,OAAO,EAAE;AACX;AASA,OAAO,SAASK,mBAAmBA,CAACL,QAAiB,EAAU;EAE7D,IAAIN,UAAU,CAACM,QAAQ,CAAC,EAAE;IACxB,MAAMC,QAAQ,GAAGD,QAAoB;IACrC,MAAMM,iBAAiB,GAAGL,QAAQ,CAACM,OAAO,CAACC,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE;IACpE,MAAMC,UAAU,GAAGX,gBAAgB,CAACG,QAAQ,CAACC,GAAG,CAAC;IACjD,OAAON,aAAa,CAACU,iBAAiB,CAAC,IAAIT,oBAAoB,CAACY,UAAU,CAAC;EAC7E;EAGA,IAAId,MAAM,CAACK,QAAQ,CAAC,EAAE;IACpB,MAAMG,IAAI,GAAGH,QAAgB;IAC7B,OAAOG,IAAI,CAACO,IAAI,IAAI,EAAE;EACxB;EAEA,IAAI,OAAOV,QAAQ,KAAK,QAAQ,EAAE;IAChC,OAAOH,oBAAoB,CAACG,QAAQ,CAAC;EACvC;EAGA,OAAO,EAAE;AACX;AASA,OAAO,SAASW,wBAAwBA,CAACX,QAAiB,EAAU;EAClE,IAAIN,UAAU,CAACM,QAAQ,CAAC,EAAE;IACxB,MAAMC,QAAQ,GAAGD,QAAoB;IACrC,OAAOC,QAAQ,CAACM,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;EACjD;EACA,IAAIZ,MAAM,CAACK,QAAQ,CAAC,EAAE;IACpB,MAAMG,IAAI,GAAGH,QAAgB;IAC7B,OAAOG,IAAI,CAACS,IAAI;EAClB;EACA,IAAI,OAAOZ,QAAQ,KAAK,QAAQ,EAAE;IAEhC,OAAOA,QAAQ,CAACa,MAAM;EACxB;EACA,IAAIb,QAAQ,YAAYc,WAAW,EAAE;IACnC,OAAOd,QAAQ,CAACe,UAAU;EAC5B;EACA,IAAID,WAAW,CAACE,MAAM,CAAChB,QAAQ,CAAC,EAAE;IAChC,OAAOA,QAAQ,CAACe,UAAU;EAC5B;EACA,OAAO,CAAC,CAAC;AACX"}
@@ -1,5 +1,5 @@
1
1
  import { isResponse } from '../../javascript-utils/is-type';
2
- import { getResourceContentLength, getResourceUrlAndType } from './resource-utils';
2
+ import { getResourceContentLength, getResourceUrl, getResourceMIMEType } from './resource-utils';
3
3
  export async function makeResponse(resource) {
4
4
  if (isResponse(resource)) {
5
5
  return resource;
@@ -9,10 +9,8 @@ export async function makeResponse(resource) {
9
9
  if (contentLength >= 0) {
10
10
  headers['content-length'] = String(contentLength);
11
11
  }
12
- const {
13
- url,
14
- type
15
- } = getResourceUrlAndType(resource);
12
+ const url = getResourceUrl(resource);
13
+ const type = getResourceMIMEType(resource);
16
14
  if (type) {
17
15
  headers['content-type'] = type;
18
16
  }