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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (150) hide show
  1. package/dist/dist.min.js +34 -39
  2. package/dist/es5/index.js.map +1 -1
  3. package/dist/es5/iterators/batch-iterators/timed-batch-iterator.js.map +1 -1
  4. package/dist/es5/iterators/make-stream/make-dom-stream.js.map +1 -1
  5. package/dist/es5/iterators/make-stream/make-node-stream.js.map +1 -1
  6. package/dist/es5/javascript-utils/is-type.js +1 -1
  7. package/dist/es5/javascript-utils/is-type.js.map +1 -1
  8. package/dist/es5/lib/api/encode-table.js.map +1 -1
  9. package/dist/es5/lib/api/encode.js.map +1 -1
  10. package/dist/es5/lib/api/load-in-batches.js +6 -3
  11. package/dist/es5/lib/api/load-in-batches.js.map +1 -1
  12. package/dist/es5/lib/api/load.js.map +1 -1
  13. package/dist/es5/lib/api/parse-in-batches.js +11 -13
  14. package/dist/es5/lib/api/parse-in-batches.js.map +1 -1
  15. package/dist/es5/lib/api/parse-sync.js +2 -6
  16. package/dist/es5/lib/api/parse-sync.js.map +1 -1
  17. package/dist/es5/lib/api/parse.js +20 -22
  18. package/dist/es5/lib/api/parse.js.map +1 -1
  19. package/dist/es5/lib/api/save.js.map +1 -1
  20. package/dist/es5/lib/api/select-loader.js +5 -3
  21. package/dist/es5/lib/api/select-loader.js.map +1 -1
  22. package/dist/es5/lib/filesystems/browser-filesystem.js.map +1 -1
  23. package/dist/es5/lib/filesystems/filesystem.js.map +1 -1
  24. package/dist/es5/lib/init.js +1 -1
  25. package/dist/es5/lib/init.js.map +1 -1
  26. package/dist/es5/lib/loader-utils/get-data.js.map +1 -1
  27. package/dist/es5/lib/loader-utils/get-fetch-function.js.map +1 -1
  28. package/dist/es5/lib/loader-utils/loader-context.js +2 -2
  29. package/dist/es5/lib/loader-utils/loader-context.js.map +1 -1
  30. package/dist/es5/lib/loader-utils/loggers.js.map +1 -1
  31. package/dist/es5/lib/loader-utils/option-utils.js +3 -4
  32. package/dist/es5/lib/loader-utils/option-utils.js.map +1 -1
  33. package/dist/es5/lib/progress/fetch-progress.js.map +1 -1
  34. package/dist/es5/null-loader.js +6 -14
  35. package/dist/es5/null-loader.js.map +1 -1
  36. package/dist/esm/index.js.map +1 -1
  37. package/dist/esm/iterators/batch-iterators/timed-batch-iterator.js.map +1 -1
  38. package/dist/esm/iterators/make-stream/make-dom-stream.js.map +1 -1
  39. package/dist/esm/iterators/make-stream/make-node-stream.js.map +1 -1
  40. package/dist/esm/javascript-utils/is-type.js +1 -1
  41. package/dist/esm/javascript-utils/is-type.js.map +1 -1
  42. package/dist/esm/lib/api/encode-table.js.map +1 -1
  43. package/dist/esm/lib/api/encode.js.map +1 -1
  44. package/dist/esm/lib/api/load-in-batches.js +6 -3
  45. package/dist/esm/lib/api/load-in-batches.js.map +1 -1
  46. package/dist/esm/lib/api/load.js.map +1 -1
  47. package/dist/esm/lib/api/parse-in-batches.js +3 -4
  48. package/dist/esm/lib/api/parse-in-batches.js.map +1 -1
  49. package/dist/esm/lib/api/parse-sync.js +2 -4
  50. package/dist/esm/lib/api/parse-sync.js.map +1 -1
  51. package/dist/esm/lib/api/parse.js +10 -11
  52. package/dist/esm/lib/api/parse.js.map +1 -1
  53. package/dist/esm/lib/api/save.js.map +1 -1
  54. package/dist/esm/lib/api/select-loader.js +5 -3
  55. package/dist/esm/lib/api/select-loader.js.map +1 -1
  56. package/dist/esm/lib/filesystems/browser-filesystem.js.map +1 -1
  57. package/dist/esm/lib/filesystems/filesystem.js.map +1 -1
  58. package/dist/esm/lib/init.js +1 -1
  59. package/dist/esm/lib/init.js.map +1 -1
  60. package/dist/esm/lib/loader-utils/get-data.js.map +1 -1
  61. package/dist/esm/lib/loader-utils/get-fetch-function.js.map +1 -1
  62. package/dist/esm/lib/loader-utils/loader-context.js +2 -2
  63. package/dist/esm/lib/loader-utils/loader-context.js.map +1 -1
  64. package/dist/esm/lib/loader-utils/loggers.js.map +1 -1
  65. package/dist/esm/lib/loader-utils/option-utils.js +2 -2
  66. package/dist/esm/lib/loader-utils/option-utils.js.map +1 -1
  67. package/dist/esm/lib/progress/fetch-progress.js.map +1 -1
  68. package/dist/esm/null-loader.js +6 -14
  69. package/dist/esm/null-loader.js.map +1 -1
  70. package/dist/index.d.ts +1 -0
  71. package/dist/index.d.ts.map +1 -1
  72. package/dist/iterators/batch-iterators/timed-batch-iterator.d.ts +1 -1
  73. package/dist/iterators/batch-iterators/timed-batch-iterator.d.ts.map +1 -1
  74. package/dist/iterators/make-stream/make-dom-stream.d.ts.map +1 -1
  75. package/dist/iterators/make-stream/make-dom-stream.js +1 -0
  76. package/dist/iterators/make-stream/make-node-stream.d.ts.map +1 -1
  77. package/dist/iterators/make-stream/make-node-stream.js +5 -2
  78. package/dist/javascript-utils/is-type.d.ts +5 -5
  79. package/dist/javascript-utils/is-type.d.ts.map +1 -1
  80. package/dist/javascript-utils/is-type.js +1 -1
  81. package/dist/lib/api/encode.d.ts +5 -5
  82. package/dist/lib/api/encode.d.ts.map +1 -1
  83. package/dist/lib/api/load-in-batches.d.ts +5 -0
  84. package/dist/lib/api/load-in-batches.d.ts.map +1 -1
  85. package/dist/lib/api/load-in-batches.js +10 -3
  86. package/dist/lib/api/load.d.ts +1 -2
  87. package/dist/lib/api/load.d.ts.map +1 -1
  88. package/dist/lib/api/parse-in-batches.d.ts +13 -7
  89. package/dist/lib/api/parse-in-batches.d.ts.map +1 -1
  90. package/dist/lib/api/parse-in-batches.js +2 -2
  91. package/dist/lib/api/parse-sync.d.ts +13 -7
  92. package/dist/lib/api/parse-sync.d.ts.map +1 -1
  93. package/dist/lib/api/parse-sync.js +2 -7
  94. package/dist/lib/api/parse.d.ts +11 -1
  95. package/dist/lib/api/parse.d.ts.map +1 -1
  96. package/dist/lib/api/parse.js +14 -11
  97. package/dist/lib/api/save.d.ts +2 -2
  98. package/dist/lib/api/save.d.ts.map +1 -1
  99. package/dist/lib/api/select-loader.d.ts.map +1 -1
  100. package/dist/lib/api/select-loader.js +8 -3
  101. package/dist/lib/filesystems/browser-filesystem.d.ts +2 -2
  102. package/dist/lib/filesystems/browser-filesystem.d.ts.map +1 -1
  103. package/dist/lib/filesystems/browser-filesystem.js +1 -1
  104. package/dist/lib/filesystems/filesystem.d.ts +3 -3
  105. package/dist/lib/filesystems/filesystem.d.ts.map +1 -1
  106. package/dist/lib/filesystems/filesystem.js +1 -0
  107. package/dist/lib/init.d.ts.map +1 -1
  108. package/dist/lib/init.js +1 -0
  109. package/dist/lib/loader-utils/get-data.d.ts.map +1 -1
  110. package/dist/lib/loader-utils/get-data.js +1 -0
  111. package/dist/lib/loader-utils/get-fetch-function.d.ts +2 -2
  112. package/dist/lib/loader-utils/get-fetch-function.d.ts.map +1 -1
  113. package/dist/lib/loader-utils/loader-context.d.ts +5 -2
  114. package/dist/lib/loader-utils/loader-context.d.ts.map +1 -1
  115. package/dist/lib/loader-utils/loader-context.js +3 -3
  116. package/dist/lib/loader-utils/loggers.d.ts +10 -8
  117. package/dist/lib/loader-utils/loggers.d.ts.map +1 -1
  118. package/dist/lib/loader-utils/option-utils.d.ts +1 -1
  119. package/dist/lib/loader-utils/option-utils.d.ts.map +1 -1
  120. package/dist/lib/loader-utils/option-utils.js +7 -5
  121. package/dist/null-loader.d.ts +6 -3
  122. package/dist/null-loader.d.ts.map +1 -1
  123. package/dist/null-loader.js +9 -14
  124. package/dist/null-worker-node.js +14 -14
  125. package/dist/null-worker.js +14 -14
  126. package/package.json +4 -4
  127. package/src/index.ts +1 -0
  128. package/src/iterators/batch-iterators/timed-batch-iterator.ts +4 -1
  129. package/src/iterators/make-stream/make-dom-stream.ts +2 -1
  130. package/src/iterators/make-stream/make-node-stream.ts +5 -2
  131. package/src/javascript-utils/is-type.ts +12 -8
  132. package/src/lib/api/encode-table.ts +1 -1
  133. package/src/lib/api/encode.ts +10 -10
  134. package/src/lib/api/load-in-batches.ts +45 -7
  135. package/src/lib/api/load.ts +2 -5
  136. package/src/lib/api/parse-in-batches.ts +44 -15
  137. package/src/lib/api/parse-sync.ts +38 -17
  138. package/src/lib/api/parse.ts +36 -15
  139. package/src/lib/api/save.ts +2 -2
  140. package/src/lib/api/select-loader.ts +24 -13
  141. package/src/lib/filesystems/browser-filesystem.ts +3 -3
  142. package/src/lib/filesystems/filesystem.ts +5 -3
  143. package/src/lib/init.ts +1 -0
  144. package/src/lib/loader-utils/get-data.ts +1 -0
  145. package/src/lib/loader-utils/get-fetch-function.ts +2 -2
  146. package/src/lib/loader-utils/loader-context.ts +8 -5
  147. package/src/lib/loader-utils/loggers.ts +10 -8
  148. package/src/lib/loader-utils/option-utils.ts +23 -14
  149. package/src/lib/progress/fetch-progress.ts +9 -1
  150. package/src/null-loader.ts +23 -17
