react-science 3.1.0 → 4.0.0

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 (209) hide show
  1. package/lib/app/hooks/file-loading.d.ts +3 -2
  2. package/lib/app/hooks/file-loading.d.ts.map +1 -1
  3. package/lib/app/hooks/file-loading.js +12 -12
  4. package/lib/app/hooks/file-loading.js.map +1 -1
  5. package/lib/app/panels/SignalProcessingPanel.js +1 -1
  6. package/lib/app/panels/SignalProcessingPanel.js.map +1 -1
  7. package/lib/app-data/loaders/biologicLoader.d.ts +2 -2
  8. package/lib/app-data/loaders/biologicLoader.d.ts.map +1 -1
  9. package/lib/app-data/loaders/biologicLoader.js +4 -4
  10. package/lib/app-data/loaders/biologicLoader.js.map +1 -1
  11. package/lib/app-data/loaders/cdfLoader.d.ts +2 -2
  12. package/lib/app-data/loaders/cdfLoader.d.ts.map +1 -1
  13. package/lib/app-data/loaders/cdfLoader.js +6 -9
  14. package/lib/app-data/loaders/cdfLoader.js.map +1 -1
  15. package/lib/app-data/loaders/jcampLoader.d.ts +2 -2
  16. package/lib/app-data/loaders/jcampLoader.d.ts.map +1 -1
  17. package/lib/app-data/loaders/jcampLoader.js +10 -13
  18. package/lib/app-data/loaders/jcampLoader.js.map +1 -1
  19. package/lib/app-data/loaders/loadMeasurements.d.ts +4 -3
  20. package/lib/app-data/loaders/loadMeasurements.d.ts.map +1 -1
  21. package/lib/app-data/loaders/loadMeasurements.js +3 -3
  22. package/lib/app-data/loaders/loadMeasurements.js.map +1 -1
  23. package/lib/app-data/loaders/proprietary/agilent/cary500Loader.d.ts +3 -2
  24. package/lib/app-data/loaders/proprietary/agilent/cary500Loader.d.ts.map +1 -1
  25. package/lib/app-data/loaders/proprietary/agilent/cary500Loader.js +4 -9
  26. package/lib/app-data/loaders/proprietary/agilent/cary500Loader.js.map +1 -1
  27. package/lib/app-data/loaders/spcLoader.d.ts +2 -2
  28. package/lib/app-data/loaders/spcLoader.d.ts.map +1 -1
  29. package/lib/app-data/loaders/spcLoader.js +3 -8
  30. package/lib/app-data/loaders/spcLoader.js.map +1 -1
  31. package/lib/app-data/loaders/utility/measurementLoader.d.ts +2 -2
  32. package/lib/app-data/loaders/utility/measurementLoader.d.ts.map +1 -1
  33. package/lib/app-data/loaders/utility/measurementLoader.js.map +1 -1
  34. package/lib/app-data/loaders/wdfLoader.d.ts +2 -2
  35. package/lib/app-data/loaders/wdfLoader.d.ts.map +1 -1
  36. package/lib/app-data/loaders/wdfLoader.js +3 -9
  37. package/lib/app-data/loaders/wdfLoader.js.map +1 -1
  38. package/lib/components/index.d.ts +2 -1
  39. package/lib/components/index.d.ts.map +1 -1
  40. package/lib/components/index.js +2 -1
  41. package/lib/components/index.js.map +1 -1
  42. package/lib/components/info-panel/InfoPanel.d.ts.map +1 -1
  43. package/lib/components/info-panel/InfoPanel.js +1 -1
  44. package/lib/components/info-panel/InfoPanel.js.map +1 -1
  45. package/lib/components/logger/FifoLoggerDialog.d.ts +10 -0
  46. package/lib/components/logger/FifoLoggerDialog.d.ts.map +1 -0
  47. package/lib/components/logger/FifoLoggerDialog.js +55 -0
  48. package/lib/components/logger/FifoLoggerDialog.js.map +1 -0
  49. package/lib/components/logger/FifoLoggerProvider.d.ts +7 -0
  50. package/lib/components/logger/FifoLoggerProvider.d.ts.map +1 -0
  51. package/lib/components/logger/FifoLoggerProvider.js +10 -0
  52. package/lib/components/logger/FifoLoggerProvider.js.map +1 -0
  53. package/lib/components/logger/FifoLoggerToolbarItem.d.ts +2 -0
  54. package/lib/components/logger/FifoLoggerToolbarItem.d.ts.map +1 -0
  55. package/lib/components/logger/FifoLoggerToolbarItem.js +39 -0
  56. package/lib/components/logger/FifoLoggerToolbarItem.js.map +1 -0
  57. package/lib/components/logger/index.d.ts +5 -0
  58. package/lib/components/logger/index.d.ts.map +1 -0
  59. package/lib/components/logger/index.js +21 -0
  60. package/lib/components/logger/index.js.map +1 -0
  61. package/lib/components/logger/loggerContext.d.ts +4 -0
  62. package/lib/components/logger/loggerContext.d.ts.map +1 -0
  63. package/lib/components/logger/loggerContext.js +6 -0
  64. package/lib/components/logger/loggerContext.js.map +1 -0
  65. package/lib/components/logger/useFifoLogger.d.ts +3 -0
  66. package/lib/components/logger/useFifoLogger.d.ts.map +1 -0
  67. package/lib/components/logger/useFifoLogger.js +25 -0
  68. package/lib/components/logger/useFifoLogger.js.map +1 -0
  69. package/lib/components/table/Table.d.ts +2 -3
  70. package/lib/components/table/Table.d.ts.map +1 -1
  71. package/lib/components/table/Table.js +2 -2
  72. package/lib/components/table/Table.js.map +1 -1
  73. package/lib/components/table/TableHeader.d.ts +1 -1
  74. package/lib/components/table/TableHeader.d.ts.map +1 -1
  75. package/lib/components/table/TableHeader.js +2 -2
  76. package/lib/components/table/TableHeader.js.map +1 -1
  77. package/lib/components/table/TableRow.d.ts +1 -1
  78. package/lib/components/table/TableRow.d.ts.map +1 -1
  79. package/lib/components/table/TableRow.js +9 -22
  80. package/lib/components/table/TableRow.js.map +1 -1
  81. package/lib/components/table/tableContext.d.ts +0 -2
  82. package/lib/components/table/tableContext.d.ts.map +1 -1
  83. package/lib/components/table/tableContext.js +1 -1
  84. package/lib/components/table/tableContext.js.map +1 -1
  85. package/lib/components/toolbar/TooltipHelpContent.d.ts +11 -0
  86. package/lib/components/toolbar/TooltipHelpContent.d.ts.map +1 -0
  87. package/lib/components/toolbar/TooltipHelpContent.js +102 -0
  88. package/lib/components/toolbar/TooltipHelpContent.js.map +1 -0
  89. package/lib/components/toolbar/index.d.ts +1 -0
  90. package/lib/components/toolbar/index.d.ts.map +1 -1
  91. package/lib/components/toolbar/index.js +1 -0
  92. package/lib/components/toolbar/index.js.map +1 -1
  93. package/lib-esm/app/hooks/file-loading.d.ts +3 -2
  94. package/lib-esm/app/hooks/file-loading.d.ts.map +1 -1
  95. package/lib-esm/app/hooks/file-loading.js +9 -9
  96. package/lib-esm/app/hooks/file-loading.js.map +1 -1
  97. package/lib-esm/app/panels/SignalProcessingPanel.js +1 -1
  98. package/lib-esm/app/panels/SignalProcessingPanel.js.map +1 -1
  99. package/lib-esm/app-data/loaders/biologicLoader.d.ts +2 -2
  100. package/lib-esm/app-data/loaders/biologicLoader.d.ts.map +1 -1
  101. package/lib-esm/app-data/loaders/biologicLoader.js +4 -4
  102. package/lib-esm/app-data/loaders/biologicLoader.js.map +1 -1
  103. package/lib-esm/app-data/loaders/cdfLoader.d.ts +2 -2
  104. package/lib-esm/app-data/loaders/cdfLoader.d.ts.map +1 -1
  105. package/lib-esm/app-data/loaders/cdfLoader.js +6 -9
  106. package/lib-esm/app-data/loaders/cdfLoader.js.map +1 -1
  107. package/lib-esm/app-data/loaders/jcampLoader.d.ts +2 -2
  108. package/lib-esm/app-data/loaders/jcampLoader.d.ts.map +1 -1
  109. package/lib-esm/app-data/loaders/jcampLoader.js +10 -13
  110. package/lib-esm/app-data/loaders/jcampLoader.js.map +1 -1
  111. package/lib-esm/app-data/loaders/loadMeasurements.d.ts +4 -3
  112. package/lib-esm/app-data/loaders/loadMeasurements.d.ts.map +1 -1
  113. package/lib-esm/app-data/loaders/loadMeasurements.js +3 -3
  114. package/lib-esm/app-data/loaders/loadMeasurements.js.map +1 -1
  115. package/lib-esm/app-data/loaders/proprietary/agilent/cary500Loader.d.ts +3 -2
  116. package/lib-esm/app-data/loaders/proprietary/agilent/cary500Loader.d.ts.map +1 -1
  117. package/lib-esm/app-data/loaders/proprietary/agilent/cary500Loader.js +5 -10
  118. package/lib-esm/app-data/loaders/proprietary/agilent/cary500Loader.js.map +1 -1
  119. package/lib-esm/app-data/loaders/spcLoader.d.ts +2 -2
  120. package/lib-esm/app-data/loaders/spcLoader.d.ts.map +1 -1
  121. package/lib-esm/app-data/loaders/spcLoader.js +4 -9
  122. package/lib-esm/app-data/loaders/spcLoader.js.map +1 -1
  123. package/lib-esm/app-data/loaders/utility/measurementLoader.d.ts +2 -2
  124. package/lib-esm/app-data/loaders/utility/measurementLoader.d.ts.map +1 -1
  125. package/lib-esm/app-data/loaders/utility/measurementLoader.js.map +1 -1
  126. package/lib-esm/app-data/loaders/wdfLoader.d.ts +2 -2
  127. package/lib-esm/app-data/loaders/wdfLoader.d.ts.map +1 -1
  128. package/lib-esm/app-data/loaders/wdfLoader.js +3 -9
  129. package/lib-esm/app-data/loaders/wdfLoader.js.map +1 -1
  130. package/lib-esm/components/index.d.ts +2 -1
  131. package/lib-esm/components/index.d.ts.map +1 -1
  132. package/lib-esm/components/index.js +2 -1
  133. package/lib-esm/components/index.js.map +1 -1
  134. package/lib-esm/components/info-panel/InfoPanel.d.ts.map +1 -1
  135. package/lib-esm/components/info-panel/InfoPanel.js +1 -1
  136. package/lib-esm/components/info-panel/InfoPanel.js.map +1 -1
  137. package/lib-esm/components/logger/FifoLoggerDialog.d.ts +10 -0
  138. package/lib-esm/components/logger/FifoLoggerDialog.d.ts.map +1 -0
  139. package/lib-esm/components/logger/FifoLoggerDialog.js +48 -0
  140. package/lib-esm/components/logger/FifoLoggerDialog.js.map +1 -0
  141. package/lib-esm/components/logger/FifoLoggerProvider.d.ts +7 -0
  142. package/lib-esm/components/logger/FifoLoggerProvider.d.ts.map +1 -0
  143. package/lib-esm/components/logger/FifoLoggerProvider.js +6 -0
  144. package/lib-esm/components/logger/FifoLoggerProvider.js.map +1 -0
  145. package/lib-esm/components/logger/FifoLoggerToolbarItem.d.ts +2 -0
  146. package/lib-esm/components/logger/FifoLoggerToolbarItem.d.ts.map +1 -0
  147. package/lib-esm/components/logger/FifoLoggerToolbarItem.js +35 -0
  148. package/lib-esm/components/logger/FifoLoggerToolbarItem.js.map +1 -0
  149. package/lib-esm/components/logger/index.d.ts +5 -0
  150. package/lib-esm/components/logger/index.d.ts.map +1 -0
  151. package/lib-esm/components/logger/index.js +5 -0
  152. package/lib-esm/components/logger/index.js.map +1 -0
  153. package/lib-esm/components/logger/loggerContext.d.ts +4 -0
  154. package/lib-esm/components/logger/loggerContext.d.ts.map +1 -0
  155. package/lib-esm/components/logger/loggerContext.js +3 -0
  156. package/lib-esm/components/logger/loggerContext.js.map +1 -0
  157. package/lib-esm/components/logger/useFifoLogger.d.ts +3 -0
  158. package/lib-esm/components/logger/useFifoLogger.d.ts.map +1 -0
  159. package/lib-esm/components/logger/useFifoLogger.js +20 -0
  160. package/lib-esm/components/logger/useFifoLogger.js.map +1 -0
  161. package/lib-esm/components/table/Table.d.ts +2 -3
  162. package/lib-esm/components/table/Table.d.ts.map +1 -1
  163. package/lib-esm/components/table/Table.js +2 -2
  164. package/lib-esm/components/table/Table.js.map +1 -1
  165. package/lib-esm/components/table/TableHeader.d.ts +1 -1
  166. package/lib-esm/components/table/TableHeader.d.ts.map +1 -1
  167. package/lib-esm/components/table/TableHeader.js +2 -2
  168. package/lib-esm/components/table/TableHeader.js.map +1 -1
  169. package/lib-esm/components/table/TableRow.d.ts +1 -1
  170. package/lib-esm/components/table/TableRow.d.ts.map +1 -1
  171. package/lib-esm/components/table/TableRow.js +6 -19
  172. package/lib-esm/components/table/TableRow.js.map +1 -1
  173. package/lib-esm/components/table/tableContext.d.ts +0 -2
  174. package/lib-esm/components/table/tableContext.d.ts.map +1 -1
  175. package/lib-esm/components/table/tableContext.js +1 -1
  176. package/lib-esm/components/table/tableContext.js.map +1 -1
  177. package/lib-esm/components/toolbar/TooltipHelpContent.d.ts +11 -0
  178. package/lib-esm/components/toolbar/TooltipHelpContent.d.ts.map +1 -0
  179. package/lib-esm/components/toolbar/TooltipHelpContent.js +95 -0
  180. package/lib-esm/components/toolbar/TooltipHelpContent.js.map +1 -0
  181. package/lib-esm/components/toolbar/index.d.ts +1 -0
  182. package/lib-esm/components/toolbar/index.d.ts.map +1 -1
  183. package/lib-esm/components/toolbar/index.js +1 -0
  184. package/lib-esm/components/toolbar/index.js.map +1 -1
  185. package/package.json +7 -5
  186. package/src/app/hooks/file-loading.ts +12 -10
  187. package/src/app/panels/SignalProcessingPanel.tsx +1 -1
  188. package/src/app-data/loaders/biologicLoader.ts +6 -5
  189. package/src/app-data/loaders/cdfLoader.ts +8 -13
  190. package/src/app-data/loaders/jcampLoader.ts +11 -15
  191. package/src/app-data/loaders/loadMeasurements.ts +6 -5
  192. package/src/app-data/loaders/proprietary/agilent/cary500Loader.ts +8 -16
  193. package/src/app-data/loaders/spcLoader.ts +6 -12
  194. package/src/app-data/loaders/utility/measurementLoader.ts +2 -3
  195. package/src/app-data/loaders/wdfLoader.ts +5 -12
  196. package/src/components/index.ts +2 -1
  197. package/src/components/info-panel/InfoPanel.tsx +0 -1
  198. package/src/components/logger/FifoLoggerDialog.tsx +129 -0
  199. package/src/components/logger/FifoLoggerProvider.tsx +15 -0
  200. package/src/components/logger/FifoLoggerToolbarItem.tsx +59 -0
  201. package/src/components/logger/index.ts +4 -0
  202. package/src/components/logger/loggerContext.ts +4 -0
  203. package/src/components/logger/useFifoLogger.ts +22 -0
  204. package/src/components/table/Table.tsx +1 -6
  205. package/src/components/table/TableHeader.tsx +2 -2
  206. package/src/components/table/TableRow.tsx +4 -23
  207. package/src/components/table/tableContext.ts +1 -1
  208. package/src/components/toolbar/TooltipHelpContent.tsx +173 -0
  209. package/src/components/toolbar/index.ts +1 -0
