Skip to content

Commit 123c344

Browse files
authored
fix: use assert methods from @zakodium/utils (#4280)
1 parent ff8bd81 commit 123c344

15 files changed

Lines changed: 31 additions & 30 deletions

File tree

package-lock.json

Lines changed: 10 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
"@zakodium/nmrium-core": "^0.7.45",
7474
"@zakodium/nmrium-core-plugins": "^0.7.61",
7575
"@zakodium/pdnd-esm": "^1.1.0",
76-
"@zakodium/utils": "^0.4.0",
76+
"@zakodium/utils": "^0.5.0",
7777
"@zip.js/zip.js": "^2.8.30",
7878
"cheminfo-font": "^1.27.0",
7979
"cheminfo-types": "^1.15.0",

src/component/1d-2d/components/FloatMoleculeStructures/FloatMolecules.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import type {
44
Spectrum1D,
55
Spectrum2D,
66
} from '@zakodium/nmrium-core';
7+
import { assert } from '@zakodium/utils';
78
import { memo } from 'react';
8-
import { assert } from 'react-science/ui';
99

1010
import type {
1111
MoleculesView,

src/component/1d-2d/components/axis_unit_picker.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import styled from '@emotion/styled';
22
import type { AxisUnit } from '@zakodium/nmrium-core';
3+
import { assert } from '@zakodium/utils';
34
import type { ReactNode } from 'react';
4-
import { assert } from 'react-science/ui';
55

66
import type { ContextMenuItem } from '../../elements/ContextMenuBluePrint.tsx';
77
import { ContextMenu } from '../../elements/ContextMenuBluePrint.tsx';

src/component/2d/SignalDeltaLine.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import styled from '@emotion/styled';
2-
import { assert } from 'react-science/ui';
2+
import { assert } from '@zakodium/utils';
33

44
import { useChartData } from '../context/ChartContext.js';
55

src/component/2d/utilities/scale.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
import { assert } from '@zakodium/utils';
12
import type { NmrData2D } from 'cheminfo-types';
23
import { scaleLinear } from 'd3-scale';
34
import { useMemo } from 'react';
4-
import { assert } from 'react-science/ui';
55

66
import { useChartData } from '../../context/ChartContext.js';
77
import type { Margin, SpectraDirection } from '../../reducer/Reducer.js';

src/component/EventsTrackers/BrushTracker.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { assert } from '@zakodium/utils';
12
import type {
23
CSSProperties,
34
KeyboardEvent,
@@ -15,7 +16,6 @@ import {
1516
useReducer,
1617
useRef,
1718
} from 'react';
18-
import { assert } from 'react-science/ui';
1919

2020
import type { EventModifierKeys } from '../context/KeyModifierContext.js';
2121
import type { ActionType } from '../reducer/types/ActionType.js';

src/component/elements/Sections.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import {
1515
pointerOutsideOfPreview,
1616
setCustomNativeDragPreview,
1717
} from '@zakodium/pdnd-esm';
18+
import { assert } from '@zakodium/utils';
1819
import type {
1920
CSSProperties,
2021
HTMLAttributes,
@@ -31,7 +32,6 @@ import {
3132
useState,
3233
} from 'react';
3334
import { createPortal } from 'react-dom';
34-
import { assert } from 'react-science/ui';
3535

3636
interface DropIndicatorProps {
3737
edge: Edge;

src/component/hooks/use_axis_unit.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ import {
1818
defaultAxisUnit2DFt,
1919
isSpectrum2D,
2020
} from '@zakodium/nmrium-core';
21+
import { assert, assertIn, assertUnreachable } from '@zakodium/utils';
2122
import { scaleLinear } from 'd3-scale';
2223
import { useCallback, useMemo } from 'react';
23-
import { assert, assertUnreachable } from 'react-science/ui';
2424
import { match } from 'ts-pattern';
2525

2626
import { useScale2DX, useScale2DY } from '../2d/utilities/scale.ts';
@@ -40,12 +40,6 @@ export const axisUnitToLabel: Record<AxisUnit, string> = {
4040
pt: 'index [pt]',
4141
};
4242

43-
function assertIn<V, T extends V>(value: V, values: T[]): asserts value is T {
44-
if (values.includes(value as any)) return;
45-
46-
throw new Error(`Value ${String(value)} is not in [${values.join(',')}]`);
47-
}
48-
4943
export function useHorizontalAxisUnit() {
5044
const {
5145
originDomain: { xDomain: originXDomain },

src/component/hooks/use_publication_strings.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import type { ACSExportOptions, Spectrum } from '@zakodium/nmrium-core';
2-
import { isSpectrum1D } from '@zakodium/nmrium-core';
2+
import { assertSpectrum1D, isSpectrum1D } from '@zakodium/nmrium-core';
33
import type { RangesToACSOptions } from 'nmr-processing';
44
import { rangesToACS } from 'nmr-processing';
5-
import { assert } from 'react-science/ui';
65

76
import useSpectraByActiveNucleus from './useSpectraPerNucleus.ts';
87
import { useActiveACSSettings } from './use_acs_settings.ts';
@@ -34,7 +33,7 @@ interface BuildPublicationStringOptions {
3433
}
3534
export function buildPublicationString(options: BuildPublicationStringOptions) {
3635
const { spectrum, acs } = options;
37-
assert(isSpectrum1D(spectrum));
36+
assertSpectrum1D(spectrum);
3837

3938
const {
4039
info,

0 commit comments

Comments
 (0)