@@ -1,24 +1,29 @@
1
1
  "use strict";
2
+ // loaders.gl, MIT license
2
3
  Object.defineProperty(exports, "__esModule", { value: true });
3
4
  exports.loadInBatches = void 0;
4
5
  const normalize_loader_1 = require("../loader-utils/normalize-loader");
5
6
  const get_fetch_function_1 = require("../loader-utils/get-fetch-function");
6
7
  const parse_in_batches_1 = require("./parse-in-batches");
7
8
  function loadInBatches(files, loaders, options, context) {
9
+ let loadersArray;
8
10
  // Signature: load(url, options)
9
11
  if (!Array.isArray(loaders) && !(0, normalize_loader_1.isLoaderObject)(loaders)) {
10
12
  context = undefined; // context not supported in short signature
11
13
  options = loaders;
12
- loaders = null;
14
+ loadersArray = undefined;
15
+ }
16
+ else {
17
+ loadersArray = loaders;
13
18
  }
14
19
  // Select fetch function
15
20
  const fetch = (0, get_fetch_function_1.getFetchFunction)(options || {});
16
21
  // Single url/file
17
22
  if (!Array.isArray(files)) {
18
- return loadOneFileInBatches(files, loaders, options, fetch);
23
+ return loadOneFileInBatches(files, loadersArray, options || {}, fetch);
19
24
  }
20
25
  // Multiple URLs / files
21
- const promises = files.map((file) => loadOneFileInBatches(file, loaders, options, fetch));
26
+ const promises = files.map((file) => loadOneFileInBatches(file, loadersArray, options || {}, fetch));
22
27
  // No point in waiting here for all responses before starting to stream individual streams?
23
28
  return promises;
24
29
  }
@@ -27,7 +32,9 @@ async function loadOneFileInBatches(file, loaders, options, fetch) {
27
32
  if (typeof file === 'string') {
28
33
  const url = file;
29
34
  const response = await fetch(url);
35
+ // @ts-expect-error
30
36
  return await (0, parse_in_batches_1.parseInBatches)(response, loaders, options);
31
37
  }
38
+ // @ts-expect-error TODO
32
39
  return await (0, parse_in_batches_1.parseInBatches)(file, loaders, options);
33
40
  }
@@ -10,6 +10,5 @@ import type { LoaderOptionsType, LoaderReturnType } from '@loaders.gl/loader-uti
10
10
  * @param context
11
11
  */
12
12
  export declare function load<LoaderT extends Loader>(url: string | DataType, loader: LoaderT, options?: LoaderOptionsType<LoaderT>, context?: LoaderContext): Promise<LoaderReturnType<LoaderT>>;
13
- export declare function load<LoaderT extends Loader, // eslint-disable-line @typescript-eslint/no-unused-vars
14
- LoaderOptionsT extends LoaderOptions = LoaderOptions>(url: string | DataType, loaders: Loader[] | LoaderOptions, options?: LoaderOptionsT, context?: LoaderContext): Promise<any>;
13
+ export declare function load<LoaderOptionsT extends LoaderOptions = LoaderOptions>(url: string | DataType, loaders: Loader[] | LoaderOptions, options?: LoaderOptionsT, context?: LoaderContext): Promise<any>;
15
14
  //# sourceMappingURL=load.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"load.d.ts","sourceRoot":"","sources":["../../../src/lib/api/load.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAC7F,OAAO,KAAK,EAAC,iBAAiB,EAAE,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAOlF;;;;;;;;GAQG;AAEH,wBAAsB,IAAI,CAAC,OAAO,SAAS,MAAM,EAC/C,GAAG,EAAE,MAAM,GAAG,QAAQ,EACtB,MAAM,EAAE,OAAO,EACf,OAAO,CAAC,EAAE,iBAAiB,CAAC,OAAO,CAAC,EACpC,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;AAEtC,wBAAsB,IAAI,CACxB,OAAO,SAAS,MAAM,EAAE,yDAAyD;AACjF,cAAc,SAAS,aAAa,GAAG,aAAa,EAEpD,GAAG,EAAE,MAAM,GAAG,QAAQ,EACtB,OAAO,EAAE,MAAM,EAAE,GAAG,aAAa,EACjC,OAAO,CAAC,EAAE,cAAc,EACxB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,GAAG,CAAC,CAAC"}
