@apollohg/react-native-rich-text-editor 2.0.0 → 2.0.1

package/dist/useViewerAtoms.js

@@ -15,8 +15,9 @@ function isRecord(value) {
 }
 function parsePositions(json, definitions, snapshot) {
     const values = JSON.parse(json);
-    if (!Array.isArray(values))
+    if (!Array.isArray(values)) {
         throw new Error('Atom positions must be an array.');
+    }
     const seen = new Set();
     const identities = new Set();
     return values.map((value) => {
@@ -27,24 +28,27 @@ function parsePositions(json, definitions, snapshot) {
             Number(value.docPos) < 0 ||
             Number(value.docPos) > 0xffffffff ||
             typeof value.attrsJson !== 'string' ||
-            !['x', 'y', 'width', 'height'].every((key) => typeof value[key] === 'number' && Number.isFinite(value[key])) ||
+            !['x', 'y', 'width', 'height'].every(key => typeof value[key] === 'number' && Number.isFinite(value[key])) ||
             Number(value.width) <= 0 ||
             Number(value.height) < 0 ||
             seen.has(Number(value.docPos))) {
             throw new Error('Invalid prepared atom position.');
         }
         const attrs = JSON.parse(value.attrsJson);
-        if (!isRecord(attrs))
+        if (!isRecord(attrs)) {
             throw new Error('Atom attributes must be a JSON object.');
+        }
         const idAttribute = definitions.get(value.nodeType)?.idAttribute;
         const atomId = idAttribute == null ? undefined : attrs[idAttribute];
-        if (idAttribute != null && (typeof atomId !== 'string' || atomId.length === 0))
+        if (idAttribute != null && (typeof atomId !== 'string' || atomId.length === 0)) {
             throw new Error('Atom identity must be a non-empty string.');
+        }
         const key = typeof atomId === 'string'
             ? JSON.stringify([value.nodeType, atomId])
-            : `${snapshot}:${value.docPos}:${value.nodeType}`;
-        if (identities.has(key))
+            : `${snapshot}:${String(value.docPos)}:${value.nodeType}`;
+        if (identities.has(key)) {
             throw new Error('Duplicate atom identity.');
+        }
         identities.add(key);
         seen.add(Number(value.docPos));
         return { ...value, attrs, key, atomId };
@@ -52,18 +56,20 @@ function parsePositions(json, definitions, snapshot) {
 }
 function useViewerAtoms({ atoms, identity, themeJson, readOnly, interactive = true, viewport, onUpdateAtomAttrs, onError, }) {
     const [width, setWidth] = (0, react_1.useState)(null);
-    const snapshot = (0, react_1.useMemo)(() => String(++nextGeneration), [identity]);
+    const snapshot = (0, react_1.useMemo)(() => ({ identity, value: String(++nextGeneration) }), [identity]).value;
     const serializedAtoms = (0, atoms_1.serializeEditorAtoms)(atoms);
-    const identifiers = JSON.stringify((atoms ?? []).map((atom) => [atom.name, atom.idAttribute]));
-    const generation = (0, react_1.useMemo)(() => String(++nextGeneration), [identity, identifiers, serializedAtoms, width]);
-    const definitions = (0, react_1.useMemo)(() => new Map((atoms ?? []).map((atom) => [atom.name, atom])), [atoms]);
+    const identifiers = JSON.stringify((atoms ?? []).map(atom => [atom.name, atom.idAttribute]));
+    const generation = (0, react_1.useMemo)(() => ({
+        identity, identifiers, serializedAtoms, width, value: String(++nextGeneration),
+    }), [identity, identifiers, serializedAtoms, width]).value;
+    const definitions = (0, react_1.useMemo)(() => new Map((atoms ?? []).map(atom => [atom.name, atom])), [atoms]);
     const enabled = definitions.size > 0;
     const [measurementState, setMeasurementState] = (0, react_1.useState)({
         generation,
         revision: 0,
         values: {},
     });
-    const measurements = measurementState.generation === generation ? measurementState.values : {};
+    const measurements = (0, react_1.useMemo)(() => measurementState.generation === generation ? measurementState.values : {}, [measurementState, generation]);
     const revision = String(measurementState.generation === generation ? measurementState.revision : 0);
     const [layout, setLayout] = (0, react_1.useState)(null);
     const pendingLayout = layout?.generation !== generation;
@@ -72,8 +78,9 @@ function useViewerAtoms({ atoms, identity, themeJson, readOnly, interactive = tr
     const mountedMeasurements = (0, react_1.useRef)(new Map());
     (0, react_1.useLayoutEffect)(() => {
         for (const [key, measured] of mountedMeasurements.current) {
-            if (!definitions.has(measured.nodeType))
+            if (!definitions.has(measured.nodeType)) {
                 mountedMeasurements.current.delete(key);
+            }
         }
     }, [definitions]);
     const mounted = (0, react_1.useRef)(false);
@@ -119,7 +126,12 @@ function useViewerAtoms({ atoms, identity, themeJson, readOnly, interactive = tr
                 measurements,
             },
         })
-        : themeJson, [enabled, themeJson, serializedAtoms, generation, revision, measurements]);
+        : themeJson, [enabled,
+        themeJson,
+        serializedAtoms,
+        generation,
+        revision,
+        measurements]);
     const onAtomLayout = (0, react_1.useCallback)((event) => {
         const value = event.nativeEvent;
         const latest = current.current;
@@ -128,8 +140,9 @@ function useViewerAtoms({ atoms, identity, themeJson, readOnly, interactive = tr
             value.revision !== latest.revision ||
             !Number.isFinite(value.layoutWidth) ||
             value.layoutWidth <= 0 ||
-            (latest.width != null && Math.abs(latest.width - value.layoutWidth) > 1))
+            (latest.width != null && Math.abs(latest.width - value.layoutWidth) > 1)) {
             return;
+        }
         try {
             const next = parsePositions(value.atomsJson, latest.definitions, latest.snapshot);
             const retainedMeasurements = {};
@@ -143,18 +156,19 @@ function useViewerAtoms({ atoms, identity, themeJson, readOnly, interactive = tr
                 }
             }
             for (const key of mountedMeasurements.current.keys()) {
-                if (!retainedKeys.has(key))
+                if (!retainedKeys.has(key)) {
                     mountedMeasurements.current.delete(key);
+                }
             }
             // Unchanged mounted sizes do not emit another Yoga onLayout event.
-            setMeasurementState((previous) => previous.generation === value.generation
+            setMeasurementState(previous => previous.generation === value.generation
                 ? previous
                 : {
                     generation: value.generation,
                     revision: Object.keys(retainedMeasurements).length > 0 ? 1 : 0,
                     values: retainedMeasurements,
                 });
-            setLayout((previous) => previous?.generation === value.generation && previous.json === value.atomsJson
+            setLayout(previous => previous?.generation === value.generation && previous.json === value.atomsJson
                 ? previous
                 : { generation: value.generation, json: value.atomsJson, positions: next });
         }
@@ -171,8 +185,9 @@ function useViewerAtoms({ atoms, identity, themeJson, readOnly, interactive = tr
     }, []);
     const onContainerLayout = (0, react_1.useCallback)((event) => {
         const next = event.nativeEvent.layout.width;
-        if (Number.isFinite(next) && next > 0)
-            setWidth((previous) => (previous === next ? previous : next));
+        if (Number.isFinite(next) && next > 0) {
+            setWidth(previous => (previous === next ? previous : next));
+        }
     }, []);
     const updateQueues = (0, react_1.useRef)(new Map());
     const acknowledged = (0, react_1.useRef)(new Map());
@@ -182,14 +197,16 @@ function useViewerAtoms({ atoms, identity, themeJson, readOnly, interactive = tr
     const updateAttrs = (0, react_1.useCallback)((owner, atom, update) => {
         const execute = async () => {
             const latest = current.current;
-            if (!mounted.current)
+            if (!mounted.current) {
                 throw new atomInstances_1.AtomUpdateAttrsError('not-ready', 'The viewer is unmounted.');
+            }
             if (owner !== latest.generation ||
-                !latest.positions.some((position) => position.key === atom.key && position.attrsJson === atom.attrsJson)) {
+                !latest.positions.some(position => position.key === atom.key && position.attrsJson === atom.attrsJson)) {
                 throw new atomInstances_1.AtomUpdateAttrsError('stale-revision', 'The viewer content has changed.');
             }
-            if (latest.readOnly || !latest.onUpdateAtomAttrs)
+            if (latest.readOnly || !latest.onUpdateAtomAttrs) {
                 throw new atomInstances_1.AtomUpdateAttrsError('not-applicable', 'Viewer updates require readOnly={false} and onUpdateAtomAttrs.');
+            }
             const accepted = acknowledged.current.get(atom.key);
             const attrs = accepted?.generation === owner ? accepted.attrs : atom.attrs;
             const partial = (0, atomUpdates_1.resolveAtomAttrsUpdate)(attrs, update);
@@ -198,8 +215,9 @@ function useViewerAtoms({ atoms, identity, themeJson, readOnly, interactive = tr
                 (0, attributeValidation_1.validateAttributes)({ ...attrs, ...partial }, definition.attrs ?? {});
                 if (definition.idAttribute &&
                     Object.prototype.hasOwnProperty.call(partial, definition.idAttribute) &&
-                    partial[definition.idAttribute] !== attrs[definition.idAttribute])
+                    partial[definition.idAttribute] !== attrs[definition.idAttribute]) {
                     throw new Error('An atom identity cannot be changed.');
+                }
             }
             catch (error) {
                 throw new atomInstances_1.AtomUpdateAttrsError('not-applicable', error instanceof Error ? error.message : String(error));
@@ -211,18 +229,21 @@ function useViewerAtoms({ atoms, identity, themeJson, readOnly, interactive = tr
                 attrs,
                 partial,
             });
-            if (mounted.current && current.current.generation === owner)
+            if (mounted.current && current.current.generation === owner) {
                 acknowledged.current.set(atom.key, {
                     generation: owner,
                     attrs: { ...attrs, ...partial },
                 });
+            }
         };
         const previous = updateQueues.current.get(atom.key);
-        const result = previous ? previous.catch(() => { }).then(execute) : execute();
+        const result = previous ? previous.catch(() => {
+        }).then(execute) : execute();
         updateQueues.current.set(atom.key, result);
         const clean = () => {
-            if (updateQueues.current.get(atom.key) === result)
+            if (updateQueues.current.get(atom.key) === result) {
                 updateQueues.current.delete(atom.key);
+            }
         };
         void result.then(clean, clean);
         return result;
@@ -238,22 +259,25 @@ function useViewerAtoms({ atoms, identity, themeJson, readOnly, interactive = tr
             !Number.isFinite(measured.height) ||
             measured.height < 0 ||
             Math.abs(measured.width - atom.width) > 1 ||
-            !latest.renderedPositions.some((position) => position.docPos === atom.docPos &&
+            !latest.renderedPositions.some(position => position.docPos === atom.docPos &&
                 position.nodeType === atom.nodeType &&
                 position.width === atom.width &&
-                position.attrsJson === atom.attrsJson))
+                position.attrsJson === atom.attrsJson)) {
             return;
+        }
         mountedMeasurements.current.set(atom.key, {
             nodeType: atom.nodeType,
             size: { width: atom.width, height: measured.height },
         });
-        if (latest.pendingLayout)
+        if (latest.pendingLayout) {
             return;
-        setMeasurementState((previous) => {
+        }
+        setMeasurementState(previous => {
             const values = previous.generation === owner ? previous.values : {};
             const existing = values[String(atom.docPos)];
-            if (existing?.width === atom.width && existing.height === measured.height)
+            if (existing?.width === atom.width && existing.height === measured.height) {
                 return previous;
+            }
             return {
                 generation: owner,
                 revision: previous.generation === owner ? previous.revision + 1 : 1,
@@ -264,25 +288,28 @@ function useViewerAtoms({ atoms, identity, themeJson, readOnly, interactive = tr
             };
         });
     }, []);
-    const children = renderedPositions.map((atom) => {
+    const children = renderedPositions.map(atom => {
         const Component = definitions.get(atom.nodeType)?.component;
-        if (!Component)
+        if (!Component) {
             return null;
+        }
         return ((0, jsx_runtime_1.jsx)(react_native_1.View, { collapsable: false, pointerEvents: !interactive || pendingLayout ? 'none' : 'box-none', accessibilityElementsHidden: pendingLayout, importantForAccessibility: pendingLayout ? 'no-hide-descendants' : 'auto', style: {
                 position: 'absolute',
                 left: atom.x,
                 top: atom.y,
                 width: atom.width,
                 opacity: pendingLayout ? 0 : 1,
-            }, onLayout: (event) => measure(generation, atom, Component, event), children: (0, jsx_runtime_1.jsx)(AtomHost_1.AtomHost, { component: Component, width: atom.width, estimatedHeight: atom.height, visible: (0, AtomHost_1.atomIsVisible)(atom.y, atom.height, viewport), onMeasure: (event) => measure(generation, atom, Component, event), atomProps: {
+            }, onLayout: event => measure(generation, atom, Component, event), children: (0, jsx_runtime_1.jsx)(AtomHost_1.AtomHost, { component: Component, width: atom.width, estimatedHeight: atom.height, visible: (0, AtomHost_1.atomIsVisible)(atom.y, atom.height, viewport), onMeasure: event => measure(generation, atom, Component, event), atomProps: {
                     attrs: atom.attrs,
                     nodeType: atom.nodeType,
                     selected: false,
                     readOnly,
                     interactive: interactive && !pendingLayout,
                     isViewer: true,
-                    updateAttrs: (partial) => updateAttrs(layout.generation, atom, partial),
+                    updateAttrs: partial => updateAttrs(layout.generation, atom, partial),
                 } }) }, atom.key));
     });
-    return { enabled, themeJson: configuredThemeJson, onAtomLayout, onContainerLayout, children };
+    return {
+        enabled, themeJson: configuredThemeJson, onAtomLayout, onContainerLayout, children,
+    };
 }

package/ios/EditorCore.xcframework/Info.plist

@@ -8,32 +8,32 @@
 			<key>BinaryPath</key>
 			<string>libeditor_core.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libeditor_core.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libeditor_core.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>libeditor_core.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@apollohg/react-native-rich-text-editor",
-    "version": "2.0.0",
+    "version": "2.0.1",
     "description": "Native rich text editor with Rust core for React Native",
     "license": "Apache-2.0",
     "homepage": "https://github.com/apollohg/react-native-rich-text-editor",
@@ -104,21 +104,29 @@
     },
     "devDependencies": {
         "@babel/runtime": "^7.29.7",
+        "@eslint/js": "^10.0.1",
         "@expo/vector-icons": "^15.0.3",
         "@react-native/jest-preset": "0.86.2",
+        "@stylistic/eslint-plugin": "^5.10.0",
         "@testing-library/react-native": "^13.3.3",
         "@types/jest": "29.5.14",
         "@types/react": "^19.2.14",
         "babel-jest": "^29.7.0",
         "babel-preset-expo": "~57.0.8",
+        "eslint": "^10.10.0",
+        "eslint-plugin-react": "^7.37.5",
+        "eslint-plugin-react-hooks": "^7.1.1",
+        "eslint-plugin-react-native": "^5.0.0",
+        "eslint-plugin-slop": "^0.1.3",
         "expo": "^57.0.9",
         "expo-modules-core": "~57.0.8",
         "jest": "^29.7.0",
-        "prettier": "^3.8.1",
+        "jiti": "^2.7.0",
         "react": "19.2.3",
         "react-native": "0.86.2",
         "react-test-renderer": "19.2.3",
-        "typescript": "^5.9.3"
+        "typescript": "^5.9.3",
+        "typescript-eslint": "^8.70.0"
     },
     "files": [
         "README.md",

package/react-native.config.js

@@ -7,7 +7,7 @@ module.exports = {
             // metadata; no nested compatibility podspec exists.
             ios: {},
             android: {
-                componentDescriptors: ['PreparedProseViewerComponentDescriptor'],
+                componentDescriptors: [ 'PreparedProseViewerComponentDescriptor' ],
                 cmakeListsPath: '../android/src/main/jni/CMakeLists.txt',
                 packageImportPath: 'import com.apollohg.editor.viewer.PreparedProseViewerPackage;',
                 packageInstance: 'new PreparedProseViewerPackage()',

package/src/AtomHost.tsx

@@ -11,9 +11,12 @@ export interface AtomViewport {
 }
 
 export function atomIsVisible(y: number, height: number, viewport?: AtomViewport): boolean {
-    if (!viewport) return true;
+    if (!viewport) {
+        return true;
+    }
+
     if (
-        ![viewport.y, viewport.height, viewport.overscan ?? 200].every(Number.isFinite) ||
+        ![ viewport.y, viewport.height, viewport.overscan ?? 200 ].every(Number.isFinite) ||
         viewport.height < 0 ||
         (viewport.overscan ?? 200) < 0
     ) {
@@ -21,7 +24,9 @@ export function atomIsVisible(y: number, height: number, viewport?: AtomViewport
             'Atom viewport must have finite coordinates and non-negative height and overscan.'
         );
     }
+
     const overscan = viewport.overscan ?? 200;
+
     return y + height >= viewport.y - overscan && y <= viewport.y + viewport.height + overscan;
 }
 
@@ -49,13 +54,17 @@ class AtomErrorBoundary extends React.Component<
     }
 
     render() {
-        if (!this.state.error) return this.props.children;
+        if (!this.state.error) {
+            return this.props.children;
+        }
+
         return (
-            <View accessibilityRole='alert' style={{ minHeight: 32, padding: 8 }}>
+            <View accessibilityRole={'alert'} style={{ minHeight: 32, padding: 8 }}>
                 <Text>Unable to display {this.props.nodeType}</Text>
                 <Pressable
-                    accessibilityRole='button'
-                    onPress={() => this.setState({ error: false })}>
+                    accessibilityRole={'button'}
+                    onPress={() => this.setState({ error: false })}
+                >
                     <Text>Retry</Text>
                 </Pressable>
             </View>
@@ -80,58 +89,77 @@ export function AtomHost({
     onMeasure?: (event: import('react-native').LayoutChangeEvent) => void;
     nativeID?: string;
 }) {
-    const [measurement, setMeasurement] = useState({ width, height: estimatedHeight });
-    const [focused, setFocused] = useState(false);
-    const [active, setActive] = useState(false);
-    const [pending, setPending] = useState(0);
-    const [updateError, setUpdateError] = useState<Error | null>(null);
+    const [ measurement, setMeasurement ] = useState({ width, height: estimatedHeight });
+    const [ focused, setFocused ] = useState(false);
+    const [ active, setActive ] = useState(false);
+    const [ pending, setPending ] = useState(0);
+    const [ updateError, setUpdateError ] = useState<Error | null>(null);
     const latestRequest = useRef(0);
     const applyUpdate = atomProps.updateAttrs;
     const mounted = useRef(true);
+
     useEffect(() => {
         mounted.current = true;
+
         return () => {
             mounted.current = false;
         };
     }, []);
+
     const updateAttrs = useCallback(
-        async (update: AtomAttrsUpdate) => {
-            if (!mounted.current)
+        async(update: AtomAttrsUpdate) => {
+            if (!mounted.current) {
                 throw new AtomUpdateAttrsError('not-ready', 'The atom is unmounted.');
+            }
+
             const request = ++latestRequest.current;
-            setPending((count) => count + 1);
+            setPending(count => count + 1);
             setUpdateError(null);
+
             try {
                 await applyUpdate(update);
             } catch (error) {
-                if (mounted.current && latestRequest.current === request)
+                if (mounted.current && latestRequest.current === request) {
                     setUpdateError(error instanceof Error ? error : new Error(String(error)));
+                }
+
                 throw error;
             } finally {
-                if (mounted.current) setPending((count) => count - 1);
+                if (mounted.current) {
+                    setPending(count => count - 1);
+                }
             }
         },
-        [applyUpdate]
+        [ applyUpdate ]
     );
+
     const editor = useMemo(() => {
-        if (!atomProps.editor) return undefined;
-        const guard = (action: () => Promise<void>) => async () => {
-            if (!mounted.current)
+        if (!atomProps.editor) {
+            return undefined;
+        }
+
+        const guard = (action: () => Promise<void>) => async() => {
+            if (!mounted.current) {
                 throw new AtomUpdateAttrsError('not-ready', 'The atom is unmounted.');
+            }
+
             return action();
         };
+
         return {
             select: guard(atomProps.editor.select),
             delete: guard(atomProps.editor.delete),
             focusBefore: guard(atomProps.editor.focusBefore),
             focusAfter: guard(atomProps.editor.focusAfter),
         };
-    }, [atomProps.editor]);
+    }, [ atomProps.editor ]);
+
     const retainedHeight = measurement.width === width ? measurement.height : estimatedHeight;
     const show = visible || focused || active || pending > 0 || atomProps.selected;
+
     return (
         <View
-            testID='atom-host'
+            testID={'atom-host'}
             nativeID={nativeID}
             collapsable={false}
             pointerEvents={atomProps.interactive === false ? 'none' : 'box-none'}
@@ -139,23 +167,24 @@ export function AtomHost({
             importantForAccessibility={!show ? 'no-hide-descendants' : 'auto'}
             onFocus={() => setFocused(true)}
             onBlur={() => setFocused(false)}
-            onLayout={(event) => {
+            onLayout={event => {
                 onMeasure?.(event);
                 const size = event.nativeEvent.layout;
+
                 if (
                     show &&
                     Number.isFinite(size.height) &&
                     size.height >= 0 &&
                     Math.abs(size.width - width) <= 1
                 ) {
-                    setMeasurement((previous) =>
+                    setMeasurement(previous =>
                         previous.width === width && previous.height === size.height
                             ? previous
-                            : { width, height: size.height }
-                    );
+                            : { width, height: size.height });
                 }
             }}
-            style={show ? undefined : { height: retainedHeight }}>
+            style={show ? undefined : { height: retainedHeight }}
+        >
             {show && (
                 <AtomErrorBoundary component={Component} nodeType={atomProps.nodeType}>
                     <Suspense
@@ -163,7 +192,8 @@ export function AtomHost({
                             <View style={{ height: retainedHeight }}>
                                 <Text>Loading {atomProps.nodeType}…</Text>
                             </View>
-                        }>
+                        }
+                    >
                         <Component
                             {...atomProps}
                             editor={editor}

package/src/EditorAddon.ts

@@ -37,21 +37,31 @@ export type EditorAddonEntry = EditorAddon | false | null | undefined;
 export type EditorAddons = readonly EditorAddonEntry[];
 
 function copyConfiguration<T>(value: T, ancestors = new Set<object>()): T {
-    if (value === null || typeof value !== 'object') return value;
-    if (ancestors.has(value)) throw new Error('Addon configuration must not contain cycles.');
+    if (value === null || typeof value !== 'object') {
+        return value;
+    }
+
+    if (ancestors.has(value)) {
+        throw new Error('Addon configuration must not contain cycles.');
+    }
+
     if (!Array.isArray(value) && Object.getPrototypeOf(value) !== Object.prototype) {
         throw new Error('Addon configuration must contain only plain objects and arrays.');
     }
+
     ancestors.add(value);
+
     const copy = Array.isArray(value)
-        ? value.map((entry) => copyConfiguration(entry, ancestors))
+        ? value.map((entry: unknown) => copyConfiguration(entry, ancestors))
         : Object.fromEntries(
-              Object.entries(value).map(([key, entry]) => [
-                  key,
-                  copyConfiguration(entry, ancestors),
-              ])
-          );
+            Object.entries(value).map(([ key, entry ]) => [
+                key,
+                copyConfiguration(entry, ancestors),
+            ])
+        );
+
     ancestors.delete(value);
+
     return Object.freeze(copy) as T;
 }
 

package/src/EditorAddonNormalization.ts

@@ -14,36 +14,65 @@ function isRecord(value: unknown): value is Record<string, unknown> {
 }
 
 export function normalizeEditorAddons(addons?: EditorAddons): NormalizedEditorAddons {
-    if (addons === undefined) return {};
-    if (!Array.isArray(addons)) throw new Error('addons must be a flat readonly array.');
+    if (addons === undefined) {
+        return {};
+    }
+
+    if (!Array.isArray(addons)) {
+        throw new Error('addons must be a flat readonly array.');
+    }
+
     const normalized: NormalizedEditorAddons = {};
     const ids = new Set<string>();
-    for (const [index, addon] of addons.entries()) {
-        if (addon === false || addon === null || addon === undefined) continue;
+
+    for (const [ index, addon ] of addons.entries()) {
+        if (addon === false || addon === null || addon === undefined) {
+            continue;
+        }
+
         const path = `addons[${index}]`;
-        if (!isRecord(addon)) throw new Error(`${path} must be an addon descriptor.`);
-        if (addon.version !== 1) throw new Error(`${path}.version must be 1.`);
+
+        if (!isRecord(addon)) {
+            throw new Error(`${path} must be an addon descriptor.`);
+        }
+
+        if (addon.version !== 1) {
+            throw new Error(`${path}.version must be 1.`);
+        }
+
         if (addon.capability !== 'mentions' && addon.capability !== 'code-highlighting') {
             throw new Error(`${path}.capability is unsupported.`);
         }
-        if (addon.id !== addon.capability) throw new Error(`${path}.id must match its capability.`);
-        if (ids.has(addon.capability))
-            throw new Error(`${path}: duplicate addon id '${addon.id}'.`);
+
+        if (addon.id !== addon.capability) {
+            throw new Error(`${path}.id must match its capability.`);
+        }
+
+        if (ids.has(addon.capability)) {
+            throw new Error(`${path}: duplicate addon id '${String(addon.id)}'.`);
+        }
+
         ids.add(addon.capability);
-        if (!isRecord(addon.options)) throw new Error(`${path}.options must be an object.`);
+
+        if (!isRecord(addon.options)) {
+            throw new Error(`${path}.options must be an object.`);
+        }
+
         if (addon.capability === 'mentions') {
             normalized.mentions = addon.options;
         } else {
-            for (const key of ['provider', 'theme'] as const) {
+            for (const key of [ 'provider', 'theme' ] as const) {
                 if (typeof addon.options[key] !== 'string' || !addon.options[key].trim()) {
                     throw new Error(`${path}.options.${key} must be a nonempty string.`);
                 }
             }
+
             normalized.codeHighlighting = {
                 provider: addon.options.provider as string,
                 theme: addon.options.theme as string,
             };
         }
     }
+
     return normalized;
 }