@@ -1,7 +1,8 @@
1
1
  import { UseQueryResult } from '@tanstack/react-query';
2
+ import type { FifoLogger } from 'fifo-logger';
2
3
  import { FileCollection } from 'filelist-utils';
3
- import { AppDispatch } from '../../app-data/index';
4
- type LoadFn = (files: File[] | FileCollection, dispatch: AppDispatch) => Promise<void>;
4
+ import { AppDispatch } from '../../app-data';
5
+ type LoadFn = (files: File[] | FileCollection, logger: FifoLogger, dispatch: AppDispatch) => Promise<void>;
5
6
  export declare function useLoadFileCollectionFromHash(onLoad: LoadFn): UseQueryResult<true | null>;
6
7
  export declare function useDropFiles(onLoad: LoadFn): (files: File[]) => void;
7
8
  export {};
@@ -1 +1 @@
1
- {"version":3,"file":"file-loading.d.ts","sourceRoot":"","sources":["../../../src/app/hooks/file-loading.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAY,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAAE,cAAc,EAA+B,MAAM,gBAAgB,CAAC;AAG7E,OAAO,EAAE,WAAW,EAAkB,MAAM,sBAAsB,CAAC;AAGnE,KAAK,MAAM,GAAG,CACZ,KAAK,EAAE,IAAI,EAAE,GAAG,cAAc,EAC9B,QAAQ,EAAE,WAAW,KAClB,OAAO,CAAC,IAAI,CAAC,CAAC;AAEnB,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,MAAM,GACb,cAAc,CAAC,IAAI,GAAG,IAAI,CAAC,CAsB7B;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,WAG/B,IAAI,EAAE,UAMjB"}
1
+ {"version":3,"file":"file-loading.d.ts","sourceRoot":"","sources":["../../../src/app/hooks/file-loading.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACjE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,cAAc,EAA+B,MAAM,gBAAgB,CAAC;AAG7E,OAAO,EAAE,WAAW,EAAkB,MAAM,gBAAgB,CAAC;AAG7D,KAAK,MAAM,GAAG,CACZ,KAAK,EAAE,IAAI,EAAE,GAAG,cAAc,EAC9B,MAAM,EAAE,UAAU,EAClB,QAAQ,EAAE,WAAW,KAClB,OAAO,CAAC,IAAI,CAAC,CAAC;AAEnB,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,MAAM,GACb,cAAc,CAAC,IAAI,GAAG,IAAI,CAAC,CAsB7B;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,WAI/B,IAAI,EAAE,UAKjB"}
@@ -4,13 +4,14 @@ exports.useDropFiles = exports.useLoadFileCollectionFromHash = void 0;
4
4
  const react_query_1 = require("@tanstack/react-query");
5
5
  const filelist_utils_1 = require("filelist-utils");
6
6
  const react_1 = require("react");
7
- const index_1 = require("../../app-data/index");
8
- const index_2 = require("../../components/index");
7
+ const app_data_1 = require("../../app-data");
8
+ const components_1 = require("../../components");
9
9
  function useLoadFileCollectionFromHash(onLoad) {
10
- const appDispatch = (0, index_1.useAppDispatch)();
11
- const hashParams = (0, index_2.useHashSearchParams)();
10
+ const logger = (0, components_1.useFifoLogger)();
11
+ const appDispatch = (0, app_data_1.useAppDispatch)();
12
+ const hashParams = (0, components_1.useHashSearchParams)();
12
13
  const filelistUrl = hashParams.get('filelist');
13
- const query = (0, react_query_1.useQuery)({
14
+ return (0, react_query_1.useQuery)({
14
15
  queryKey: ['filelist', filelistUrl],
15
16
  queryFn: async () => {
16
17
  if (!filelistUrl) {
@@ -23,19 +24,18 @@ function useLoadFileCollectionFromHash(onLoad) {
23
24
  entries: data,
24
25
  baseURL,
25
26
  });
26
- void onLoad(fileCollection, appDispatch);
27
+ void onLoad(fileCollection, logger, appDispatch);
27
28
  return true;
28
29
  },
29
30
  });
30
- return query;
31
31
  }
32
32
  exports.useLoadFileCollectionFromHash = useLoadFileCollectionFromHash;
33
33
  function useDropFiles(onLoad) {
34
- const dispatch = (0, index_1.useAppDispatch)();
35
- const onDrop = (0, react_1.useCallback)((files) => {
36
- void onLoad(files, dispatch);
37
- }, [dispatch, onLoad]);
38
- return onDrop;
34
+ const dispatch = (0, app_data_1.useAppDispatch)();
35
+ const logger = (0, components_1.useFifoLogger)();
36
+ return (0, react_1.useCallback)((files) => {
37
+ void onLoad(files, logger, dispatch);
38
+ }, [dispatch, onLoad, logger]);
39
39
  }
40
40
  exports.useDropFiles = useDropFiles;
41
41
  //# sourceMappingURL=file-loading.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"file-loading.js","sourceRoot":"","sources":["../../../src/app/hooks/file-loading.ts"],"names":[],"mappings":";;;AAAA,uDAAiE;AACjE,mDAA6E;AAC7E,iCAAoC;AAEpC,gDAAmE;AACnE,kDAA6D;AAO7D,SAAgB,6BAA6B,CAC3C,MAAc;IAEd,MAAM,WAAW,GAAG,IAAA,sBAAc,GAAE,CAAC;IACrC,MAAM,UAAU,GAAG,IAAA,2BAAmB,GAAE,CAAC;IACzC,MAAM,WAAW,GAAG,UAAU,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAC/C,MAAM,KAAK,GAAG,IAAA,sBAAQ,EAAC;QACrB,QAAQ,EAAE,CAAC,UAAU,EAAE,WAAW,CAAC;QACnC,OAAO,EAAE,KAAK,IAAI,EAAE;YAClB,IAAI,CAAC,WAAW,EAAE,CAAC;gBACjB,OAAO,IAAI,CAAC;YACd,CAAC;YACD,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,WAAW,CAAC,CAAC;YACzC,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;YAClC,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;YACrD,MAAM,cAAc,GAAG,MAAM,IAAA,4CAA2B,EAAC;gBACvD,OAAO,EAAE,IAAI;gBACb,OAAO;aACR,CAAC,CAAC;YACH,KAAK,MAAM,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;YACzC,OAAO,IAAI,CAAC;QACd,CAAC;KACF,CAAC,CAAC;IACH,OAAO,KAAK,CAAC;AACf,CAAC;AAxBD,sEAwBC;AAED,SAAgB,YAAY,CAAC,MAAc;IACzC,MAAM,QAAQ,GAAG,IAAA,sBAAc,GAAE,CAAC;IAClC,MAAM,MAAM,GAAG,IAAA,mBAAW,EACxB,CAAC,KAAa,EAAE,EAAE;QAChB,KAAK,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAC/B,CAAC,EACD,CAAC,QAAQ,EAAE,MAAM,CAAC,CACnB,CAAC;IACF,OAAO,MAAM,CAAC;AAChB,CAAC;AATD,oCASC"}
1
+ {"version":3,"file":"file-loading.js","sourceRoot":"","sources":["../../../src/app/hooks/file-loading.ts"],"names":[],"mappings":";;;AAAA,uDAAiE;AAEjE,mDAA6E;AAC7E,iCAAoC;AAEpC,6CAA6D;AAC7D,iDAAsE;AAQtE,SAAgB,6BAA6B,CAC3C,MAAc;IAEd,MAAM,MAAM,GAAG,IAAA,0BAAa,GAAE,CAAC;IAC/B,MAAM,WAAW,GAAG,IAAA,yBAAc,GAAE,CAAC;IACrC,MAAM,UAAU,GAAG,IAAA,gCAAmB,GAAE,CAAC;IACzC,MAAM,WAAW,GAAG,UAAU,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAC/C,OAAO,IAAA,sBAAQ,EAAC;QACd,QAAQ,EAAE,CAAC,UAAU,EAAE,WAAW,CAAC;QACnC,OAAO,EAAE,KAAK,IAAI,EAAE;YAClB,IAAI,CAAC,WAAW,EAAE,CAAC;gBACjB,OAAO,IAAI,CAAC;YACd,CAAC;YACD,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,WAAW,CAAC,CAAC;YACzC,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;YAClC,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;YACrD,MAAM,cAAc,GAAG,MAAM,IAAA,4CAA2B,EAAC;gBACvD,OAAO,EAAE,IAAI;gBACb,OAAO;aACR,CAAC,CAAC;YACH,KAAK,MAAM,CAAC,cAAc,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;YACjD,OAAO,IAAI,CAAC;QACd,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAxBD,sEAwBC;AAED,SAAgB,YAAY,CAAC,MAAc;IACzC,MAAM,QAAQ,GAAG,IAAA,yBAAc,GAAE,CAAC;IAClC,MAAM,MAAM,GAAG,IAAA,0BAAa,GAAE,CAAC;IAC/B,OAAO,IAAA,mBAAW,EAChB,CAAC,KAAa,EAAE,EAAE;QAChB,KAAK,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IACvC,CAAC,EACD,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,CAC3B,CAAC;AACJ,CAAC;AATD,oCASC"}
@@ -24,7 +24,7 @@ const defaultFilters = FilterXYSchema_json_1.default.anyOf.map(({ properties })
24
24
  });
25
25
  function SignalProcessingPanel(props) {
26
26
  const { filters = [], onChange } = props;
27
- return ((0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsxs)(index_1.Table, { children: [(0, jsx_runtime_1.jsxs)(index_1.Table.Header, { children: [(0, jsx_runtime_1.jsx)(index_1.ValueRenderers.Header, { value: " " }), (0, jsx_runtime_1.jsx)(index_1.ValueRenderers.Header, { value: "Name" }), (0, jsx_runtime_1.jsx)(index_1.ValueRenderers.Header, { value: "Options" })] }), filters.map(({ name, options }, i) => ((0, jsx_runtime_1.jsxs)(index_1.Table.Row, { hasBorder: true, children: [(0, jsx_runtime_1.jsx)(index_1.ValueRenderers.Component, { children: (0, jsx_runtime_1.jsxs)("div", { style: { display: 'flex', gap: '3px' }, children: [(0, jsx_runtime_1.jsx)(index_1.Button, { style: { width: '15px' }, intent: "success", onClick: () => {
27
+ return ((0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsxs)(index_1.Table, { children: [(0, jsx_runtime_1.jsxs)(index_1.Table.Header, { children: [(0, jsx_runtime_1.jsx)(index_1.ValueRenderers.Header, { value: " " }), (0, jsx_runtime_1.jsx)(index_1.ValueRenderers.Header, { value: "Name" }), (0, jsx_runtime_1.jsx)(index_1.ValueRenderers.Header, { value: "Options" })] }), filters.map(({ name, options }, i) => ((0, jsx_runtime_1.jsxs)(index_1.Table.Row, { bordered: true, children: [(0, jsx_runtime_1.jsx)(index_1.ValueRenderers.Component, { children: (0, jsx_runtime_1.jsxs)("div", { style: { display: 'flex', gap: '3px' }, children: [(0, jsx_runtime_1.jsx)(index_1.Button, { style: { width: '15px' }, intent: "success", onClick: () => {
28
28
  const newFilters = [...filters];
29
29
  newFilters.splice(i + 1, 0, getDefaultFilter(defaultFilters[0]));
30
30
  onChange?.(newFilters);
@@ -1 +1 @@
1
- {"version":3,"file":"SignalProcessingPanel.js","sourceRoot":"","sources":["../../../src/app/panels/SignalProcessingPanel.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"SignalProcessingPanel.js","sourceRoot":"","sources":["../../../src/app/panels/SignalProcessingPanel.tsx"],"names":[],"mappings":"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"}
@@ -1,11 +1,11 @@
1
+ import type { FifoLogger } from 'fifo-logger';
1
2
  import type { FileCollection } from 'filelist-utils';
2
3
  import type { Measurements } from '../index';
3
- import { ParserLog } from './utility/parserLog';
4
4
  /**
5
5
  *
6
6
  * @param fileCollection - the dragged file/files
7
7
  * @param logs - pass to append errors to the logs, it mutates the external array.
8
8
  * @returns - new measurements object to be merged
9
9
  */
10
- export declare function biologicLoader(fileCollection: FileCollection, logs?: ParserLog[]): Promise<Partial<Measurements>>;
10
+ export declare function biologicLoader(fileCollection: FileCollection, logger?: FifoLogger): Promise<Partial<Measurements>>;
11
11
  //# sourceMappingURL=biologicLoader.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"biologicLoader.d.ts","sourceRoot":"","sources":["../../../src/app-data/loaders/biologicLoader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAErD,OAAO,KAAK,EAAE,YAAY,EAAmB,MAAM,UAAU,CAAC;AAG9D,OAAO,EAAkB,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAKhE;;;;;GAKG;AACH,wBAAsB,cAAc,CAClC,cAAc,EAAE,cAAc,EAC9B,IAAI,CAAC,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CA0DhC"}
1
+ {"version":3,"file":"biologicLoader.d.ts","sourceRoot":"","sources":["../../../src/app-data/loaders/biologicLoader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAErD,OAAO,KAAK,EAAmB,YAAY,EAAE,MAAM,UAAU,CAAC;AAO9D;;;;;GAKG;AACH,wBAAsB,cAAc,CAClC,cAAc,EAAE,cAAc,EAC9B,MAAM,CAAC,EAAE,UAAU,GAClB,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CA2DhC"}
@@ -3,14 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.biologicLoader = void 0;
4
4
  const biologic_converter_1 = require("biologic-converter");
5
5
  const getMeasurementInfoFromFile_1 = require("./utility/getMeasurementInfoFromFile");
6
- const parserLog_1 = require("./utility/parserLog");
7
6
  /**
8
7
  *
9
8
  * @param fileCollection - the dragged file/files
10
9
  * @param logs - pass to append errors to the logs, it mutates the external array.
11
10
  * @returns - new measurements object to be merged
12
11
  */
13
- async function biologicLoader(fileCollection, logs) {
12
+ async function biologicLoader(fileCollection, logger) {
14
13
  const measurements = {};
15
14
  const entries = [];
16
15
  for (const file of fileCollection.files) {
@@ -53,8 +52,8 @@ async function biologicLoader(fileCollection, logs) {
53
52
  catch (error) {
54
53
  //send error to UI to show to User ?
55
54
  if (error instanceof Error) {
56
- if (logs) {
57
- logs.push((0, parserLog_1.createLogEntry)({ error, relativePath: file.relativePath }));
55
+ if (logger) {
56
+ logger.error(error);
58
57
  }
59
58
  else {
60
59
  throw error;
@@ -62,6 +61,7 @@ async function biologicLoader(fileCollection, logs) {
62
61
  }
63
62
  }
64
63
  }
64
+ logger?.debug(`Loaded ${entries.length} entries with biologicLoader`);
65
65
  measurements.iv = { entries };
66
66
  return measurements;
67
67
  }
@@ -1 +1 @@
1
- {"version":3,"file":"biologicLoader.js","sourceRoot":"","sources":["../../../src/app-data/loaders/biologicLoader.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"biologicLoader.js","sourceRoot":"","sources":["../../../src/app-data/loaders/biologicLoader.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
+ import type { FifoLogger } from 'fifo-logger';
1
2
  import type { FileCollection } from 'filelist-utils';
2
3
  import type { Measurements } from '../index';
3
- import { ParserLog } from './utility/parserLog';
4
- export declare function cdfLoader(fileCollection: FileCollection, logs?: ParserLog[]): Promise<Partial<Measurements>>;
4
+ export declare function cdfLoader(fileCollection: FileCollection, logger?: FifoLogger): Promise<Partial<Measurements>>;
5
5
  //# sourceMappingURL=cdfLoader.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"cdfLoader.d.ts","sourceRoot":"","sources":["../../../src/app-data/loaders/cdfLoader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAIrD,OAAO,KAAK,EAAmB,YAAY,EAAmB,MAAM,UAAU,CAAC;AAG/E,OAAO,EAAE,SAAS,EAAkB,MAAM,qBAAqB,CAAC;AAEhE,wBAAsB,SAAS,CAC7B,cAAc,EAAE,cAAc,EAC9B,IAAI,CAAC,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAoEhC"}
1
+ {"version":3,"file":"cdfLoader.d.ts","sourceRoot":"","sources":["../../../src/app-data/loaders/cdfLoader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAIrD,OAAO,KAAK,EAAoC,YAAY,EAAE,MAAM,UAAU,CAAC;AAI/E,wBAAsB,SAAS,CAC7B,cAAc,EAAE,cAAc,EAC9B,MAAM,CAAC,EAAE,UAAU,GAClB,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CA+DhC"}
@@ -4,10 +4,10 @@ exports.cdfLoader = void 0;
4
4
  const netcdfjs_1 = require("netcdfjs");
5
5
  const index_1 = require("../../components/index");
6
6
  const getMeasurementInfoFromFile_1 = require("./utility/getMeasurementInfoFromFile");
7
- const parserLog_1 = require("./utility/parserLog");
8
- async function cdfLoader(fileCollection, logs) {
7
+ async function cdfLoader(fileCollection, logger) {
9
8
  const newMeasurements = {};
10
9
  let kind;
10
+ let count = 0;
11
11
  for (const file of fileCollection) {
12
12
  if (/\.cdf$/i.test(file.name)) {
13
13
  try {
@@ -39,17 +39,13 @@ async function cdfLoader(fileCollection, logs) {
39
39
  : chromatogram(reader),
40
40
  };
41
41
  newMeasurements[kind]?.entries.push(newMeasurement);
42
+ count++;
42
43
  }
43
44
  catch (error) {
44
45
  if (error instanceof Error) {
45
46
  //send error to UI ?
46
- if (logs) {
47
- logs.push((0, parserLog_1.createLogEntry)({
48
- error,
49
- parser: 'cdfLoader',
50
- message: 'error parsing file from cdfLoader',
51
- relativePath: file.relativePath,
52
- }));
47
+ if (logger) {
48
+ logger.error(error);
53
49
  }
54
50
  else {
55
51
  throw error;
@@ -58,6 +54,7 @@ async function cdfLoader(fileCollection, logs) {
58
54
  }
59
55
  }
60
56
  }
57
+ logger?.debug(`Loaded ${count} measurements with cdfLoader`);
61
58
  return newMeasurements;
62
59
  }
63
60
  exports.cdfLoader = cdfLoader;
@@ -1 +1 @@
1
- {"version":3,"file":"cdfLoader.js","sourceRoot":"","sources":["../../../src/app-data/loaders/cdfLoader.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cdfLoader.js","sourceRoot":"","sources":["../../../src/app-data/loaders/cdfLoader.ts"],"names":[],"mappings":"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"}
@@ -1,11 +1,11 @@
1
+ import type { FifoLogger } from 'fifo-logger';
1
2
  import type { FileCollection } from 'filelist-utils';
2
3
  import type { Measurements } from '../index';
3
- import { ParserLog } from './utility/parserLog';
4
4
  /**
5
5
  *
6
6
  * @param fileCollection - the dragged file/files
7
7
  * @param logger - whether to log to console or not
8
8
  * @returns - new measurements object to be merged
9
9
  */
10
- export declare function jcampLoader(fileCollection: FileCollection, logs?: ParserLog[]): Promise<Partial<Measurements>>;
10
+ export declare function jcampLoader(fileCollection: FileCollection, logger?: FifoLogger): Promise<Partial<Measurements>>;
11
11
  //# sourceMappingURL=jcampLoader.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"jcampLoader.d.ts","sourceRoot":"","sources":["../../../src/app-data/loaders/jcampLoader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAIrD,OAAO,KAAK,EAAmB,YAAY,EAAE,MAAM,UAAU,CAAC;AAG9D,OAAO,EAAkB,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhE;;;;;GAKG;AACH,wBAAsB,WAAW,CAC/B,cAAc,EAAE,cAAc,EAC9B,IAAI,CAAC,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CA2DhC"}
1
+ {"version":3,"file":"jcampLoader.d.ts","sourceRoot":"","sources":["../../../src/app-data/loaders/jcampLoader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAIrD,OAAO,KAAK,EAAmB,YAAY,EAAE,MAAM,UAAU,CAAC;AAI9D;;;;;GAKG;AACH,wBAAsB,WAAW,CAC/B,cAAc,EAAE,cAAc,EAC9B,MAAM,CAAC,EAAE,UAAU,GAClB,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAsDhC"}
@@ -4,14 +4,14 @@ exports.jcampLoader = void 0;
4
4
  const jcampconverter_1 = require("jcampconverter");
5
5
  const index_1 = require("../../components/index");
6
6
  const getMeasurementInfoFromFile_1 = require("./utility/getMeasurementInfoFromFile");
7
- const parserLog_1 = require("./utility/parserLog");
8
7
  /**
9
8
  *
10
9
  * @param fileCollection - the dragged file/files
11
10
  * @param logger - whether to log to console or not
12
11
  * @returns - new measurements object to be merged
13
12
  */
14
- async function jcampLoader(fileCollection, logs) {
13
+ async function jcampLoader(fileCollection, logger) {
14
+ let count = 0;
15
15
  const newMeasurements = {};
16
16
  for (const file of fileCollection) {
17
17
  if (/(?:\.jdx|\.dx)$/i.test(file.name)) {
@@ -46,21 +46,16 @@ async function jcampLoader(fileCollection, logs) {
46
46
  meta: measurement.meta,
47
47
  data: normalizeSpectra(measurement.spectra),
48
48
  };
49
+ count++;
49
50
  Object.assign(newMeasurement.info, measurement.info);
50
51
  newMeasurements[kind]?.entries.push(newMeasurement);
51
52
  }
52
53
  }
53
54
  }
54
55
  catch (error) {
55
- // send error to UI ?
56
56
  if (error instanceof Error) {
57
- if (logs) {
58
- logs.push((0, parserLog_1.createLogEntry)({
59
- error,
60
- parser: 'jcamp converter',
61
- relativePath: file.relativePath,
62
- message: 'error parsing jdx or dx file',
63
- }));
57
+ if (logger) {
58
+ logger?.error(error);
64
59
  }
65
60
  else {
66
61
  throw error;
@@ -69,6 +64,7 @@ async function jcampLoader(fileCollection, logs) {
69
64
  }
70
65
  }
71
66
  }
67
+ logger?.debug(`Loaded ${count} measurements with jcampLoader`);
72
68
  return newMeasurements;
73
69
  }
74
70
  exports.jcampLoader = jcampLoader;
@@ -94,10 +90,11 @@ function normalizeSpectra(spectra) {
94
90
  const variable = variables[key];
95
91
  if (variable.label)
96
92
  continue;
97
- variable.label = variable.name || variable.symbol || key;
98
- if (variable.units && !variable.label.includes(variable.units)) {
99
- variable.label += ` [${variable.units}]`;
93
+ let label = variable.name || variable.symbol || key;
94
+ if (variable.units && !label.includes(variable.units)) {
95
+ label += ` [${variable.units}]`;
100
96
  }
97
+ variable.label = label;
101
98
  }
102
99
  }
103
100
  data.push({ variables });
@@ -1 +1 @@
1
- {"version":3,"file":"jcampLoader.js","sourceRoot":"","sources":["../../../src/app-data/loaders/jcampLoader.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"jcampLoader.js","sourceRoot":"","sources":["../../../src/app-data/loaders/jcampLoader.ts"],"names":[],"mappings":"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"}
@@ -1,13 +1,14 @@
1
+ import type { FifoLogger } from 'fifo-logger';
1
2
  import type { FileCollection } from 'filelist-utils';
2
- import { Measurements, Enhancers } from '../index';
3
+ import { Enhancers, Measurements } from '../index';
3
4
  import { MeasurementsLoader } from './utility/measurementLoader';
4
5
  import type { ParserLog } from './utility/parserLog';
5
6
  export interface LoadOptions {
6
7
  loaders?: MeasurementsLoader[];
7
8
  enhancers?: Partial<Enhancers>;
8
- logger?: boolean;
9
+ logger?: FifoLogger;
9
10
  }
10
- export declare function loadMeasurements(fileCollection: FileCollection, options?: LoadOptions): Promise<{
11
+ export declare function loadMeasurements(fileCollection: FileCollection, options: LoadOptions): Promise<{
11
12
  measurements: Partial<Measurements>;
12
13
  logs: ParserLog[];
13
14
  }>;
@@ -1 +1 @@
1
- {"version":3,"file":"loadMeasurements.d.ts","sourceRoot":"","sources":["../../../src/app-data/loaders/loadMeasurements.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAGrD,OAAO,EAAE,YAAY,EAAW,SAAS,EAAmB,MAAM,UAAU,CAAC;AAE7E,OAAO,EACL,kBAAkB,EAEnB,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAErD,MAAM,WAAW,WAAW;IAC1B,OAAO,CAAC,EAAE,kBAAkB,EAAE,CAAC;IAC/B,SAAS,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IAC/B,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,wBAAsB,gBAAgB,CACpC,cAAc,EAAE,cAAc,EAC9B,OAAO,GAAE,WAAgB;;;GAkB1B"}
1
+ {"version":3,"file":"loadMeasurements.d.ts","sourceRoot":"","sources":["../../../src/app-data/loaders/loadMeasurements.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAGrD,OAAO,EAAW,SAAS,EAAmB,YAAY,EAAE,MAAM,UAAU,CAAC;AAE7E,OAAO,EACL,kBAAkB,EAEnB,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAErD,MAAM,WAAW,WAAW;IAC1B,OAAO,CAAC,EAAE,kBAAkB,EAAE,CAAC;IAC/B,SAAS,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IAC/B,MAAM,CAAC,EAAE,UAAU,CAAC;CACrB;AAED,wBAAsB,gBAAgB,CACpC,cAAc,EAAE,cAAc,EAC9B,OAAO,EAAE,WAAW;;;GAkBrB"}
@@ -4,14 +4,14 @@ exports.loadMeasurements = void 0;
4
4
  const ml_spectra_processing_1 = require("ml-spectra-processing");
5
5
  const index_1 = require("../index");
6
6
  const measurementLoader_1 = require("./utility/measurementLoader");
7
- async function loadMeasurements(fileCollection, options = {}) {
7
+ async function loadMeasurements(fileCollection, options) {
8
8
  const measurements = {};
9
9
  const logs = [];
10
- const { loaders = [], enhancers = {}, logger = true } = options;
10
+ const { loaders = [], enhancers = {}, logger } = options;
11
11
  for (const loader of loaders) {
12
12
  // TODO: load in parallel
13
13
  // eslint-disable-next-line no-await-in-loop
14
- const loaderData = await loader(fileCollection, logger ? logs : undefined);
14
+ const loaderData = await loader(fileCollection, logger);
15
15
  for (const { entries } of Object.values(loaderData)) {
16
16
  for (const entry of entries) {
17
17
  computeMinMax(entry);
@@ -1 +1 @@
1
- {"version":3,"file":"loadMeasurements.js","sourceRoot":"","sources":["../../../src/app-data/loaders/loadMeasurements.ts"],"names":[],"mappings":";;;AACA,iEAAsD;AAEtD,oCAA6E;AAE7E,mEAGqC;AAS9B,KAAK,UAAU,gBAAgB,CACpC,cAA8B,EAC9B,UAAuB,EAAE;IAEzB,MAAM,YAAY,GAA0B,EAAE,CAAC;IAC/C,MAAM,IAAI,GAAgB,EAAE,CAAC;IAC7B,MAAM,EAAE,OAAO,GAAG,EAAE,EAAE,SAAS,GAAG,EAAE,EAAE,MAAM,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;IAChE,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,yBAAyB;QACzB,4CAA4C;QAC5C,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAC3E,KAAK,MAAM,EAAE,OAAO,EAAE,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;YACpD,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;gBAC5B,aAAa,CAAC,KAAK,CAAC,CAAC;YACvB,CAAC;QACH,CAAC;QACD,IAAA,eAAO,EAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QAC/B,IAAA,qCAAiB,EAAC,YAAY,EAAE,UAAU,CAAC,CAAC;IAC9C,CAAC;IACD,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;AAChC,CAAC;AApBD,4CAoBC;AAED,SAAS,aAAa,CAAC,WAA4B;IACjD,KAAK,MAAM,KAAK,IAAI,WAAW,CAAC,IAAI,EAAE,CAAC;QACrC,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC;YACtD,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC/B,qCAAqC;gBACrC,OAAO;YACT,CAAC;YACD,IAAI,QAAQ,CAAC,GAAG,KAAK,SAAS,IAAI,QAAQ,CAAC,GAAG,KAAK,SAAS,EAAE,CAAC;gBAC7D,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAA,qCAAa,EAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;gBAClD,QAAQ,CAAC,GAAG,GAAG,GAAG,CAAC;gBACnB,QAAQ,CAAC,GAAG,GAAG,GAAG,CAAC;YACrB,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"loadMeasurements.js","sourceRoot":"","sources":["../../../src/app-data/loaders/loadMeasurements.ts"],"names":[],"mappings":";;;AAEA,iEAAsD;AAEtD,oCAA6E;AAE7E,mEAGqC;AAS9B,KAAK,UAAU,gBAAgB,CACpC,cAA8B,EAC9B,OAAoB;IAEpB,MAAM,YAAY,GAA0B,EAAE,CAAC;IAC/C,MAAM,IAAI,GAAgB,EAAE,CAAC;IAC7B,MAAM,EAAE,OAAO,GAAG,EAAE,EAAE,SAAS,GAAG,EAAE,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACzD,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,yBAAyB;QACzB,4CAA4C;QAC5C,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;QACxD,KAAK,MAAM,EAAE,OAAO,EAAE,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;YACpD,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;gBAC5B,aAAa,CAAC,KAAK,CAAC,CAAC;YACvB,CAAC;QACH,CAAC;QACD,IAAA,eAAO,EAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QAC/B,IAAA,qCAAiB,EAAC,YAAY,EAAE,UAAU,CAAC,CAAC;IAC9C,CAAC;IACD,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;AAChC,CAAC;AApBD,4CAoBC;AAED,SAAS,aAAa,CAAC,WAA4B;IACjD,KAAK,MAAM,KAAK,IAAI,WAAW,CAAC,IAAI,EAAE,CAAC;QACrC,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC;YACtD,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC/B,qCAAqC;gBACrC,OAAO;YACT,CAAC;YACD,IAAI,QAAQ,CAAC,GAAG,KAAK,SAAS,IAAI,QAAQ,CAAC,GAAG,KAAK,SAAS,EAAE,CAAC;gBAC7D,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAA,qCAAa,EAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;gBAClD,QAAQ,CAAC,GAAG,GAAG,GAAG,CAAC;gBACnB,QAAQ,CAAC,GAAG,GAAG,GAAG,CAAC;YACrB,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC"}
@@ -1,4 +1,5 @@
1
+ import type { FifoLogger } from 'fifo-logger';
1
2
  import type { FileCollection } from 'filelist-utils';
2
- import { Measurements, ParserLog } from '../../../index';
3
- export declare function cary500Loader(fileCollection: FileCollection, logs?: ParserLog[]): Promise<Partial<Measurements>>;
3
+ import { Measurements } from '../../../index';
4
+ export declare function cary500Loader(fileCollection: FileCollection, logger?: FifoLogger): Promise<Partial<Measurements>>;
4
5
  //# sourceMappingURL=cary500Loader.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"cary500Loader.d.ts","sourceRoot":"","sources":["../../../../../src/app-data/loaders/proprietary/agilent/cary500Loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAsB,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAEzE,OAAO,EACL,YAAY,EAGZ,SAAS,EAEV,MAAM,gBAAgB,CAAC;AAExB,wBAAsB,aAAa,CACjC,cAAc,EAAE,cAAc,EAC9B,IAAI,CAAC,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAkChC"}
1
+ {"version":3,"file":"cary500Loader.d.ts","sourceRoot":"","sources":["../../../../../src/app-data/loaders/proprietary/agilent/cary500Loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,KAAK,EAAE,cAAc,EAAsB,MAAM,gBAAgB,CAAC;AAEzE,OAAO,EAGL,YAAY,EACb,MAAM,gBAAgB,CAAC;AAExB,wBAAsB,aAAa,CACjC,cAAc,EAAE,cAAc,EAC9B,MAAM,CAAC,EAAE,UAAU,GAClB,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CA2BhC"}
@@ -2,7 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.cary500Loader = void 0;
4
4
  const index_1 = require("../../../index");
5
- async function cary500Loader(fileCollection, logs) {
5
+ async function cary500Loader(fileCollection, logger) {
6
6
  const newMeasurements = {};
7
7
  const entries = [];
8
8
  for (const file of fileCollection) {
@@ -17,14 +17,8 @@ async function cary500Loader(fileCollection, logs) {
17
17
  }
18
18
  catch (error) {
19
19
  if (error instanceof Error) {
20
- if (logs) {
21
- logs.push((0, index_1.createLogEntry)({
22
- kind: 'error',
23
- parser: 'cary500Loader',
24
- message: 'Error parsing cary500 experiment.',
25
- error,
26
- relativePath: file.relativePath,
27
- }));
20
+ if (logger) {
21
+ logger.error(error);
28
22
  }
29
23
  else {
30
24
  throw error;
@@ -33,6 +27,7 @@ async function cary500Loader(fileCollection, logs) {
33
27
  }
34
28
  }
35
29
  }
30
+ logger?.debug(`Loaded ${entries.length} entries with cary500Loader`);
36
31
  newMeasurements.uvvis = { entries };
37
32
  return newMeasurements;
38
33
  }
@@ -1 +1 @@
1
- {"version":3,"file":"cary500Loader.js","sourceRoot":"","sources":["../../../../../src/app-data/loaders/proprietary/agilent/cary500Loader.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cary500Loader.js","sourceRoot":"","sources":["../../../../../src/app-data/loaders/proprietary/agilent/cary500Loader.ts"],"names":[],"mappings":"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"}
@@ -1,11 +1,11 @@
1
+ import type { FifoLogger } from 'fifo-logger';
1
2
  import type { FileCollection } from 'filelist-utils';
2
3
  import type { Measurements } from '../index';
3
- import { ParserLog } from './utility/parserLog';
4
4
  /**
5
5
  *
6
6
  * @param fileCollection - the dragged file/files
7
7
  * @param logger - whether to log to console or not
8
8
  * @returns - new measurements object to be merged
9
9
  */
10
- export declare function spcLoader(fileCollection: FileCollection, logs?: ParserLog[]): Promise<Partial<Measurements>>;
10
+ export declare function spcLoader(fileCollection: FileCollection, logger?: FifoLogger): Promise<Partial<Measurements>>;
11
11
  //# sourceMappingURL=spcLoader.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"spcLoader.d.ts","sourceRoot":"","sources":["../../../src/app-data/loaders/spcLoader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAIrD,OAAO,KAAK,EAAmB,YAAY,EAAmB,MAAM,UAAU,CAAC;AAG/E,OAAO,EAAE,SAAS,EAAkB,MAAM,qBAAqB,CAAC;AAEhE;;;;;GAKG;AACH,wBAAsB,SAAS,CAC7B,cAAc,EAAE,cAAc,EAC9B,IAAI,CAAC,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAsChC"}
1
+ {"version":3,"file":"spcLoader.d.ts","sourceRoot":"","sources":["../../../src/app-data/loaders/spcLoader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAIrD,OAAO,KAAK,EAAoC,YAAY,EAAE,MAAM,UAAU,CAAC;AAI/E;;;;;GAKG;AACH,wBAAsB,SAAS,CAC7B,cAAc,EAAE,cAAc,EAC9B,MAAM,CAAC,EAAE,UAAU,GAClB,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAgChC"}
@@ -4,14 +4,13 @@ exports.spcLoader = void 0;
4
4
  const spc_parser_1 = require("spc-parser");
5
5
  const index_1 = require("../../components/index");
6
6
  const getMeasurementInfoFromFile_1 = require("./utility/getMeasurementInfoFromFile");
7
- const parserLog_1 = require("./utility/parserLog");
8
7
  /**
9
8
  *
10
9
  * @param fileCollection - the dragged file/files
11
10
  * @param logger - whether to log to console or not
12
11
  * @returns - new measurements object to be merged
13
12
  */
14
- async function spcLoader(fileCollection, logs) {
13
+ async function spcLoader(fileCollection, logger) {
15
14
  const measurements = {};
16
15
  for (const file of fileCollection) {
17
16
  if (/\.spc$/i.test(file.name)) {
@@ -31,12 +30,8 @@ async function spcLoader(fileCollection, logs) {
31
30
  });
32
31
  }
33
32
  catch (error) {
34
- if (error instanceof Error && logs) {
35
- logs.push((0, parserLog_1.createLogEntry)({
36
- parser: 'spc-parser',
37
- relativePath: file.relativePath,
38
- error,
39
- }));
33
+ if (error instanceof Error && logger) {
34
+ logger.error(error);
40
35
  }
41
36
  else {
42
37
  throw error;
@@ -1 +1 @@
1
- {"version":3,"file":"spcLoader.js","sourceRoot":"","sources":["../../../src/app-data/loaders/spcLoader.ts"],"names":[],"mappings":";;;AACA,2CAAqD;AAErD,kDAAgD;AAGhD,qFAAkF;AAClF,mDAAgE;AAEhE;;;;;GAKG;AACI,KAAK,UAAU,SAAS,CAC7B,cAA8B,EAC9B,IAAkB;IAElB,MAAM,YAAY,GAA0B,EAAE,CAAC;IAC/C,KAAK,MAAM,IAAI,IAAI,cAAc,EAAE,CAAC;QAClC,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAC9B,IAAI,CAAC;gBACH,yBAAyB;gBACzB,4CAA4C;gBAC5C,MAAM,MAAM,GAAG,IAAA,kBAAK,EAAC,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;gBAC/C,MAAM,WAAW,GAAoB,IAAA,6BAAgB,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBACnE,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE,CAAC;oBAC/B,YAAY,CAAC,WAAW,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;gBAC9C,CAAC;gBACD,IAAA,cAAM,EACJ,YAAY,CAAC,WAAW,CAAC,EACzB,0CAA0C,CAC3C,CAAC;gBACF,YAAY,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC;oBACtC,IAAI,EAAE,MAAM,CAAC,IAAI;oBACjB,GAAG,IAAA,uDAA0B,EAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;oBACrD,IAAI,EAAE,MAAM,CAAC,OAA6C;iBAC3D,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,KAAK,YAAY,KAAK,IAAI,IAAI,EAAE,CAAC;oBACnC,IAAI,CAAC,IAAI,CACP,IAAA,0BAAc,EAAC;wBACb,MAAM,EAAE,YAAY;wBACpB,YAAY,EAAE,IAAI,CAAC,YAAY;wBAC/B,KAAK;qBACN,CAAC,CACH,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACN,MAAM,KAAK,CAAC;gBACd,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,YAAY,CAAC;AACtB,CAAC;AAzCD,8BAyCC"}
1
+ {"version":3,"file":"spcLoader.js","sourceRoot":"","sources":["../../../src/app-data/loaders/spcLoader.ts"],"names":[],"mappings":";;;AAEA,2CAAqD;AAErD,kDAAgD;AAGhD,qFAAkF;AAElF;;;;;GAKG;AACI,KAAK,UAAU,SAAS,CAC7B,cAA8B,EAC9B,MAAmB;IAEnB,MAAM,YAAY,GAA0B,EAAE,CAAC;IAC/C,KAAK,MAAM,IAAI,IAAI,cAAc,EAAE,CAAC;QAClC,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAC9B,IAAI,CAAC;gBACH,yBAAyB;gBACzB,4CAA4C;gBAC5C,MAAM,MAAM,GAAG,IAAA,kBAAK,EAAC,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;gBAC/C,MAAM,WAAW,GAAoB,IAAA,6BAAgB,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBACnE,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE,CAAC;oBAC/B,YAAY,CAAC,WAAW,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;gBAC9C,CAAC;gBACD,IAAA,cAAM,EACJ,YAAY,CAAC,WAAW,CAAC,EACzB,0CAA0C,CAC3C,CAAC;gBACF,YAAY,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC;oBACtC,IAAI,EAAE,MAAM,CAAC,IAAI;oBACjB,GAAG,IAAA,uDAA0B,EAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;oBACrD,IAAI,EAAE,MAAM,CAAC,OAA6C;iBAC3D,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,KAAK,YAAY,KAAK,IAAI,MAAM,EAAE,CAAC;oBACrC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBACtB,CAAC;qBAAM,CAAC;oBACN,MAAM,KAAK,CAAC;gBACd,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,YAAY,CAAC;AACtB,CAAC;AAnCD,8BAmCC"}
@@ -1,6 +1,6 @@
1
+ import type { FifoLogger } from 'fifo-logger';
1
2
  import type { FileCollection } from 'filelist-utils';
2
3
  import type { Measurements } from '../../index';
3
- import type { ParserLog } from './parserLog';
4
- export type MeasurementsLoader = (fileCollection: FileCollection, logs?: ParserLog[]) => Promise<Partial<Measurements>>;
4
+ export type MeasurementsLoader = (fileCollection: FileCollection, logger?: FifoLogger) => Promise<Partial<Measurements>>;
5
5
  export declare function mergeMeasurements(measurements: Partial<Measurements>, newMeasurements: Partial<Measurements>): void;
6
6
  //# sourceMappingURL=measurementLoader.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"measurementLoader.d.ts","sourceRoot":"","sources":["../../../../src/app-data/loaders/utility/measurementLoader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAGrD,OAAO,KAAK,EAAmB,YAAY,EAAE,MAAM,aAAa,CAAC;AAEjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,MAAM,MAAM,kBAAkB,GAAG,CAC/B,cAAc,EAAE,cAAc,EAC9B,IAAI,CAAC,EAAE,SAAS,EAAE,KACf,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC;AAEpC,wBAAgB,iBAAiB,CAC/B,YAAY,EAAE,OAAO,CAAC,YAAY,CAAC,EACnC,eAAe,EAAE,OAAO,CAAC,YAAY,CAAC,QAYvC"}
1
+ {"version":3,"file":"measurementLoader.d.ts","sourceRoot":"","sources":["../../../../src/app-data/loaders/utility/measurementLoader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAGrD,OAAO,KAAK,EAAmB,YAAY,EAAE,MAAM,aAAa,CAAC;AAEjE,MAAM,MAAM,kBAAkB,GAAG,CAC/B,cAAc,EAAE,cAAc,EAC9B,MAAM,CAAC,EAAE,UAAU,KAChB,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC;AAEpC,wBAAgB,iBAAiB,CAC/B,YAAY,EAAE,OAAO,CAAC,YAAY,CAAC,EACnC,eAAe,EAAE,OAAO,CAAC,YAAY,CAAC,QAYvC"}
@@ -1 +1 @@
1
- {"version":3,"file":"measurementLoader.js","sourceRoot":"","sources":["../../../../src/app-data/loaders/utility/measurementLoader.ts"],"names":[],"mappings":";;;AAEA,qDAAmD;AAUnD,SAAgB,iBAAiB,CAC/B,YAAmC,EACnC,eAAsC;IAEtC,wCAAwC;IACxC,IAAI,IAAkC,CAAC;IACvC,KAAK,IAAI,IAAI,eAAe,EAAE,CAAC;QAC7B,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC;YACxB,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;QACvC,CAAC;QACD,IAAA,cAAM,EAAC,YAAY,CAAC,IAAI,CAAC,EAAE,0CAA0C,CAAC,CAAC;QACvE,MAAM,OAAO,GAAsB,eAAe,CAAC,IAAI,CAAC,EAAE,OAAO,IAAI,EAAE,CAAC;QACxE,YAAY,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;IAC/C,CAAC;AACH,CAAC;AAdD,8CAcC"}
1
+ {"version":3,"file":"measurementLoader.js","sourceRoot":"","sources":["../../../../src/app-data/loaders/utility/measurementLoader.ts"],"names":[],"mappings":";;;AAGA,qDAAmD;AAQnD,SAAgB,iBAAiB,CAC/B,YAAmC,EACnC,eAAsC;IAEtC,wCAAwC;IACxC,IAAI,IAAkC,CAAC;IACvC,KAAK,IAAI,IAAI,eAAe,EAAE,CAAC;QAC7B,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC;YACxB,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;QACvC,CAAC;QACD,IAAA,cAAM,EAAC,YAAY,CAAC,IAAI,CAAC,EAAE,0CAA0C,CAAC,CAAC;QACvE,MAAM,OAAO,GAAsB,eAAe,CAAC,IAAI,CAAC,EAAE,OAAO,IAAI,EAAE,CAAC;QACxE,YAAY,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;IAC/C,CAAC;AACH,CAAC;AAdD,8CAcC"}