1
+ {"version":3,"file":"load.d.ts","sourceRoot":"","sources":["../../../src/lib/api/load.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAC7F,OAAO,KAAK,EAAC,iBAAiB,EAAE,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAOlF;;;;;;;;GAQG;AAEH,wBAAsB,IAAI,CAAC,OAAO,SAAS,MAAM,EAC/C,GAAG,EAAE,MAAM,GAAG,QAAQ,EACtB,MAAM,EAAE,OAAO,EACf,OAAO,CAAC,EAAE,iBAAiB,CAAC,OAAO,CAAC,EACpC,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;AAEtC,wBAAsB,IAAI,CAAC,cAAc,SAAS,aAAa,GAAG,aAAa,EAC7E,GAAG,EAAE,MAAM,GAAG,QAAQ,EACtB,OAAO,EAAE,MAAM,EAAE,GAAG,aAAa,EACjC,OAAO,CAAC,EAAE,cAAc,EACxB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,GAAG,CAAC,CAAC"}
@@ -1,10 +1,16 @@
1
- import type { BatchableDataType, Loader, LoaderContext, LoaderOptions } from '@loaders.gl/loader-utils';
1
+ import type { Loader, LoaderOptions } from '@loaders.gl/loader-utils';
2
+ import type { LoaderContext, BatchableDataType } from '@loaders.gl/loader-utils';
3
+ import type { LoaderBatchType, LoaderOptionsType } from '@loaders.gl/loader-utils';
2
4
  /**
3
- * Parses `data` using a specified loader
4
- * @param data
5
- * @param loaders
6
- * @param options
7
- * @param context
5
+ * Parses `data` synchronously using a specified loader
8
6
  */
9
- export declare function parseInBatches(data: BatchableDataType, loaders?: Loader | Loader[] | LoaderOptions, options?: LoaderOptions, context?: LoaderContext): Promise<AsyncIterable<any>>;
7
+ export declare function parseInBatches<LoaderT extends Loader, OptionsT extends LoaderOptions = LoaderOptionsType<LoaderT>>(data: BatchableDataType, loader: LoaderT, options?: OptionsT, context?: LoaderContext): Promise<AsyncIterable<LoaderBatchType<LoaderT>>>;
8
+ /**
9
+ * Parses `data` using one of the supplied loaders
10
+ */
11
+ export declare function parseInBatches(data: BatchableDataType, loaders: Loader[], options?: LoaderOptions, context?: LoaderContext): Promise<AsyncIterable<any>>;
12
+ /**
13
+ * Parses `data` in batches by selecting a pre-registered loader
14
+ */
15
+ export declare function parseInBatches(data: BatchableDataType, options?: LoaderOptions): Promise<AsyncIterable<any>>;
10
16
  //# sourceMappingURL=parse-in-batches.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"parse-in-batches.d.ts","sourceRoot":"","sources":["../../../src/lib/api/parse-in-batches.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,iBAAiB,EACjB,MAAM,EAEN,aAAa,EACb,aAAa,EACd,MAAM,0BAA0B,CAAC;AAYlC;;;;;;GAMG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,iBAAiB,EACvB,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,aAAa,EAC3C,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAoC7B"}
1
+ {"version":3,"file":"parse-in-batches.d.ts","sourceRoot":"","sources":["../../../src/lib/api/parse-in-batches.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,MAAM,EAAoB,aAAa,EAAC,MAAM,0BAA0B,CAAC;AACtF,OAAO,KAAK,EAAC,aAAa,EAAE,iBAAiB,EAAC,MAAM,0BAA0B,CAAC;AAC/E,OAAO,KAAK,EAAC,eAAe,EAAE,iBAAiB,EAAC,MAAM,0BAA0B,CAAC;AAYjF;;GAEG;AACH,wBAAsB,cAAc,CAClC,OAAO,SAAS,MAAM,EACtB,QAAQ,SAAS,aAAa,GAAG,iBAAiB,CAAC,OAAO,CAAC,EAE3D,IAAI,EAAE,iBAAiB,EACvB,MAAM,EAAE,OAAO,EACf,OAAO,CAAC,EAAE,QAAQ,EAClB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,aAAa,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;AAEpD;;GAEG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,iBAAiB,EACvB,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC;AAE/B;;GAEG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,iBAAiB,EACvB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC"}
@@ -1,4 +1,5 @@
1
1
  "use strict";
2
+ // loaders.gl, MIT license
2
3
  Object.defineProperty(exports, "__esModule", { value: true });
3
4
  exports.parseInBatches = void 0;
4
5
  const loader_utils_1 = require("@loaders.gl/loader-utils");
@@ -18,7 +19,6 @@ const parse_1 = require("./parse");
18
19
  * @param context
19
20
  */
20
21
  async function parseInBatches(data, loaders, options, context) {
21
- (0, loader_utils_1.assert)(!context || typeof context === 'object'); // parseInBatches no longer accepts final url
22
22
  const loaderArray = Array.isArray(loaders) ? loaders : undefined;
23
23
  // Signature: parseInBatches(data, options, url) - Uses registered loaders
24
24
  if (!Array.isArray(loaders) && !(0, normalize_loader_1.isLoaderObject)(loaders)) {
@@ -40,7 +40,7 @@ async function parseInBatches(data, loaders, options, context) {
40
40
  }
41
41
  // Normalize options
42
42
  options = (0, option_utils_1.normalizeOptions)(options, loader, loaderArray, url);
43
- context = (0, loader_context_1.getLoaderContext)({ url, parseInBatches, parse: parse_1.parse, loaders: loaderArray }, options, context || null);
43
+ context = (0, loader_context_1.getLoaderContext)({ url, _parseInBatches: parseInBatches, _parse: parse_1.parse, loaders: loaderArray }, options, context || null);
44
44
  return await parseWithLoaderInBatches(loader, data, options, context);
45
45
  }
46
46
  exports.parseInBatches = parseInBatches;
@@ -1,10 +1,16 @@
1
- import type { SyncDataType, Loader, LoaderContext, LoaderOptions } from '@loaders.gl/loader-utils';
1
+ import type { Loader, LoaderOptions } from '@loaders.gl/loader-utils';
2
+ import type { LoaderContext, SyncDataType } from '@loaders.gl/loader-utils';
3
+ import type { LoaderOptionsType, LoaderReturnType } from '@loaders.gl/loader-utils';
2
4
  /**
3
- * Parses `data` synchronously using a specified loader
4
- * @param data
5
- * @param loaders
6
- * @param options
7
- * @param context
5
+ * Parses `data` synchronously using the specified loader
8
6
  */
9
- export declare function parseSync(data: SyncDataType, loaders?: Loader | Loader[] | LoaderOptions, options?: LoaderOptions, context?: LoaderContext): any;
7
+ export declare function parseSync<LoaderT extends Loader, OptionsT extends LoaderOptions = LoaderOptionsType<LoaderT>>(data: SyncDataType, loader: LoaderT, options?: OptionsT, context?: LoaderContext): LoaderReturnType<LoaderT>;
8
+ /**
9
+ * Parses `data` synchronously by matching one of the supplied loaders
10
+ */
11
+ export declare function parseSync(data: SyncDataType, loaders: Loader[], options?: LoaderOptions, context?: LoaderContext): any;
12
+ /**
13
+ * Parses `data` synchronously by matching a pre=registered loader
14
+ */
15
+ export declare function parseSync(data: SyncDataType, options?: LoaderOptions): any;
10
16
  //# sourceMappingURL=parse-sync.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"parse-sync.d.ts","sourceRoot":"","sources":["../../../src/lib/api/parse-sync.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EACZ,MAAM,EAEN,aAAa,EACb,aAAa,EACd,MAAM,0BAA0B,CAAC;AASlC;;;;;;GAMG;AACH,wBAAgB,SAAS,CACvB,IAAI,EAAE,YAAY,EAClB,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,aAAa,EAC3C,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,GACtB,GAAG,CAuCL"}
1
+ {"version":3,"file":"parse-sync.d.ts","sourceRoot":"","sources":["../../../src/lib/api/parse-sync.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,MAAM,EAAoB,aAAa,EAAC,MAAM,0BAA0B,CAAC;AACtF,OAAO,KAAK,EAAC,aAAa,EAAE,YAAY,EAAC,MAAM,0BAA0B,CAAC;AAC1E,OAAO,KAAK,EAAC,iBAAiB,EAAE,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAUlF;;GAEG;AACH,wBAAgB,SAAS,CACvB,OAAO,SAAS,MAAM,EACtB,QAAQ,SAAS,aAAa,GAAG,iBAAiB,CAAC,OAAO,CAAC,EAE3D,IAAI,EAAE,YAAY,EAClB,MAAM,EAAE,OAAO,EACf,OAAO,CAAC,EAAE,QAAQ,EAClB,OAAO,CAAC,EAAE,aAAa,GACtB,gBAAgB,CAAC,OAAO,CAAC,CAAC;AAE7B;;GAEG;AACH,wBAAgB,SAAS,CACvB,IAAI,EAAE,YAAY,EAClB,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,GACtB,GAAG,CAAC;AAEP;;GAEG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,GAAG,CAAC"}
@@ -1,7 +1,7 @@
1
1
  "use strict";
2
+ // loaders.gl, MIT license
2
3
  Object.defineProperty(exports, "__esModule", { value: true });
3
4
  exports.parseSync = void 0;
4
- const loader_utils_1 = require("@loaders.gl/loader-utils");
5
5
  const select_loader_1 = require("./select-loader");
6
6
  const normalize_loader_1 = require("../loader-utils/normalize-loader");
7
7
  const option_utils_1 = require("../loader-utils/option-utils");
@@ -10,13 +10,8 @@ const loader_context_1 = require("../loader-utils/loader-context");
10
10
  const resource_utils_1 = require("../utils/resource-utils");
11
11
  /**
12
12
  * Parses `data` synchronously using a specified loader
13
- * @param data
14
- * @param loaders
15
- * @param options
16
- * @param context
17
13
  */
18
14
  function parseSync(data, loaders, options, context) {
19
- (0, loader_utils_1.assert)(!context || typeof context === 'object'); // parseSync no longer accepts final url
20
15
  // Signature: parseSync(data, options)
21
16
  // Uses registered loaders
22
17
  if (!Array.isArray(loaders) && !(0, normalize_loader_1.isLoaderObject)(loaders)) {
@@ -41,7 +36,7 @@ function parseSync(data, loaders, options, context) {
41
36
  const parse = () => {
42
37
  throw new Error('parseSync called parse (which is async');
43
38
  };
44
- context = (0, loader_context_1.getLoaderContext)({ url, parseSync, parse, loaders: loaders }, options, context || null);
39
+ context = (0, loader_context_1.getLoaderContext)({ url, _parseSync: parse, _parse: parse, loaders: loaders }, options, context || null);
45
40
  return parseWithLoaderSync(loader, data, options, context);
46
41
  }
47
42
  exports.parseSync = parseSync;
@@ -1,6 +1,16 @@
1
- import type { DataType, Loader, LoaderContext, LoaderOptions } from '@loaders.gl/loader-utils';
1
+ import type { Loader, LoaderContext, LoaderOptions } from '@loaders.gl/loader-utils';
2
+ import type { DataType } from '@loaders.gl/loader-utils';
2
3
  import type { LoaderOptionsType, LoaderReturnType } from '@loaders.gl/loader-utils';
4
+ /**
5
+ * Parses `data` asynchronously using the supplied loader
6
+ */
3
7
  export declare function parse<LoaderT extends Loader, OptionsT extends LoaderOptions = LoaderOptionsType<LoaderT>>(data: DataType | Promise<DataType>, loader: LoaderT, options?: OptionsT, context?: LoaderContext): Promise<LoaderReturnType<LoaderT>>;
8
+ /**
9
+ * Parses `data` asynchronously by matching one of the supplied loader
10
+ */
4
11
  export declare function parse(data: DataType | Promise<DataType>, loaders: Loader[], options?: LoaderOptions, context?: LoaderContext): Promise<any>;
12
+ /**
13
+ * Parses data asynchronously by matching a pre-registered loader
14
+ */
5
15
  export declare function parse(data: DataType | Promise<DataType>, options?: LoaderOptions): Promise<any>;
6
16
  //# sourceMappingURL=parse.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"parse.d.ts","sourceRoot":"","sources":["../../../src/lib/api/parse.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAC7F,OAAO,KAAK,EAAC,iBAAiB,EAAE,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAalF,wBAAsB,KAAK,CACzB,OAAO,SAAS,MAAM,EACtB,QAAQ,SAAS,aAAa,GAAG,iBAAiB,CAAC,OAAO,CAAC,EAE3D,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,EAClC,MAAM,EAAE,OAAO,EACf,OAAO,CAAC,EAAE,QAAQ,EAClB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;AAEtC,wBAAsB,KAAK,CACzB,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,EAClC,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,GAAG,CAAC,CAAC;AAEhB,wBAAsB,KAAK,CACzB,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,EAClC,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,GAAG,CAAC,CAAC"}
1
+ {"version":3,"file":"parse.d.ts","sourceRoot":"","sources":["../../../src/lib/api/parse.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,MAAM,EAAE,aAAa,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AACnF,OAAO,KAAK,EAAC,QAAQ,EAAmB,MAAM,0BAA0B,CAAC;AACzE,OAAO,KAAK,EAAC,iBAAiB,EAAE,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAalF;;GAEG;AACH,wBAAsB,KAAK,CACzB,OAAO,SAAS,MAAM,EACtB,QAAQ,SAAS,aAAa,GAAG,iBAAiB,CAAC,OAAO,CAAC,EAE3D,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,EAClC,MAAM,EAAE,OAAO,EACf,OAAO,CAAC,EAAE,QAAQ,EAClB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;AAEtC;;GAEG;AACH,wBAAsB,KAAK,CACzB,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,EAClC,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,GAAG,CAAC,CAAC;AAEhB;;GAEG;AACH,wBAAsB,KAAK,CACzB,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,EAClC,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,GAAG,CAAC,CAAC"}
@@ -2,8 +2,8 @@
2
2
  // loaders.gl, MIT license
3
3
  Object.defineProperty(exports, "__esModule", { value: true });
4
4
  exports.parse = void 0;
5
- const worker_utils_1 = require("@loaders.gl/worker-utils");
6
5
  const loader_utils_1 = require("@loaders.gl/loader-utils");
6
+ const worker_utils_1 = require("@loaders.gl/worker-utils");
7
7
  const normalize_loader_1 = require("../loader-utils/normalize-loader");
8
8
  const is_type_1 = require("../../javascript-utils/is-type");
9
9
  const option_utils_1 = require("../loader-utils/option-utils");
@@ -20,7 +20,6 @@ const select_loader_1 = require("./select-loader");
20
20
  */
21
21
  // implementation signature
22
22
  async function parse(data, loaders, options, context) {
23
- (0, worker_utils_1.assert)(!context || typeof context === 'object'); // parse no longer accepts final url
24
23
  // Signature: parse(data, options, context | url)
25
24
  // Uses registered loaders
26
25
  if (loaders && !Array.isArray(loaders) && !(0, normalize_loader_1.isLoaderObject)(loaders)) {
@@ -43,9 +42,12 @@ async function parse(data, loaders, options, context) {
43
42
  return null;
44
43
  }
45
44
  // Normalize options
45
+ // @ts-expect-error
46
46
  options = (0, option_utils_1.normalizeOptions)(options, loader, candidateLoaders, url); // Could be invalid...
47
47
  // Get a context (if already present, will be unchanged)
48
- context = (0, loader_context_1.getLoaderContext)({ url, parse, loaders: candidateLoaders }, options, context || null);
48
+ context = (0, loader_context_1.getLoaderContext)(
49
+ // @ts-expect-error
50
+ { url, _parse: parse, loaders: candidateLoaders }, options, context || null);
49
51
  return await parseWithLoader(loader, data, options, context);
50
52
  }
51
53
  exports.parse = parse;
@@ -58,27 +60,28 @@ async function parseWithLoader(loader, data, options, context) {
58
60
  const response = data;
59
61
  const { ok, redirected, status, statusText, type, url } = response;
60
62
  const headers = Object.fromEntries(response.headers.entries());
63
+ // @ts-expect-error TODO - fix this
61
64
  context.response = { headers, ok, redirected, status, statusText, type, url };
62
65
  }
63
66
  data = await (0, get_data_1.getArrayBufferOrStringFromData)(data, loader, options);
67
+ const loaderWithParser = loader;
64
68
  // First check for synchronous text parser, wrap results in promises
65
- if (loader.parseTextSync && typeof data === 'string') {
66
- options.dataType = 'text';
67
- return loader.parseTextSync(data, options, context, loader);
69
+ if (loaderWithParser.parseTextSync && typeof data === 'string') {
70
+ return loaderWithParser.parseTextSync(data, options, context);
68
71
  }
69
72
  // If we have a workerUrl and the loader can parse the given options efficiently in a worker
70
73
  if ((0, loader_utils_1.canParseWithWorker)(loader, options)) {
71
74
  return await (0, loader_utils_1.parseWithWorker)(loader, data, options, context, parse);
72
75
  }
73
76
  // Check for asynchronous parser
74
- if (loader.parseText && typeof data === 'string') {
75
- return await loader.parseText(data, options, context, loader);
77
+ if (loaderWithParser.parseText && typeof data === 'string') {
78
+ return await loaderWithParser.parseText(data, options, context);
76
79
  }
77
- if (loader.parse) {
78
- return await loader.parse(data, options, context, loader);
80
+ if (loaderWithParser.parse) {
81
+ return await loaderWithParser.parse(data, options, context);
79
82
  }
80
83
  // This should not happen, all sync loaders should also offer `parse` function
81
- (0, worker_utils_1.assert)(!loader.parseSync);
84
+ (0, worker_utils_1.assert)(!loaderWithParser.parseSync);
82
85
  // TBD - If asynchronous parser not available, return null
83
86
  throw new Error(`${loader.id} loader - no parser found and worker is disabled`);
84
87
  }
@@ -1,4 +1,4 @@
1
1
  import type { Writer, WriterOptions } from '@loaders.gl/loader-utils';
2
- export declare function save(data: any, url: any, writer: Writer, options: WriterOptions): Promise<void>;
3
- export declare function saveSync(data: any, url: any, writer: any, options: any): void;
2
+ export declare function save(data: unknown, url: string, writer: Writer, options: WriterOptions): Promise<void>;
3
+ export declare function saveSync(data: unknown, url: string, writer: Writer, options: WriterOptions): void;
4
4
  //# sourceMappingURL=save.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"save.d.ts","sourceRoot":"","sources":["../../../src/lib/api/save.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAIpE,wBAAsB,IAAI,CAAC,IAAI,KAAA,EAAE,GAAG,KAAA,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,iBAG3E;AAED,wBAAgB,QAAQ,CAAC,IAAI,KAAA,EAAE,GAAG,KAAA,EAAE,MAAM,KAAA,EAAE,OAAO,KAAA,QAGlD"}
1
+ {"version":3,"file":"save.d.ts","sourceRoot":"","sources":["../../../src/lib/api/save.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAIpE,wBAAsB,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,iBAG5F;AAED,wBAAgB,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,QAG1F"}
@@ -1 +1 @@
1
- {"version":3,"file":"select-loader.d.ts","sourceRoot":"","sources":["../../../src/lib/api/select-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,aAAa,EAAE,aAAa,EAAE,MAAM,EAAC,MAAM,0BAA0B,CAAC;AAenF;;;;;;;;GAQG;AACH,wBAAsB,YAAY,CAChC,IAAI,EAAE,QAAQ,GAAG,IAAI,GAAG,WAAW,GAAG,MAAM,EAC5C,OAAO,GAAE,MAAM,EAAE,GAAG,MAAW,EAC/B,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAwBxB;AAED;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,QAAQ,GAAG,IAAI,GAAG,WAAW,GAAG,MAAM,EAC5C,OAAO,GAAE,MAAM,EAAE,GAAG,MAAW,EAC/B,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,GACtB,MAAM,GAAG,IAAI,CAmCf"}
1
+ {"version":3,"file":"select-loader.d.ts","sourceRoot":"","sources":["../../../src/lib/api/select-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,aAAa,EAAE,aAAa,EAAE,MAAM,EAAC,MAAM,0BAA0B,CAAC;AAgBnF;;;;;;;;GAQG;AACH,wBAAsB,YAAY,CAChC,IAAI,EAAE,QAAQ,GAAG,IAAI,GAAG,WAAW,GAAG,MAAM,EAC5C,OAAO,GAAE,MAAM,EAAE,GAAG,MAAW,EAC/B,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAwBxB;AAED;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,QAAQ,GAAG,IAAI,GAAG,WAAW,GAAG,MAAM,EAC5C,OAAO,GAAE,MAAM,EAAE,GAAG,MAAW,EAC/B,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,GACtB,MAAM,GAAG,IAAI,CAmCf"}
@@ -103,11 +103,15 @@ function selectLoaderInternal(data, loaders, options, context) {
103
103
  loader = loader || findLoaderByMIMEType(loaders, type);
104
104
  reason = reason || (loader ? `matched MIME type ${type}` : '');
105
105
  // Look for loader via initial bytes (Note: not always accessible (e.g. Response, stream, async iterator)
106
+ // @ts-ignore Blob | Response
106
107
  loader = loader || findLoaderByInitialBytes(loaders, data);
108
+ // @ts-ignore Blob | Response
107
109
  reason = reason || (loader ? `matched initial data ${getFirstCharacters(data)}` : '');
108
110
  // Look up loader by fallback mime type
109
- loader = loader || findLoaderByMIMEType(loaders, options?.fallbackMimeType);
110
- reason = reason || (loader ? `matched fallback MIME type ${type}` : '');
111
+ if (options?.fallbackMimeType) {
112
+ loader = loader || findLoaderByMIMEType(loaders, options?.fallbackMimeType);
113
+ reason = reason || (loader ? `matched fallback MIME type ${type}` : '');
114
+ }
111
115
  if (reason) {
112
116
  log_1.log.log(1, `selectLoader selected ${loader?.name}: ${reason}.`);
113
117
  }
@@ -132,6 +136,7 @@ function getNoValidLoaderMessage(data) {
132
136
  message += url ? `${loader_utils_1.path.filename(url)}, ` : 'no url provided, ';
133
137
  message += `MIME type: ${type ? `"${type}"` : 'not provided'}, `;
134
138
  // First characters are only accessible when called on data (string or arrayBuffer).
139
+ // @ts-ignore Blob | Response
135
140
  const firstCharacters = data ? getFirstCharacters(data) : '';
136
141
  message += firstCharacters ? ` first bytes: "${firstCharacters}"` : 'first bytes: not available';
137
142
  message += ')';
@@ -217,7 +222,7 @@ function testBinary(data, byteOffset, loader, test) {
217
222
  }
218
223
  switch (typeof test) {
219
224
  case 'function':
220
- return test(data, loader);
225
+ return test(data);
221
226
  case 'string':
222
227
  // Magic bytes check: If `test` is a string, check if binary data starts with that strings
223
228
  const magic = getMagicString(data, byteOffset, test.length);
@@ -38,7 +38,7 @@ export default class BrowserFileSystem implements FileSystem {
38
38
  * Just removes the file from the list
39
39
  */
40
40
  unlink(path: string): Promise<void>;
41
- open(pathname: string, flags: any, mode?: any): Promise<any>;
41
+ open(pathname: string, flags: unknown, mode?: unknown): Promise<any>;
42
42
  /**
43
43
  * Read a range into a buffer
44
44
  * @todo - handle position memory
@@ -52,7 +52,7 @@ export default class BrowserFileSystem implements FileSystem {
52
52
  buffer: ArrayBuffer;
53
53
  }>;
54
54
  close(fd: number): Promise<void>;
55
- _getFile(path: any, used: any): File;
55
+ _getFile(path: string, used: boolean): File;
56
56
  }
57
57
  export {};
58
58
  //# sourceMappingURL=browser-filesystem.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"browser-filesystem.d.ts","sourceRoot":"","sources":["../../../src/lib/filesystems/browser-filesystem.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AAE7C,KAAK,wBAAwB,GAAG;IAC9B,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;CACtB,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,OAAO,OAAO,iBAAkB,YAAW,UAAU;IAC1D,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,KAAK,CAAkC;IAC/C,OAAO,CAAC,cAAc,CAAkC;IACxD,OAAO,CAAC,SAAS,CAAqC;IAEtD;;;;OAIG;gBACS,KAAK,EAAE,QAAQ,GAAG,IAAI,EAAE,EAAE,OAAO,CAAC,EAAE,wBAAwB;IAexE;;;OAGG;IACG,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC;IAkCnE;;;;OAIG;IACG,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IASlD;;OAEG;IACG,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,CAAC;IAQnE;;OAEG;IACG,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IASnC,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,KAAA,EAAE,IAAI,CAAC,KAAA,GAAG,OAAO,CAAC,GAAG,CAAC;IAIxD;;;;;;;OAOG;IACG,IAAI,CACR,EAAE,EAAE,GAAG,EACP,MAAM,EAAE,WAAW,EACnB,MAAM,GAAE,MAAU,EAClB,MAAM,GAAE,MAA0B,EAClC,QAAQ,GAAE,MAAM,GAAG,IAAW,GAC7B,OAAO,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,WAAW,CAAA;KAAC,CAAC;IAQ9C,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAStC,QAAQ,CAAC,IAAI,KAAA,EAAE,IAAI,KAAA;CAQpB"}
1
+ {"version":3,"file":"browser-filesystem.d.ts","sourceRoot":"","sources":["../../../src/lib/filesystems/browser-filesystem.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AAE7C,KAAK,wBAAwB,GAAG;IAC9B,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;CACtB,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,OAAO,OAAO,iBAAkB,YAAW,UAAU;IAC1D,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,KAAK,CAAkC;IAC/C,OAAO,CAAC,cAAc,CAAkC;IACxD,OAAO,CAAC,SAAS,CAAqC;IAEtD;;;;OAIG;gBACS,KAAK,EAAE,QAAQ,GAAG,IAAI,EAAE,EAAE,OAAO,CAAC,EAAE,wBAAwB;IAexE;;;OAGG;IACG,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC;IAkCnE;;;;OAIG;IACG,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IASlD;;OAEG;IACG,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,CAAC;IAQnE;;OAEG;IACG,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IASnC,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC;IAI1E;;;;;;;OAOG;IACG,IAAI,CACR,EAAE,EAAE,GAAG,EACP,MAAM,EAAE,WAAW,EACnB,MAAM,GAAE,MAAU,EAClB,MAAM,GAAE,MAA0B,EAClC,QAAQ,GAAE,MAAM,GAAG,IAAW,GAC7B,OAAO,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,WAAW,CAAA;KAAC,CAAC;IAQ9C,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAStC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,IAAI;CAQ5C"}
@@ -115,7 +115,7 @@ class BrowserFileSystem {
115
115
  // PRIVATE
116
116
  // Supports case independent paths, and file usage tracking
117
117
  _getFile(path, used) {
118
- // Prefer case match, but fall back to case indepent.
118
+ // Prefer case match, but fall back to case independent.
119
119
  const file = this.files[path] || this.lowerCaseFiles[path];
120
120
  if (file && used) {
121
121
  this.usedFiles[path] = true;
@@ -35,9 +35,9 @@ export interface FileSystem {
35
35
  * A random access file system
36
36
  */
37
37
  export interface RandomAccessReadFileSystem extends FileSystem {
38
- open(path: string, flags: any, mode?: any): Promise<any>;
39
- close(fd: any): Promise<void>;
40
- fstat(fd: any): Promise<Stat>;
38
+ open(path: string, flags: unknown, mode?: unknown): Promise<any>;
39
+ close(fd: unknown): Promise<void>;
40
+ fstat(fd: unknown): Promise<Stat>;
41
41
  read(fd: any, buffer: ArrayBuffer | ArrayBufferView, offset?: number, length?: number, position?: number): Promise<{
42
42
  bytesRead: number;
43
43
  buffer: ArrayBuffer;
@@ -1 +1 @@
1
- {"version":3,"file":"filesystem.d.ts","sourceRoot":"","sources":["../../../src/lib/filesystems/filesystem.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,WAAW,GAAG,EAAE,CAAC;AAE7B,MAAM,MAAM,IAAI,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,OAAO,CAAC;CAC5B,CAAC;AAEF;;;GAGG;AACH,MAAM,WAAW,UAAU;IACzB;;;OAGG;IACH,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAC,SAAS,CAAC,EAAE,OAAO,CAAA;KAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAE9E;;;;;OAKG;IACH,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,CAAC,CAAC;IAElE;;;;OAIG;IACH,KAAK,CAAC,QAAQ,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;CACxE;AAED;;GAEG;AACH,MAAM,WAAW,0BAA2B,SAAQ,UAAU;IAC5D,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,KAAA,EAAE,IAAI,CAAC,KAAA,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAC/C,KAAK,CAAC,EAAE,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,KAAK,CAAC,EAAE,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,IAAI,CACF,EAAE,EAAE,GAAG,EACP,MAAM,EAAE,WAAW,GAAG,eAAe,EACrC,MAAM,CAAC,EAAE,MAAM,EACf,MAAM,CAAC,EAAE,MAAM,EACf,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,WAAW,CAAA;KAAC,CAAC,CAAC;CACtD"}
1
+ {"version":3,"file":"filesystem.d.ts","sourceRoot":"","sources":["../../../src/lib/filesystems/filesystem.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,WAAW,GAAG,EAAE,CAAC;AAE7B,MAAM,MAAM,IAAI,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,OAAO,CAAC;CAC5B,CAAC;AAEF;;;GAGG;AACH,MAAM,WAAW,UAAU;IACzB;;;OAGG;IACH,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAC,SAAS,CAAC,EAAE,OAAO,CAAA;KAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAE9E;;;;;OAKG;IACH,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,CAAC,CAAC;IAElE;;;;OAIG;IACH,KAAK,CAAC,QAAQ,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;CACxE;AAED;;GAEG;AACH,MAAM,WAAW,0BAA2B,SAAQ,UAAU;IAC5D,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IACjE,KAAK,CAAC,EAAE,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAClC,KAAK,CAAC,EAAE,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAClC,IAAI,CACF,EAAE,EAAE,GAAG,EACP,MAAM,EAAE,WAAW,GAAG,eAAe,EACrC,MAAM,CAAC,EAAE,MAAM,EACf,MAAM,CAAC,EAAE,MAAM,EACf,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,WAAW,CAAA;KAAC,CAAC,CAAC;CACtD"}
@@ -1,2 +1,3 @@
1
1
  "use strict";
2
+ // loaders.gl, MIT license
2
3
  Object.defineProperty(exports, "__esModule", { value: true });
@@ -1 +1 @@
1
- {"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/lib/init.ts"],"names":[],"mappings":";AAgBA,wBAAkC"}
1
+ {"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/lib/init.ts"],"names":[],"mappings":";AAiBA,wBAAkC"}
package/dist/lib/init.js CHANGED
@@ -7,6 +7,7 @@ const version = typeof __VERSION__ !== 'undefined' ? __VERSION__ : '';
7
7
  // @ts-ignore
8
8
  if (!globalThis.loaders) {
9
9
  log_1.log.log(1, `loaders.gl ${version}`)();
10
+ // @ts-ignore TS2339: Property 'loaders' does not exist on type 'Window & typeof globalThis'.
10
11
  globalThis.loaders = Object.assign(globalThis.loaders || {}, {
11
12
  VERSION: version,
12
13
  log: log_1.log
@@ -1 +1 @@
1
- {"version":3,"file":"get-data.d.ts","sourceRoot":"","sources":["../../../src/lib/loader-utils/get-data.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,QAAQ,EACR,YAAY,EACZ,iBAAiB,EACjB,MAAM,EACN,aAAa,EACd,MAAM,0BAA0B,CAAC;AAiBlC,wBAAgB,kCAAkC,CAChD,IAAI,EAAE,YAAY,EAClB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,aAAa,GACrB,WAAW,GAAG,MAAM,CAyCtB;AAGD,wBAAsB,8BAA8B,CAClD,IAAI,EAAE,QAAQ,EACd,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,WAAW,GAAG,MAAM,CAAC,CA4B/B;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,iBAAiB,EACvB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC,CAyB7D;AAED,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,cAAc,CAAC,CAWxF"}
1
+ {"version":3,"file":"get-data.d.ts","sourceRoot":"","sources":["../../../src/lib/loader-utils/get-data.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,QAAQ,EACR,YAAY,EACZ,iBAAiB,EACjB,MAAM,EACN,aAAa,EACd,MAAM,0BAA0B,CAAC;AAiBlC,wBAAgB,kCAAkC,CAChD,IAAI,EAAE,YAAY,EAClB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,aAAa,GACrB,WAAW,GAAG,MAAM,CAyCtB;AAGD,wBAAsB,8BAA8B,CAClD,IAAI,EAAE,QAAQ,EACd,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,WAAW,GAAG,MAAM,CAAC,CA4B/B;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,iBAAiB,EACvB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC,CA0B7D;AAED,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,cAAc,CAAC,CAWxF"}
@@ -88,6 +88,7 @@ async function getAsyncIterableFromData(data, options) {
88
88
  return (0, make_iterator_1.makeIterator)(data, options);
89
89
  }
90
90
  if ((0, is_type_1.isAsyncIterable)(data)) {
91
+ // @ts-ignore
91
92
  return data[Symbol.asyncIterator]();
92
93
  }
93
94
  return getIterableFromData(data);
@@ -1,8 +1,8 @@
1
- import type { LoaderContext, LoaderOptions } from '@loaders.gl/loader-utils';
1
+ import type { LoaderContext, LoaderOptions, FetchLike } from '@loaders.gl/loader-utils';
2
2
  /**
3
3
  * Gets the current fetch function from options and context
4
4
  * @param options
5
5
  * @param context
6
6
  */
7
- export declare function getFetchFunction(options?: LoaderOptions, context?: Omit<LoaderContext, 'fetch'> & Partial<Pick<LoaderContext, 'fetch'>>): (url: string, options?: RequestInit | undefined) => Promise<Response>;
7
+ export declare function getFetchFunction(options?: LoaderOptions, context?: Omit<LoaderContext, 'fetch'> & Partial<Pick<LoaderContext, 'fetch'>>): FetchLike;
8
8
  //# sourceMappingURL=get-fetch-function.d.ts.map
@@ -1 +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;AAK3E;;;;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,yEAuB/E"}
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,EAAE,SAAS,EAAC,MAAM,0BAA0B,CAAC;AAKtF;;;;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,GAC7E,SAAS,CAsBX"}
@@ -1,4 +1,6 @@
1
1
  import type { Loader, LoaderOptions, LoaderContext } from '@loaders.gl/loader-utils';
2
+ /** Properties for creating an updated context */
3
+ type LoaderContextProps = Omit<LoaderContext, 'fetch'> & Partial<Pick<LoaderContext, 'fetch'>>;
2
4
  /**
3
5
  * "sub" loaders invoked by other loaders get a "context" injected on `this`
4
6
  * The context will inject core methods like `parse` and contain information
@@ -8,6 +10,7 @@ import type { Loader, LoaderOptions, LoaderContext } from '@loaders.gl/loader-ut
8
10
  * @param options
9
11
  * @param previousContext
10
12
  */
11
- export declare function getLoaderContext(context: Omit<LoaderContext, 'fetch'> & Partial<Pick<LoaderContext, 'fetch'>>, options: LoaderOptions, parentContext: LoaderContext | null): LoaderContext;
12
- export declare function getLoadersFromContext(loaders: Loader[] | Loader | undefined, context?: LoaderContext): any;
13
+ export declare function getLoaderContext(context: LoaderContextProps, options: LoaderOptions, parentContext: LoaderContext | null): LoaderContext;
14
+ export declare function getLoadersFromContext(loaders: Loader[] | Loader | undefined, context?: LoaderContext): Loader | Loader[] | undefined;
15
+ export {};
13
16
  //# sourceMappingURL=loader-context.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"loader-context.d.ts","sourceRoot":"","sources":["../../../src/lib/loader-utils/loader-context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAE,aAAa,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAKnF;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC,EAC7E,OAAO,EAAE,aAAa,EACtB,aAAa,EAAE,aAAa,GAAG,IAAI,GAClC,aAAa,CA2Bf;AAGD,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,SAAS,EACtC,OAAO,CAAC,EAAE,aAAa,OAkBxB"}
1
+ {"version":3,"file":"loader-context.d.ts","sourceRoot":"","sources":["../../../src/lib/loader-utils/loader-context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAE,aAAa,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAKnF,iDAAiD;AACjD,KAAK,kBAAkB,GAAG,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC,CAAC;AAE/F;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,kBAAkB,EAC3B,OAAO,EAAE,aAAa,EACtB,aAAa,EAAE,aAAa,GAAG,IAAI,GAClC,aAAa,CA2Bf;AAGD,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,SAAS,EACtC,OAAO,CAAC,EAAE,aAAa,GACtB,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,CAiB/B"}
@@ -40,8 +40,8 @@ function getLoaderContext(context, options, parentContext) {
40
40
  exports.getLoaderContext = getLoaderContext;
41
41
  // eslint-disable-next-line complexity
42
42
  function getLoadersFromContext(loaders, context) {
43
- // A single non-array loader is force selected, but only on top-level (context === null)
44
- if (!context && loaders && !Array.isArray(loaders)) {
43
+ // A single loader (non-array) indicates no selection desired. Force select.
44
+ if (loaders && !Array.isArray(loaders)) {
45
45
  return loaders;
46
46
  }
47
47
  // Create a merged list
@@ -54,6 +54,6 @@ function getLoadersFromContext(loaders, context) {
54
54
  candidateLoaders = candidateLoaders ? [...candidateLoaders, ...contextLoaders] : contextLoaders;
55
55
  }
56
56
  // If no loaders, return null to look in globally registered loaders
57
- return candidateLoaders && candidateLoaders.length ? candidateLoaders : null;
57
+ return candidateLoaders && candidateLoaders.length ? candidateLoaders : undefined;
58
58
  }
59
59
  exports.getLoadersFromContext = getLoadersFromContext;
@@ -1,17 +1,19 @@
1
1
  import { Log } from '@probe.gl/log';
2
2
  export declare const probeLog: Log;
3
+ type LogFunction = () => void;
3
4
  export declare class NullLog {
4
- log(): () => void;
5
- info(): () => void;
6
- warn(): () => void;
7
- error(): () => void;
5
+ log(): LogFunction;
6
+ info(): LogFunction;
7
+ warn(): LogFunction;
8
+ error(): LogFunction;
8
9
  }
9
10
  export declare class ConsoleLog {
10
11
  console: any;
11
12
  constructor();
12
- log(...args: any[]): any;
13
- info(...args: any[]): any;
14
- warn(...args: any[]): any;
15
- error(...args: any[]): any;
13
+ log(...args: unknown[]): LogFunction;
14
+ info(...args: unknown[]): LogFunction;
15
+ warn(...args: unknown[]): LogFunction;
16
+ error(...args: unknown[]): LogFunction;
16
17
  }
18
+ export {};
17
19
  //# sourceMappingURL=loggers.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"loggers.d.ts","sourceRoot":"","sources":["../../../src/lib/loader-utils/loggers.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,GAAG,EAAC,MAAM,eAAe,CAAC;AAElC,eAAO,MAAM,QAAQ,KAA8B,CAAC;AAGpD,qBAAa,OAAO;IAClB,GAAG;IAGH,IAAI;IAGJ,IAAI;IAGJ,KAAK;CAGN;AAGD,qBAAa,UAAU;IACrB,OAAO,MAAC;;IAKR,GAAG,CAAC,GAAG,IAAI,OAAA;IAGX,IAAI,CAAC,GAAG,IAAI,OAAA;IAGZ,IAAI,CAAC,GAAG,IAAI,OAAA;IAGZ,KAAK,CAAC,GAAG,IAAI,OAAA;CAGd"}
1
+ {"version":3,"file":"loggers.d.ts","sourceRoot":"","sources":["../../../src/lib/loader-utils/loggers.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,GAAG,EAAC,MAAM,eAAe,CAAC;AAElC,eAAO,MAAM,QAAQ,KAA8B,CAAC;AAEpD,KAAK,WAAW,GAAG,MAAM,IAAI,CAAC;AAG9B,qBAAa,OAAO;IAClB,GAAG,IAAI,WAAW;IAGlB,IAAI,IAAI,WAAW;IAGnB,IAAI,IAAI,WAAW;IAGnB,KAAK,IAAI,WAAW;CAGrB;AAGD,qBAAa,UAAU;IACrB,OAAO,MAAC;;IAKR,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,WAAW;IAGpC,IAAI,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,WAAW;IAGrC,IAAI,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,WAAW;IAGrC,KAAK,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,WAAW;CAGvC"}
@@ -16,7 +16,7 @@ export declare function getGlobalLoaderState(): GlobalLoaderState;
16
16
  * NOTE: This use case is not reliable but can help when testing new versions of loaders.gl with existing frameworks
17
17
  * @returns global loader options merged with default loader options
18
18
  */
19
- export declare const getGlobalLoaderOptions: () => LoaderOptions;
19
+ export declare function getGlobalLoaderOptions(): LoaderOptions;
20
20
  /**
21
21
  * Set global loader options
22
22
  * @param options
@@ -1 +1 @@
1
- {"version":3,"file":"option-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/loader-utils/option-utils.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,MAAM,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAKpE;;GAEG;AACH,KAAK,iBAAiB,GAAG;IACvB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,aAAa,EAAE,aAAa,CAAC;CAC9B,CAAC;AAEF;;;GAGG;AACH,wBAAgB,oBAAoB,IAAI,iBAAiB,CASxD;AAED;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,QAAO,aAKzC,CAAC;AAEF;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI,CAI7D;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,MAAM,EAAE,EAClB,GAAG,CAAC,EAAE,MAAM,GACX,aAAa,CAMf"}
1
+ {"version":3,"file":"option-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/loader-utils/option-utils.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,MAAM,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAKpE;;GAEG;AACH,KAAK,iBAAiB,GAAG;IACvB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,aAAa,EAAE,aAAa,CAAC;CAC9B,CAAC;AAEF;;;GAGG;AACH,wBAAgB,oBAAoB,IAAI,iBAAiB,CASxD;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,IAAI,aAAa,CAKtD;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI,CAK7D;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,MAAM,EAAE,EAClB,GAAG,CAAC,EAAE,MAAM,GACX,aAAa,CAMf"}
@@ -24,12 +24,12 @@ exports.getGlobalLoaderState = getGlobalLoaderState;
24
24
  * NOTE: This use case is not reliable but can help when testing new versions of loaders.gl with existing frameworks
25
25
  * @returns global loader options merged with default loader options
26
26
  */
27
- const getGlobalLoaderOptions = () => {
27
+ function getGlobalLoaderOptions() {
28
28
  const state = getGlobalLoaderState();
29
29
  // Ensure all default loader options from this library are mentioned
30
30
  state.globalOptions = state.globalOptions || { ...option_defaults_1.DEFAULT_LOADER_OPTIONS };
31
31
  return state.globalOptions;
32
- };
32
+ }
33
33
  exports.getGlobalLoaderOptions = getGlobalLoaderOptions;
34
34
  /**
35
35
  * Set global loader options
@@ -37,7 +37,8 @@ exports.getGlobalLoaderOptions = getGlobalLoaderOptions;
37
37
  */
38
38
  function setGlobalOptions(options) {
39
39
  const state = getGlobalLoaderState();
40
- const globalOptions = (0, exports.getGlobalLoaderOptions)();
40
+ const globalOptions = getGlobalLoaderOptions();
41
+ // @ts-expect-error First param looks incorrect
41
42
  state.globalOptions = normalizeOptionsInternal(globalOptions, options);
42
43
  }
43
44
  exports.setGlobalOptions = setGlobalOptions;
@@ -66,11 +67,12 @@ function validateOptions(options, loaders) {
66
67
  validateOptionsObject(options, null, option_defaults_1.DEFAULT_LOADER_OPTIONS, option_defaults_1.REMOVED_LOADER_OPTIONS, loaders);
67
68
  for (const loader of loaders) {
68
69
  // Get the scoped, loader specific options from the user supplied options
69
- const idOptions = (options && options[loader.id]) || {};
70
+ const idOptions = ((options && options[loader.id]) || {});
70
71
  // Get scoped, loader specific default and deprecated options from the selected loader
71
72
  const loaderOptions = (loader.options && loader.options[loader.id]) || {};
72
73
  const deprecatedOptions = (loader.deprecatedOptions && loader.deprecatedOptions[loader.id]) || {};
73
74
  // Validate loader specific options
75
+ // @ts-ignore
74
76
  validateOptionsObject(idOptions, loader.id, loaderOptions, deprecatedOptions, loaders);
75
77
  }
76
78
  }
@@ -121,7 +123,7 @@ function normalizeOptionsInternal(loader, options, url) {
121
123
  if (mergedOptions.log === null) {
122
124
  mergedOptions.log = new loggers_1.NullLog();
123
125
  }
124
- mergeNestedFields(mergedOptions, (0, exports.getGlobalLoaderOptions)());
126
+ mergeNestedFields(mergedOptions, getGlobalLoaderOptions());
125
127
  mergeNestedFields(mergedOptions, options);
126
128
  return mergedOptions;
127
129
  }
@@ -1,10 +1,13 @@
1
- import { Loader, LoaderWithParser } from '@loaders.gl/loader-utils';
1
+ import type { Loader, LoaderWithParser, LoaderOptions } from '@loaders.gl/loader-utils';
2
+ export type NullLoaderOptions = LoaderOptions & {
3
+ null?: {};
4
+ };
2
5
  /**
3
6
  * Loads any data and returns null (or optionally passes through data unparsed)
4
7
  */
5
- export declare const NullWorkerLoader: Loader;
8
+ export declare const NullWorkerLoader: Loader<null, never, NullLoaderOptions>;
6
9
  /**
7
10
  * Loads any data and returns null (or optionally passes through data unparsed)
8
11
  */
9
- export declare const NullLoader: LoaderWithParser;
12
+ export declare const NullLoader: LoaderWithParser<null, null, NullLoaderOptions>;
10
13
  //# sourceMappingURL=null-loader.d.ts.map