npm - react-science - Versions diffs - 3.1.0 → 4.1.0 - Mend

react-science 3.1.0 → 4.1.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 (236) hide show

package/lib-esm/app/hooks/file-loading.d.ts.map CHANGED Viewed

	@@ -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"}

package/lib-esm/app/hooks/file-loading.js CHANGED Viewed

@@ -1,13 +1,14 @@
 import { useQuery } from '@tanstack/react-query';
 import { fileCollectionFromWebSource } from 'filelist-utils';
 import { useCallback } from 'react';
-import { useAppDispatch } from '../../app-data/index';
-import { useHashSearchParams } from '../../components/index';
+import { useAppDispatch } from '../../app-data';
+import { useFifoLogger, useHashSearchParams } from '../../components';
 export function useLoadFileCollectionFromHash(onLoad) {
+    const logger = useFifoLogger();
     const appDispatch = useAppDispatch();
     const hashParams = useHashSearchParams();
     const filelistUrl = hashParams.get('filelist');
-    const query = useQuery({
+    return useQuery({
         queryKey: ['filelist', filelistUrl],
         queryFn: async () => {
             if (!filelistUrl) {
@@ -20,17 +21,16 @@ export function useLoadFileCollectionFromHash(onLoad) {
                 entries: data,
                 baseURL,
             });
-            void onLoad(fileCollection, appDispatch);
+            void onLoad(fileCollection, logger, appDispatch);
             return true;
         },
     });
-    return query;
 }
 export function useDropFiles(onLoad) {
     const dispatch = useAppDispatch();
-    const onDrop = useCallback((files) => {
-        void onLoad(files, dispatch);
-    }, [dispatch, onLoad]);
-    return onDrop;
+    const logger = useFifoLogger();
+    return useCallback((files) => {
+        void onLoad(files, logger, dispatch);
+    }, [dispatch, onLoad, logger]);
 }
 //# sourceMappingURL=file-loading.js.map

package/lib-esm/app/hooks/file-loading.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"file-loading.js","sourceRoot":"","sources":["../../../src/app/hooks/file-loading.ts"],"names":[],"mappings":"AAAA,OAAO,~~EAAkB~~,QAAQ,~~EAAE~~,MAAM,uBAAuB,CAAC;~~AACjE~~,OAAO,EAAkB,2BAA2B,EAAE,MAAM,gBAAgB,CAAC;AAC7E,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AAEpC,OAAO,EAAe,cAAc,EAAE,MAAM,~~sBAAsB~~,CAAC;~~AACnE~~,OAAO,EAAE,mBAAmB,EAAE,MAAM,~~wBAAwB~~,CAAC;~~AAO7D~~,MAAM,UAAU,6BAA6B,CAC3C,MAAc;IAEd,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IACrC,MAAM,UAAU,GAAG,mBAAmB,EAAE,CAAC;IACzC,MAAM,WAAW,GAAG,UAAU,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAC/C,~~MAAM~~,~~KAAK,GAAG,~~QAAQ,CAAC;~~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,2BAA2B,CAAC;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;~~AAED,MAAM,UAAU,YAAY,CAAC,MAAc;IACzC,MAAM,QAAQ,GAAG,cAAc,EAAE,CAAC;IAClC,MAAM,MAAM,GAAG,WAAW,~~CACxB~~,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"}
1	+ {"version":3,"file":"file-loading.js","sourceRoot":"","sources":["../../../src/app/hooks/file-loading.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAkB,MAAM,uBAAuB,CAAC;AAEjE,OAAO,EAAkB,2BAA2B,EAAE,MAAM,gBAAgB,CAAC;AAC7E,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AAEpC,OAAO,EAAe,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAQtE,MAAM,UAAU,6BAA6B,CAC3C,MAAc;IAEd,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAC/B,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IACrC,MAAM,UAAU,GAAG,mBAAmB,EAAE,CAAC;IACzC,MAAM,WAAW,GAAG,UAAU,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAC/C,OAAO,QAAQ,CAAC;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,2BAA2B,CAAC;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;AAED,MAAM,UAAU,YAAY,CAAC,MAAc;IACzC,MAAM,QAAQ,GAAG,cAAc,EAAE,CAAC;IAClC,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAC/B,OAAO,WAAW,CAChB,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"}

package/lib-esm/app/panels/SignalProcessingPanel.js CHANGED Viewed

@@ -18,7 +18,7 @@ const defaultFilters = filterXY.anyOf.map(({ properties }) => {
 });
 export function SignalProcessingPanel(props) {
     const { filters = [], onChange } = props;
-    return (_jsxs("div", { children: [_jsxs(Table, { children: [_jsxs(Table.Header, { children: [_jsx(ValueRenderers.Header, { value: " " }), _jsx(ValueRenderers.Header, { value: "Name" }), _jsx(ValueRenderers.Header, { value: "Options" })] }), filters.map(({ name, options }, i) => (_jsxs(Table.Row, { hasBorder: true, children: [_jsx(ValueRenderers.Component, { children: _jsxs("div", { style: { display: 'flex', gap: '3px' }, children: [_jsx(Button, { style: { width: '15px' }, intent: "success", onClick: () => {
+    return (_jsxs("div", { children: [_jsxs(Table, { children: [_jsxs(Table.Header, { children: [_jsx(ValueRenderers.Header, { value: " " }), _jsx(ValueRenderers.Header, { value: "Name" }), _jsx(ValueRenderers.Header, { value: "Options" })] }), filters.map(({ name, options }, i) => (_jsxs(Table.Row, { bordered: true, children: [_jsx(ValueRenderers.Component, { children: _jsxs("div", { style: { display: 'flex', gap: '3px' }, children: [_jsx(Button, { style: { width: '15px' }, intent: "success", onClick: () => {
                                                 const newFilters = [...filters];
                                                 newFilters.splice(i + 1, 0, getDefaultFilter(defaultFilters[0]));
                                                 onChange?.(newFilters);

package/lib-esm/app/panels/SignalProcessingPanel.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"SignalProcessingPanel.js","sourceRoot":"","sources":["../../../src/app/panels/SignalProcessingPanel.tsx"],"names":[],"mappings":";AACA,OAAO,QAAQ,MAAM,0CAA0C,CAAC;AAEhE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAgBvE,mDAAmD;AACnD,MAAM,cAAc,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE;IAC3D,MAAM,OAAO,GAAsC,EAAE,CAAC;IACtD,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CACvC,UAAU,EAAE,OAAO,EAAE,UAAU,IAAI,EAAE,CACtC,EAAE,CAAC;QACF,OAAO,CAAC,GAAG,CAAC,GAAG;YACb,YAAY,EAAE,KAAK,CAAC,OAAO;YAC3B,OAAO,EAAE,KAAK,CAAC,IAAI;YACnB,WAAW,EAAE,KAAK,CAAC,WAAW;SAC/B,CAAC;IACJ,CAAC;IAED,OAAO;QACL,IAAI,EAAE,UAAU,CAAC,IAAI,CAAC,KAA6B;QACnD,OAAO;KACR,CAAC;AACJ,CAAC,CAAC,CAAC;AACH,MAAM,UAAU,qBAAqB,CAAC,KAAiC;IACrE,MAAM,EAAE,OAAO,GAAG,EAAE,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IAEzC,OAAO,CACL,0BACE,MAAC,KAAK,eACJ,MAAC,KAAK,CAAC,MAAM,eACX,KAAC,cAAc,CAAC,MAAM,IAAC,KAAK,EAAC,GAAG,GAAG,EACnC,KAAC,cAAc,CAAC,MAAM,IAAC,KAAK,EAAC,MAAM,GAAG,EACtC,KAAC,cAAc,CAAC,MAAM,IAAC,KAAK,EAAC,SAAS,GAAG,IAC5B,EACd,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,CACrC,MAAC,KAAK,CAAC,GAAG,IAAY,~~SAAS~~,~~mBAC7B~~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"}
1	+ {"version":3,"file":"SignalProcessingPanel.js","sourceRoot":"","sources":["../../../src/app/panels/SignalProcessingPanel.tsx"],"names":[],"mappings":";AACA,OAAO,QAAQ,MAAM,0CAA0C,CAAC;AAEhE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAgBvE,mDAAmD;AACnD,MAAM,cAAc,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE;IAC3D,MAAM,OAAO,GAAsC,EAAE,CAAC;IACtD,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CACvC,UAAU,EAAE,OAAO,EAAE,UAAU,IAAI,EAAE,CACtC,EAAE,CAAC;QACF,OAAO,CAAC,GAAG,CAAC,GAAG;YACb,YAAY,EAAE,KAAK,CAAC,OAAO;YAC3B,OAAO,EAAE,KAAK,CAAC,IAAI;YACnB,WAAW,EAAE,KAAK,CAAC,WAAW;SAC/B,CAAC;IACJ,CAAC;IAED,OAAO;QACL,IAAI,EAAE,UAAU,CAAC,IAAI,CAAC,KAA6B;QACnD,OAAO;KACR,CAAC;AACJ,CAAC,CAAC,CAAC;AACH,MAAM,UAAU,qBAAqB,CAAC,KAAiC;IACrE,MAAM,EAAE,OAAO,GAAG,EAAE,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IAEzC,OAAO,CACL,0BACE,MAAC,KAAK,eACJ,MAAC,KAAK,CAAC,MAAM,eACX,KAAC,cAAc,CAAC,MAAM,IAAC,KAAK,EAAC,GAAG,GAAG,EACnC,KAAC,cAAc,CAAC,MAAM,IAAC,KAAK,EAAC,MAAM,GAAG,EACtC,KAAC,cAAc,CAAC,MAAM,IAAC,KAAK,EAAC,SAAS,GAAG,IAC5B,EACd,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,CACrC,MAAC,KAAK,CAAC,GAAG,IAAY,QAAQ,mBAC5B,KAAC,cAAc,CAAC,SAAS,cACvB,eAAK,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,aACzC,KAAC,MAAM,IACL,KAAK,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,EACxB,MAAM,EAAC,SAAS,EAChB,OAAO,EAAE,GAAG,EAAE;gDACZ,MAAM,UAAU,GAAG,CAAC,GAAG,OAAO,CAAC,CAAC;gDAChC,UAAU,CAAC,MAAM,CACf,CAAC,GAAG,CAAC,EACL,CAAC,EACD,gBAAgB,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CACpC,CAAC;gDACF,QAAQ,EAAE,CAAC,UAAU,CAAC,CAAC;4CACzB,CAAC,kBAGM,EACT,KAAC,MAAM,IACL,KAAK,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,EACxB,MAAM,EAAC,QAAQ,EACf,OAAO,EAAE,GAAG,EAAE;gDACZ,QAAQ,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;4CAChD,CAAC,kBAGM,IACL,GACmB,EAC3B,KAAC,cAAc,CAAC,SAAS,cACvB,iBACE,QAAQ,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE;wCACvB,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;wCACnC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;4CACzB,MAAM,MAAM,GAAG,gBAAgB,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;4CACvD,MAAM,UAAU,GAAG,CAAC,GAAG,OAAO,CAAC,CAAC;4CAChC,UAAU,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC;4CACvB,QAAQ,EAAE,CAAC,UAAU,CAAC,CAAC;wCACzB,CAAC;oCACH,CAAC,EACD,KAAK,EAAE,EAAE,MAAM,EAAE,iBAAiB,EAAE,EACpC,KAAK,EAAE,cAAc,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,YAEtD,cAAc,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,CAAS,EAAE,EAAE,CAAC,CAC3C,iBAAmB,KAAK,EAAE,CAAC,YACxB,UAAU,CAAC,IAAI,CAAC,IADN,IAAI,CAER,CACV,CAAC,GACK,GACgB,EAC1B,OAAO,IAAI,CACV,KAAC,cAAc,CAAC,SAAS,cACtB,MAAM,CAAC,OAAO,CACb,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,EAAE,OAAO,IAAI,EAAE,CAC3D,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CACf,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;oCACrC,MAAM,aAAa,GAAG;wCACpB,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO;wCACrB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK;qCACnB,CAAC;oCACF,MAAM,MAAM,GAAG;wCACb,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI;wCACrB,OAAO,EAAE,aAAa;qCACvB,CAAC;oCACF,MAAM,UAAU,GAAG,CAAC,GAAG,OAAO,CAAC,CAAC;oCAChC,UAAU,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC;oCACvB,QAAQ,EAAE,CAAC,UAAU,CAAC,CAAC;gCACzB,CAAC,CAAC,CACH,GACwB,CAC5B,KAtEa,IAAI,CAuER,CACb,CAAC,IACI,EACP,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,CACvB,KAAC,MAAM,IACL,KAAK,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,EAC5C,MAAM,EAAC,SAAS,EAChB,OAAO,EAAE,GAAG,EAAE;oBACZ,MAAM,UAAU,GAAG,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBACzD,QAAQ,EAAE,CAAC,UAAU,CAAC,CAAC;gBACzB,CAAC,kBAGM,CACV,IACG,CACP,CAAC;AACJ,CAAC;AACD,SAAS,gBAAgB,CAAC,EAAE,OAAO,EAAE,IAAI,EAA6B;IACpE,IAAI,OAAO,EAAE,CAAC;QACZ,MAAM,MAAM,GAAoC,EAAE,CAAC;QAEnD,KAAK,MAAM,CAAC,GAAG,EAAE,EAAE,YAAY,EAAE,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YAC9D,MAAM,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC;QAC7B,CAAC;QACD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;IACnC,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,CAAC;AAClB,CAAC;AACD,SAAS,UAAU,CAAC,GAAW;IAC7B,MAAM,MAAM,GAAG,GAAG,CAAC,UAAU,CAAC,kBAAkB,EAAE,WAAW,CAAC,CAAC,IAAI,EAAE,CAAC;IACtE,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAC1D,CAAC;AACD,SAAS,WAAW,CAClB,CAAC,GAAG,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,CAA8B,EAC5D,OAAwC,EACxC,QAA0C;IAE1C,OAAO,CACL,eAAK,KAAK,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,aAC7B,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAC/B,kBACE,QAAQ,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE;oBACvB,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;oBAC3B,IAAI,KAAK,EAAE,CAAC;wBACV,QAAQ,CAAC,KAAK,CAAC,CAAC;oBAClB,CAAC;gBACH,CAAC,EACD,KAAK,EAAE,EAAE,MAAM,EAAE,iBAAiB,EAAE,EACpC,KAAK,EAAE,OAAO,EAAE,CAAC,GAAG,CAAC,aAErB,iBAAQ,KAAK,EAAC,EAAE,EAAC,QAAQ,QAAC,QAAQ,kBAC/B,UAAU,CAAC,GAAG,CAAC,GACT,EACR,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CACvB,iBAAqB,KAAK,EAAE,MAAM,YAC/B,UAAU,CAAC,MAAM,CAAC,IADR,MAAM,CAEV,CACV,CAAC,IACK,CACV,CAAC,CAAC,CAAC,CACF,gBACE,KAAK,EAAE,EAAE,MAAM,EAAE,iBAAiB,EAAE,OAAO,EAAE,SAAS,EAAE,EACxD,WAAW,EAAE,UAAU,CAAC,GAAG,CAAC,EAC5B,QAAQ,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE;oBACvB,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;oBAC3B,IAAI,KAAK,EAAE,CAAC;wBACV,QAAQ,CAAC,KAAK,CAAC,CAAC;oBAClB,CAAC;gBACH,CAAC,EACD,KAAK,EAAE,OAAO,EAAE,CAAC,GAAG,CAAC,GACrB,CACH,EACD,gBAAO,KAAK,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,YAAG,WAAW,GAAS,KAlCrB,GAAG,CAmCpC,CACP,CAAC;AACJ,CAAC"}

package/lib-esm/app-data/loaders/biologicLoader.d.ts CHANGED Viewed

@@ -1,11 +1,11 @@
+import type { FifoLogger } from 'fifo-logger';
 import type { FileCollection } from 'filelist-utils';
 import type { Measurements } from '../index';
-import { ParserLog } from './utility/parserLog';
 /**
  *
  * @param fileCollection - the dragged file/files
  * @param logs - pass to append errors to the logs, it mutates the external array.
  * @returns - new measurements object to be merged
  */
-export declare function biologicLoader(fileCollection: FileCollection, logs?: ParserLog[]): Promise<Partial<Measurements>>;
+export declare function biologicLoader(fileCollection: FileCollection, logger?: FifoLogger): Promise<Partial<Measurements>>;
 //# sourceMappingURL=biologicLoader.d.ts.map

package/lib-esm/app-data/loaders/biologicLoader.d.ts.map CHANGED Viewed

	@@ -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"}

package/lib-esm/app-data/loaders/biologicLoader.js CHANGED Viewed

@@ -1,13 +1,12 @@
 import { parseMPR, parseMPT } from 'biologic-converter';
 import { getMeasurementInfoFromFile } from './utility/getMeasurementInfoFromFile';
-import { createLogEntry } from './utility/parserLog';
 /**
  *
  * @param fileCollection - the dragged file/files
  * @param logs - pass to append errors to the logs, it mutates the external array.
  * @returns - new measurements object to be merged
  */
-export async function biologicLoader(fileCollection, logs) {
+export async function biologicLoader(fileCollection, logger) {
     const measurements = {};
     const entries = [];
     for (const file of fileCollection.files) {
@@ -50,8 +49,8 @@ export async function biologicLoader(fileCollection, logs) {
         catch (error) {
             //send error to UI to show to User ?
             if (error instanceof Error) {
-                if (logs) {
-                    logs.push(createLogEntry({ error, relativePath: file.relativePath }));
+                if (logger) {
+                    logger.error(error);
                 }
                 else {
                     throw error;
@@ -59,6 +58,7 @@ export async function biologicLoader(fileCollection, logs) {
             }
         }
     }
+    logger?.debug(`Loaded ${entries.length} entries with biologicLoader`);
     measurements.iv = { entries };
     return measurements;
 }

package/lib-esm/app-data/loaders/biologicLoader.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"biologicLoader.js","sourceRoot":"","sources":["../../../src/app-data/loaders/biologicLoader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;~~AAMxD~~,OAAO,EAAE,0BAA0B,EAAE,MAAM,sCAAsC,CAAC;~~AAClF,OAAO,EAAE,cAAc,EAAa,MAAM,qBAAqB,CAAC;AAKhE~~;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,cAA8B,EAC9B,~~IAAkB~~;~~IAElB~~,MAAM,YAAY,GAA0B,EAAE,CAAC;IAC/C,MAAM,OAAO,GAAsB,EAAE,CAAC;IAEtC,KAAK,MAAM,IAAI,IAAI,cAAc,CAAC,KAAK,EAAE,CAAC;QACxC,IAAI,CAAC;YACH,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC9B,yBAAyB;gBACzB,4CAA4C;gBAC5C,MAAM,GAAG,GAAG,QAAQ,CAAC,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;gBAC/C,MAAM,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC;gBACpC,MAAM,IAAI,GAAG,0BAA0B,CACrC,IAAI,EACJ,eAAe,IAAI,CAAC,SAAS,EAAE,CAChC,CAAC;gBACF,2DAA2D;gBAC3D,MAAM,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBAClE,MAAM,MAAM,GAAoB;oBAC9B,GAAG,IAAI;oBACP,IAAI;oBACJ,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC;iBACtB,CAAC;gBACF,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACvB,CAAC;iBAAM,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBACrC,yBAAyB;gBACzB,4CAA4C;gBAC5C,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAAC,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;gBAC9D,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;oBACnB,MAAM,QAAQ,GAAG,QAAQ,EAAE,SAAS,CAAC;oBACrC,MAAM,IAAI,GAAG,0BAA0B,CACrC,IAAI,EACJ,QAAQ,EAAE,SAAS;wBACjB,CAAC,CAAC,eAAe,QAAQ,CAAC,SAAS,EAAE;wBACrC,CAAC,CAAC,IAAI,CAAC,IAAI,CACd,CAAC;oBACF,2DAA2D;oBAC3D,MAAM,SAAS,GAAG,WAAW,CAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;oBACnE,MAAM,MAAM,GAAoB;wBAC9B,GAAG,IAAI;wBACP,IAAI,EAAE,QAAQ,IAAI,EAAE;wBACpB,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC;qBACtB,CAAC;oBACF,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACvB,CAAC;YACH,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,oCAAoC;YACpC,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;gBAC3B,IAAI,~~IAAI~~,EAAE,CAAC;~~oBACT~~,~~IAAI~~,CAAC,~~IAAI~~,CAAC,~~cAAc,CAAC,EAAE,~~KAAK,~~EAAE,YAAY,EAAE,IAAI,~~CAAC,~~YAAY,EAAE,~~CAAC~~,CAAC,CAAC~~;~~gBACxE~~,CAAC;qBAAM,CAAC;oBACN,MAAM,KAAK,CAAC;gBACd,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IACD,YAAY,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC;IAC9B,OAAO,YAAY,CAAC;AACtB,CAAC;AAED;;;;;;;;;GASG;AACH,SAAS,WAAW,CAClB,SAA6B,EAC7B,SAAkC;IAElC,IAAI,CAAC,SAAS;QAAE,OAAO,SAAS,CAAC;IAEjC,QAAQ,SAAS,EAAE,CAAC;QAClB,KAAK,IAAI,CAAC,CAAC,CAAC;YACV,sDAAsD;YACtD,SAAS,GAAG,UAAU,CAAC,SAAS,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;YAC5C,SAAS,GAAG,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;YAC/C,MAAM;QACR,CAAC;QACD,KAAK,IAAI,CAAC,CAAC,CAAC;YACV,gCAAgC;YAChC,SAAS,GAAG,UAAU,CAAC,SAAS,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;YAChD,SAAS,GAAG,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;YAC/C,MAAM;QACR,CAAC;QACD,KAAK,IAAI,CAAC,CAAC,CAAC;YACV,+BAA+B;YAC/B,SAAS,GAAG,UAAU,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;YAC9C,SAAS,GAAG,UAAU,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;YAC9C,MAAM;QACR,CAAC;QACD,KAAK,MAAM,CAAC,CAAC,CAAC;YACZ,SAAS,GAAG,UAAU,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;YAC9C,SAAS,GAAG,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;YAC/C,MAAM;QACR,CAAC;QACD,KAAK,KAAK,CAAC,CAAC,CAAC;YACX,SAAS,GAAG,UAAU,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;YAC9C,SAAS,GAAG,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;YAC/C,MAAM;QACR,CAAC;QACD;YACE,MAAM;IACV,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AACD;;;;;;;GAOG;AACH,SAAS,UAAU,CACjB,SAAkC,EAClC,KAAa,EACb,OAAkB;IAElB,KAAK,MAAM,KAAK,IAAI,SAAS,EAAE,CAAC;QAC9B,mDAAmD;QACnD,IACE,SAAS,CAAC,KAAK,CAAC,CAAC,KAAK,KAAK,KAAK,IAAI,iCAAiC;YACrE,KAAK,KAAK,OAAO,EACjB,CAAC;YACD,2CAA2C;YAC3C,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;gBACxB,SAAS,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;gBACtC,OAAO,SAAS,CAAC,KAAK,CAAC,CAAC;YAC1B,CAAC;iBAAM,CAAC;gBACN,mDAAmD;gBACnD,MAAM,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;gBACrC,MAAM,IAAI,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;gBAC9B,SAAS,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC;gBAC1B,SAAS,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC;YAC/B,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}
1	+ {"version":3,"file":"biologicLoader.js","sourceRoot":"","sources":["../../../src/app-data/loaders/biologicLoader.ts"],"names":[],"mappings":"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"}

package/lib-esm/app-data/loaders/cdfLoader.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
+import type { FifoLogger } from 'fifo-logger';
 import type { FileCollection } from 'filelist-utils';
 import type { Measurements } from '../index';
-import { ParserLog } from './utility/parserLog';
-export declare function cdfLoader(fileCollection: FileCollection, logs?: ParserLog[]): Promise<Partial<Measurements>>;
+export declare function cdfLoader(fileCollection: FileCollection, logger?: FifoLogger): Promise<Partial<Measurements>>;
 //# sourceMappingURL=cdfLoader.d.ts.map

package/lib-esm/app-data/loaders/cdfLoader.d.ts.map CHANGED Viewed

	@@ -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"}

package/lib-esm/app-data/loaders/cdfLoader.js CHANGED Viewed

@@ -1,10 +1,10 @@
 import { NetCDFReader } from 'netcdfjs';
 import { assert } from '../../components/index';
 import { getMeasurementInfoFromFile } from './utility/getMeasurementInfoFromFile';
-import { createLogEntry } from './utility/parserLog';
-export async function cdfLoader(fileCollection, logs) {
+export async function cdfLoader(fileCollection, logger) {
     const newMeasurements = {};
     let kind;
+    let count = 0;
     for (const file of fileCollection) {
         if (/\.cdf$/i.test(file.name)) {
             try {
@@ -36,17 +36,13 @@ export async function cdfLoader(fileCollection, logs) {
                         : chromatogram(reader),
                 };
                 newMeasurements[kind]?.entries.push(newMeasurement);
+                count++;
             }
             catch (error) {
                 if (error instanceof Error) {
                     //send error to UI ?
-                    if (logs) {
-                        logs.push(createLogEntry({
-                            error,
-                            parser: 'cdfLoader',
-                            message: 'error parsing file from cdfLoader',
-                            relativePath: file.relativePath,
-                        }));
+                    if (logger) {
+                        logger.error(error);
                     }
                     else {
                         throw error;
@@ -55,6 +51,7 @@ export async function cdfLoader(fileCollection, logs) {
             }
         }
     }
+    logger?.debug(`Loaded ${count} measurements with cdfLoader`);
     return newMeasurements;
 }
 function chromatogramWithMassSpectra(reader) {

package/lib-esm/app-data/loaders/cdfLoader.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"cdfLoader.js","sourceRoot":"","sources":["../../../src/app-data/loaders/cdfLoader.ts"],"names":[],"mappings":"~~AACA~~,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAExC,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAGhD,OAAO,EAAE,0BAA0B,EAAE,MAAM,sCAAsC,CAAC;~~AAClF~~,~~OAAO,EAAa,cAAc,EAAE,~~MAAM,~~qBAAqB,~~CAAC~~;AAEhE~~,~~MAAM,CAAC,~~KAAK,UAAU,SAAS,CAC7B,cAA8B,EAC9B,~~IAAkB~~;~~IAElB~~,MAAM,eAAe,GAA0B,EAAE,CAAC;IAClD,IAAI,IAAiC,CAAC;IACtC,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,IAAI,YAAY,CAAC,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;gBAE1D,IACE,MAAM,CAAC,kBAAkB,CAAC,aAAa,CAAC;oBACxC,MAAM,CAAC,kBAAkB,CAAC,aAAa,CAAC,EACxC,CAAC;oBACD,IAAI,GAAG,QAAQ,CAAC;gBAClB,CAAC;qBAAM,IACL,MAAM,CAAC,kBAAkB,CAAC,iBAAiB,CAAC;oBAC3C,MAAM,CAAC,YAAY,CAAC,eAAe,CAAmB,EAAE,KAAK,CAC5D,UAAU,CACX,EACD,CAAC;oBACD,IAAI,GAAG,MAAM,CAAC;gBAChB,CAAC;qBAAM,CAAC;oBACN,OAAO,eAAe,CAAC;gBACzB,CAAC;gBAED,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,gBAAgB,CAAC,CAAC;gBACzC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC3B,eAAe,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;gBAC1C,CAAC;gBACD,MAAM,CACJ,eAAe,CAAC,IAAI,CAAC,EACrB,0CAA0C,CAC3C,CAAC;gBACF,MAAM,cAAc,GAAG;oBACrB,GAAG,0BAA0B,CAC3B,IAAI,EACJ,MAAM,CAAC,YAAY,CAAC,kBAAkB,CAAW,CAClD;oBACD,kDAAkD;oBAClD,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI;oBACxB,IAAI,EACF,IAAI,KAAK,QAAQ;wBACf,CAAC,CAAC,2BAA2B,CAAC,MAAM,CAAC;wBACrC,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC;iBAC3B,CAAC;gBACF,eAAe,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;~~YACtD~~,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;oBAC3B,oBAAoB;oBACpB,IAAI,~~IAAI~~,EAAE,CAAC;~~wBACT~~,~~IAAI~~,CAAC,~~IAAI~~,~~CACP,cAAc,~~CAAC~~;4BACb~~,KAAK~~;4BACL~~,~~MAAM,EAAE,WAAW;4BACnB,OAAO,EAAE,mCAAmC;4BAC5C,YAAY,EAAE,IAAI,~~CAAC,~~YAAY;yBAChC,~~CAAC~~,CACH,CAAC~~;~~oBACJ~~,CAAC;yBAAM,CAAC;wBACN,MAAM,KAAK,CAAC;oBACd,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;~~IAED~~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"}
1	+ {"version":3,"file":"cdfLoader.js","sourceRoot":"","sources":["../../../src/app-data/loaders/cdfLoader.ts"],"names":[],"mappings":"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"}

package/lib-esm/app-data/loaders/jcampLoader.d.ts CHANGED Viewed

@@ -1,11 +1,11 @@
+import type { FifoLogger } from 'fifo-logger';
 import type { FileCollection } from 'filelist-utils';
 import type { Measurements } from '../index';
-import { ParserLog } from './utility/parserLog';
 /**
  *
  * @param fileCollection - the dragged file/files
  * @param logger - whether to log to console or not
  * @returns - new measurements object to be merged
  */
-export declare function jcampLoader(fileCollection: FileCollection, logs?: ParserLog[]): Promise<Partial<Measurements>>;
+export declare function jcampLoader(fileCollection: FileCollection, logger?: FifoLogger): Promise<Partial<Measurements>>;
 //# sourceMappingURL=jcampLoader.d.ts.map

package/lib-esm/app-data/loaders/jcampLoader.d.ts.map CHANGED Viewed

	@@ -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"}

package/lib-esm/app-data/loaders/jcampLoader.js CHANGED Viewed

@@ -1,14 +1,14 @@
 import { convert } from 'jcampconverter';
 import { assert } from '../../components/index';
 import { getMeasurementInfoFromFile } from './utility/getMeasurementInfoFromFile';
-import { createLogEntry } from './utility/parserLog';
 /**
  *
  * @param fileCollection - the dragged file/files
  * @param logger - whether to log to console or not
  * @returns - new measurements object to be merged
  */
-export async function jcampLoader(fileCollection, logs) {
+export async function jcampLoader(fileCollection, logger) {
+    let count = 0;
     const newMeasurements = {};
     for (const file of fileCollection) {
         if (/(?:\.jdx|\.dx)$/i.test(file.name)) {
@@ -43,21 +43,16 @@ export async function jcampLoader(fileCollection, logs) {
                             meta: measurement.meta,
                             data: normalizeSpectra(measurement.spectra),
                         };
+                        count++;
                         Object.assign(newMeasurement.info, measurement.info);
                         newMeasurements[kind]?.entries.push(newMeasurement);
                     }
                 }
             }
             catch (error) {
-                // send error to UI ?
                 if (error instanceof Error) {
-                    if (logs) {
-                        logs.push(createLogEntry({
-                            error,
-                            parser: 'jcamp converter',
-                            relativePath: file.relativePath,
-                            message: 'error parsing jdx or dx file',
-                        }));
+                    if (logger) {
+                        logger?.error(error);
                     }
                     else {
                         throw error;
@@ -66,6 +61,7 @@ export async function jcampLoader(fileCollection, logs) {
             }
         }
     }
+    logger?.debug(`Loaded ${count} measurements with jcampLoader`);
     return newMeasurements;
 }
 function normalizeSpectra(spectra) {
@@ -90,10 +86,11 @@ function normalizeSpectra(spectra) {
                 const variable = variables[key];
                 if (variable.label)
                     continue;
-                variable.label = variable.name || variable.symbol || key;
-                if (variable.units && !variable.label.includes(variable.units)) {
-                    variable.label += ` [${variable.units}]`;
+                let label = variable.name || variable.symbol || key;
+                if (variable.units && !label.includes(variable.units)) {
+                    label += ` [${variable.units}]`;
                 }
+                variable.label = label;
             }
         }
         data.push({ variables });

package/lib-esm/app-data/loaders/jcampLoader.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"jcampLoader.js","sourceRoot":"","sources":["../../../src/app-data/loaders/jcampLoader.ts"],"names":[],"mappings":"~~AACA~~,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAGhD,OAAO,EAAE,0BAA0B,EAAE,MAAM,sCAAsC,CAAC;~~AAClF,OAAO,EAAE,cAAc,EAAa,MAAM,qBAAqB,CAAC;AAEhE~~;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,cAA8B,EAC9B,~~IAAkB~~;~~IAElB~~,MAAM,eAAe,GAA0B,EAAE,CAAC;IAClD,KAAK,MAAM,IAAI,IAAI,cAAc,EAAE,CAAC;QAClC,IAAI,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YACvC,IAAI,CAAC;gBACH,yBAAyB;gBACzB,4CAA4C;gBAC5C,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,CAAC,IAAI,EAAE,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC;gBACvE,KAAK,MAAM,WAAW,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;oBACzC,IAAI,IAAiC,CAAC;oBACtC,IAAI,WAAW,EAAE,QAAQ,EAAE,KAAK,CAAC,cAAc,CAAC,EAAE,CAAC;wBACjD,IAAI,GAAG,IAAI,CAAC;oBACd,CAAC;yBAAM,IAAI,WAAW,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;wBAClD,IAAI,GAAG,OAAO,CAAC;oBACjB,CAAC;yBAAM,IAAI,WAAW,EAAE,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;wBAC/C,IAAI,GAAG,IAAI,CAAC;oBACd,CAAC;yBAAM,IAAI,WAAW,EAAE,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;wBACjD,IAAI,GAAG,MAAM,CAAC;oBAChB,CAAC;yBAAM,IAAI,WAAW,EAAE,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;wBAChD,IAAI,GAAG,KAAK,CAAC;oBACf,CAAC;oBACD,IAAI,IAAI,EAAE,CAAC;wBACT,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC;4BAC3B,eAAe,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;wBAC1C,CAAC;wBACD,MAAM,CACJ,eAAe,CAAC,IAAI,CAAC,EACrB,0CAA0C,CAC3C,CAAC;wBACF,MAAM,cAAc,GAAG;4BACrB,GAAG,0BAA0B,CAAC,IAAI,EAAE,WAAW,CAAC,KAAK,IAAI,EAAE,CAAC;4BAC5D,IAAI,EAAE,WAAW,CAAC,IAAI;4BACtB,IAAI,EAAE,gBAAgB,CAAC,WAAW,CAAC,OAAO,CAAC;yBAC5C,CAAC;wBACF,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;wBACrD,eAAe,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;oBACtD,CAAC;gBACH,CAAC;YACH,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,~~qBAAqB;gBACrB,~~IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;oBAC3B,IAAI,~~IAAI~~,EAAE,CAAC;~~wBACT~~,~~IAAI,CAAC,IAAI,CACP,cAAc,CAAC;4BACb,KAAK;4BACL,~~MAAM,EAAE,~~iBAAiB;4BACzB~~,~~YAAY,EAAE,IAAI,~~CAAC,~~YAAY;4BAC/B~~,~~OAAO,EAAE,8BAA8B;yBACxC,~~CAAC,~~CACH,~~CAAC;~~oBACJ~~,CAAC;yBAAM,CAAC;wBACN,MAAM,KAAK,CAAC;oBACd,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,eAAe,CAAC;AACzB,CAAC;AAED,SAAS,gBAAgB,CAAC,OAAY;IACpC,MAAM,IAAI,GAAU,EAAE,CAAC;IACvB,KAAK,MAAM,QAAQ,IAAI,OAAO,EAAE,CAAC;QAC/B,IAAI,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC;QACnC,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,SAAS,GAAG,EAAE,CAAC;YACf,SAAS,CAAC,CAAC,GAAG;gBACZ,KAAK,EAAE,QAAQ,CAAC,MAAM;gBACtB,MAAM,EAAE,GAAG;gBACX,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC;aACzC,CAAC;YACF,SAAS,CAAC,CAAC,GAAG;gBACZ,KAAK,EAAE,QAAQ,CAAC,MAAM;gBACtB,MAAM,EAAE,GAAG;gBACX,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC;aACzC,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,KAAK,MAAM,GAAG,IAAI,SAAS,EAAE,CAAC;gBAC5B,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;gBAChC,IAAI,QAAQ,CAAC,KAAK;oBAAE,SAAS;gBAC7B,~~QAAQ~~,~~CAAC,~~KAAK,~~GAAG~~,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,MAAM,IAAI,GAAG,CAAC;~~gBACzD~~,IAAI,QAAQ,CAAC,KAAK,IAAI,CAAC,~~QAAQ,CAAC,~~KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;~~oBAC/D~~,~~QAAQ,CAAC,~~KAAK,IAAI,KAAK,QAAQ,CAAC,KAAK,GAAG,CAAC;~~gBAC3C~~,CAAC;~~YACH~~,CAAC;QACH,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IAC3B,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
1	+ {"version":3,"file":"jcampLoader.js","sourceRoot":"","sources":["../../../src/app-data/loaders/jcampLoader.ts"],"names":[],"mappings":"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"}

package/lib-esm/app-data/loaders/loadMeasurements.d.ts CHANGED Viewed

@@ -1,13 +1,14 @@
+import type { FifoLogger } from 'fifo-logger';
 import type { FileCollection } from 'filelist-utils';
-import { Measurements, Enhancers } from '../index';
+import { Enhancers, Measurements } from '../index';
 import { MeasurementsLoader } from './utility/measurementLoader';
 import type { ParserLog } from './utility/parserLog';
 export interface LoadOptions {
     loaders?: MeasurementsLoader[];
     enhancers?: Partial<Enhancers>;
-    logger?: boolean;
+    logger?: FifoLogger;
 }
-export declare function loadMeasurements(fileCollection: FileCollection, options?: LoadOptions): Promise<{
+export declare function loadMeasurements(fileCollection: FileCollection, options: LoadOptions): Promise<{
     measurements: Partial<Measurements>;
     logs: ParserLog[];
 }>;

package/lib-esm/app-data/loaders/loadMeasurements.d.ts.map CHANGED Viewed

	@@ -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"}

package/lib-esm/app-data/loaders/loadMeasurements.js CHANGED Viewed

@@ -1,14 +1,14 @@
 import { xMinMaxValues } from 'ml-spectra-processing';
 import { enhance } from '../index';
 import { mergeMeasurements, } from './utility/measurementLoader';
-export async function loadMeasurements(fileCollection, options = {}) {
+export async function loadMeasurements(fileCollection, options) {
     const measurements = {};
     const logs = [];
-    const { loaders = [], enhancers = {}, logger = true } = options;
+    const { loaders = [], enhancers = {}, logger } = options;
     for (const loader of loaders) {
         // TODO: load in parallel
         // eslint-disable-next-line no-await-in-loop
-        const loaderData = await loader(fileCollection, logger ? logs : undefined);
+        const loaderData = await loader(fileCollection, logger);
         for (const { entries } of Object.values(loaderData)) {
             for (const entry of entries) {
                 computeMinMax(entry);

package/lib-esm/app-data/loaders/loadMeasurements.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"loadMeasurements.js","sourceRoot":"","sources":["../../../src/app-data/loaders/loadMeasurements.ts"],"names":[],"mappings":"~~AACA~~,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAEtD,OAAO,~~EAAgB~~,OAAO,~~EAA8B~~,MAAM,UAAU,CAAC;AAE7E,OAAO,EAEL,iBAAiB,GAClB,MAAM,6BAA6B,CAAC;AASrC,MAAM,CAAC,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,OAAO,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QAC/B,iBAAiB,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;IAC9C,CAAC;IACD,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;AAChC,CAAC;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,aAAa,CAAC,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,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAEtD,OAAO,EAAE,OAAO,EAA4C,MAAM,UAAU,CAAC;AAE7E,OAAO,EAEL,iBAAiB,GAClB,MAAM,6BAA6B,CAAC;AASrC,MAAM,CAAC,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,OAAO,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QAC/B,iBAAiB,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;IAC9C,CAAC;IACD,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;AAChC,CAAC;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,aAAa,CAAC,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"}

package/lib-esm/app-data/loaders/proprietary/agilent/cary500Loader.d.ts CHANGED Viewed

@@ -1,4 +1,5 @@
+import type { FifoLogger } from 'fifo-logger';
 import type { FileCollection } from 'filelist-utils';
-import { Measurements, ParserLog } from '../../../index';
-export declare function cary500Loader(fileCollection: FileCollection, logs?: ParserLog[]): Promise<Partial<Measurements>>;
+import { Measurements } from '../../../index';
+export declare function cary500Loader(fileCollection: FileCollection, logger?: FifoLogger): Promise<Partial<Measurements>>;
 //# sourceMappingURL=cary500Loader.d.ts.map

package/lib-esm/app-data/loaders/proprietary/agilent/cary500Loader.d.ts.map CHANGED Viewed

	@@ -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"}

package/lib-esm/app-data/loaders/proprietary/agilent/cary500Loader.js CHANGED Viewed

@@ -1,5 +1,5 @@
-import { getMeasurementInfoFromFile, createLogEntry, } from '../../../index';
-export async function cary500Loader(fileCollection, logs) {
+import { getMeasurementInfoFromFile, } from '../../../index';
+export async function cary500Loader(fileCollection, logger) {
     const newMeasurements = {};
     const entries = [];
     for (const file of fileCollection) {
@@ -14,14 +14,8 @@ export async function cary500Loader(fileCollection, logs) {
             }
             catch (error) {
                 if (error instanceof Error) {
-                    if (logs) {
-                        logs.push(createLogEntry({
-                            kind: 'error',
-                            parser: 'cary500Loader',
-                            message: 'Error parsing cary500 experiment.',
-                            error,
-                            relativePath: file.relativePath,
-                        }));
+                    if (logger) {
+                        logger.error(error);
                     }
                     else {
                         throw error;
@@ -30,6 +24,7 @@ export async function cary500Loader(fileCollection, logs) {
             }
         }
     }
+    logger?.debug(`Loaded ${entries.length} entries with cary500Loader`);
     newMeasurements.uvvis = { entries };
     return newMeasurements;
 }

package/lib-esm/app-data/loaders/proprietary/agilent/cary500Loader.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"cary500Loader.js","sourceRoot":"","sources":["../../../../../src/app-data/loaders/proprietary/agilent/cary500Loader.ts"],"names":[],"mappings":"~~AAEA~~,OAAO,~~EAGL~~,0BAA0B,~~EAE1B~~,~~cAAc,GACf,~~MAAM,gBAAgB,CAAC;AAExB,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,cAA8B,EAC9B,~~IAAkB~~;~~IAElB~~,MAAM,eAAe,GAA0B,EAAE,CAAC;IAClD,MAAM,OAAO,GAAsB,EAAE,CAAC;IAEtC,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,WAAW,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;gBACxC,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;oBACrC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;gBAC3B,CAAC;YACH,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;oBAC3B,IAAI,~~IAAI~~,EAAE,CAAC;~~wBACT~~,~~IAAI~~,CAAC,~~IAAI~~,~~CACP,cAAc,~~CAAC~~;4BACb~~,~~IAAI,EAAE,OAAO;4BACb,MAAM,EAAE,eAAe;4BACvB,OAAO,EAAE,mCAAmC;4BAC5C,~~KAAK~~;4BACL~~,~~YAAY,EAAE,IAAI,~~CAAC,~~YAAY;yBAChC,~~CAAC~~,CACH,CAAC~~;~~oBACJ~~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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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"}

package/lib-esm/app-data/loaders/spcLoader.d.ts CHANGED Viewed

@@ -1,11 +1,11 @@
+import type { FifoLogger } from 'fifo-logger';
 import type { FileCollection } from 'filelist-utils';
 import type { Measurements } from '../index';
-import { ParserLog } from './utility/parserLog';
 /**
  *
  * @param fileCollection - the dragged file/files
  * @param logger - whether to log to console or not
  * @returns - new measurements object to be merged
  */
-export declare function spcLoader(fileCollection: FileCollection, logs?: ParserLog[]): Promise<Partial<Measurements>>;
+export declare function spcLoader(fileCollection: FileCollection, logger?: FifoLogger): Promise<Partial<Measurements>>;
 //# sourceMappingURL=spcLoader.d.ts.map

package/lib-esm/app-data/loaders/spcLoader.d.ts.map CHANGED Viewed

	@@ -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"}

package/lib-esm/app-data/loaders/spcLoader.js CHANGED Viewed

@@ -1,14 +1,13 @@
-import { parse, guessSpectraType } from 'spc-parser';
+import { guessSpectraType, parse } from 'spc-parser';
 import { assert } from '../../components/index';
 import { getMeasurementInfoFromFile } from './utility/getMeasurementInfoFromFile';
-import { createLogEntry } from './utility/parserLog';
 /**
  *
  * @param fileCollection - the dragged file/files
  * @param logger - whether to log to console or not
  * @returns - new measurements object to be merged
  */
-export async function spcLoader(fileCollection, logs) {
+export async function spcLoader(fileCollection, logger) {
     const measurements = {};
     for (const file of fileCollection) {
         if (/\.spc$/i.test(file.name)) {
@@ -28,12 +27,8 @@ export async function spcLoader(fileCollection, logs) {
                 });
             }
             catch (error) {
-                if (error instanceof Error && logs) {
-                    logs.push(createLogEntry({
-                        parser: 'spc-parser',
-                        relativePath: file.relativePath,
-                        error,
-                    }));
+                if (error instanceof Error && logger) {
+                    logger.error(error);
                 }
                 else {
                     throw error;

package/lib-esm/app-data/loaders/spcLoader.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"spcLoader.js","sourceRoot":"","sources":["../../../src/app-data/loaders/spcLoader.ts"],"names":[],"mappings":"~~AACA~~,OAAO,EAAE,~~KAAK~~,EAAE,~~gBAAgB~~,EAAE,MAAM,YAAY,CAAC;AAErD,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAGhD,OAAO,EAAE,0BAA0B,EAAE,MAAM,sCAAsC,CAAC;~~AAClF,OAAO,EAAa,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAEhE~~;;;;;GAKG;AACH,MAAM,CAAC,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,KAAK,CAAC,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;gBAC/C,MAAM,WAAW,GAAoB,gBAAgB,CAAC,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,MAAM,CACJ,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,0BAA0B,CAAC,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,cAAc,~~CAAC~~;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"}
1	+ {"version":3,"file":"spcLoader.js","sourceRoot":"","sources":["../../../src/app-data/loaders/spcLoader.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAErD,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAGhD,OAAO,EAAE,0BAA0B,EAAE,MAAM,sCAAsC,CAAC;AAElF;;;;;GAKG;AACH,MAAM,CAAC,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,KAAK,CAAC,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;gBAC/C,MAAM,WAAW,GAAoB,gBAAgB,CAAC,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,MAAM,CACJ,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,0BAA0B,CAAC,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"}

package/lib-esm/app-data/loaders/utility/measurementLoader.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
+import type { FifoLogger } from 'fifo-logger';
 import type { FileCollection } from 'filelist-utils';
 import type { Measurements } from '../../index';
-import type { ParserLog } from './parserLog';
-export type MeasurementsLoader = (fileCollection: FileCollection, logs?: ParserLog[]) => Promise<Partial<Measurements>>;
+export type MeasurementsLoader = (fileCollection: FileCollection, logger?: FifoLogger) => Promise<Partial<Measurements>>;
 export declare function mergeMeasurements(measurements: Partial<Measurements>, newMeasurements: Partial<Measurements>): void;
 //# sourceMappingURL=measurementLoader.d.ts.map

package/lib-esm/app-data/loaders/utility/measurementLoader.d.ts.map CHANGED Viewed

	@@ -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"}

package/lib-esm/app-data/loaders/utility/measurementLoader.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"measurementLoader.js","sourceRoot":"","sources":["../../../../src/app-data/loaders/utility/measurementLoader.ts"],"names":[],"mappings":"~~AAEA~~,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;~~AAUnD~~,MAAM,UAAU,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,MAAM,CAAC,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"}
1	+ {"version":3,"file":"measurementLoader.js","sourceRoot":"","sources":["../../../../src/app-data/loaders/utility/measurementLoader.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AAQnD,MAAM,UAAU,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,MAAM,CAAC,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"}

package/lib-esm/app-data/loaders/wdfLoader.d.ts CHANGED Viewed

@@ -1,11 +1,11 @@
+import type { FifoLogger } from 'fifo-logger';
 import type { FileCollection } from 'filelist-utils';
 import type { Measurements } from '../index';
-import { ParserLog } from './utility/parserLog';
 /**
  *
  * @param fileCollection - the dragged file/files
  * @param logger - whether to log to console or not
  * @returns - new measurements object to be merged
  */
-export declare function wdfLoader(fileCollection: FileCollection, logs?: ParserLog[]): Promise<Partial<Measurements>>;
+export declare function wdfLoader(fileCollection: FileCollection, logger?: FifoLogger): Promise<Partial<Measurements>>;
 //# sourceMappingURL=wdfLoader.d.ts.map

package/lib-esm/app-data/loaders/wdfLoader.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"wdfLoader.d.ts","sourceRoot":"","sources":["../../../src/app-data/loaders/wdfLoader.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,~~cAAc~~,EAAE,MAAM,~~gBAAgB~~,CAAC;~~AAGrD~~,OAAO,KAAK,EAAE,~~YAAY~~,~~EAAmB~~,MAAM,~~UAAU~~,CAAC;~~AAG9D~~,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,~~CAoChC~~"}
1	+ {"version":3,"file":"wdfLoader.d.ts","sourceRoot":"","sources":["../../../src/app-data/loaders/wdfLoader.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAGrD,OAAO,KAAK,EAAmB,YAAY,EAAE,MAAM,UAAU,CAAC;AAI9D;;;;;GAKG;AACH,wBAAsB,SAAS,CAC7B,cAAc,EAAE,cAAc,EAC9B,MAAM,CAAC,EAAE,UAAU,GAClB,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CA6BhC"}