style: 💄 fix linter issues

Author: streamich

src/json-crdt-extensions/peritext/editor/Editor.ts

@@ -19,7 +19,7 @@ import type {Point} from '../rga/Point';
 import type {Range} from '../rga/Range';
 import type {CharIterator, CharPredicate, Position, TextRangeUnit, ViewStyle, ViewRange, ViewSlice} from './types';
 import type {Printable} from 'tree-dump';
-import {MarkerSlice} from '../slice/MarkerSlice';
+import type {MarkerSlice} from '../slice/MarkerSlice';
 
 /**
  * For inline boolean ("Overwrite") slices, both range endpoints should be

src/json-crdt-extensions/peritext/editor/__tests__/Editor-blocks.spec.ts

@@ -1,4 +1,4 @@
-import {Kit, runAlphabetKitTestSuite} from '../../__tests__/setup';
+import {type Kit, runAlphabetKitTestSuite} from '../../__tests__/setup';
 import {SliceTypeCon} from '../../slice/constants';
 import {create} from '../../transfer/create';
 
@@ -12,7 +12,9 @@ const runTests = (setup: () => Kit) => {
     peritext.refresh();
     const transfer = create(peritext);
     const html1 = transfer.toHtml(peritext.rangeAll()!);
-    expect(html1).toBe('<p>abc</p><blockquote><p>def</p></blockquote><blockquote><p>ghijklmnopqrstuvwxyz</p></blockquote>');
+    expect(html1).toBe(
+      '<p>abc</p><blockquote><p>def</p></blockquote><blockquote><p>ghijklmnopqrstuvwxyz</p></blockquote>',
+    );
     editor.cursor.setAt(10);
     editor.setBlockType(editor.cursor.start, [SliceTypeCon.blockquote, SliceTypeCon.p]);
     peritext.refresh();
@@ -34,7 +36,9 @@ const runTests = (setup: () => Kit) => {
     editor.setBlockType(point, [[SliceTypeCon.blockquote, 1], SliceTypeCon.p]);
     peritext.refresh();
     const html2 = transfer.toHtml(peritext.rangeAll()!);
-    expect(html2).toBe('<p>abc</p><blockquote><p>def</p></blockquote><blockquote><p>ghijklmnopqrstuvwxyz</p></blockquote>');
+    expect(html2).toBe(
+      '<p>abc</p><blockquote><p>def</p></blockquote><blockquote><p>ghijklmnopqrstuvwxyz</p></blockquote>',
+    );
   });
 };
 

src/json-crdt-extensions/peritext/registry/SliceRegistry.ts

@@ -1,4 +1,4 @@
-import {SliceBehavior, SliceTypeCon} from '../slice/constants';
+import {SliceBehavior, type SliceTypeCon} from '../slice/constants';
 import {CommonSliceType} from '../slice';
 import type {PeritextMlElement} from '../block/types';
 import type {NodeBuilder} from '../../../json-crdt-patch';
@@ -14,22 +14,21 @@ export class SliceRegistryEntry<
   Tag extends TagType = TagType,
   Schema extends NodeBuilder = NodeBuilder,
 > {
-
   public isInline(): boolean {
     return this.behavior !== SliceBehavior.Marker;
   }
-  
+
   constructor(
     public readonly behavior: Behavior,
 
     /**
      * The tag name of this slice. The tag is one step in the type path of the
      * slice. For example, below is a type path composed of three steps:
-     * 
+     *
      * ```js
      * ['ul', 'li', 'p']
      * ```
-     * 
+     *
      * Tag types are normally numbers of type {@link SliceTypeCon}, however,
      * they can also be any arbitrary strings or numbers.
      */
@@ -47,34 +46,48 @@ export class SliceRegistryEntry<
      * For example, a `blockquote` is a container for `paragraph` elements,
      * however, a `paragraph` is not a container (it can only contain inline
      * elements).
-     * 
+     *
      * If the marker slice is of the container sort, they tag can appear in the
      * path steps of the type:
-     * 
+     *
      * ```
-     * 
+     *
      * ```
      */
     public readonly container: boolean = false,
-    
+
     /**
      * Converts a node of this type to HTML representation: returns the HTML tag
      * and attributes. The method receives {@link PeritextMlElement} as an
      * argument, which is a tuple of internal HTML-like representation of the
      * node.
      */
-    public readonly toHtml: ToHtmlConverter<PeritextMlElement<Tag, JsonNodeView<SchemaToJsonNode<Schema>>, Behavior extends SliceBehavior.Marker ? false : true>> | undefined = void 0,
+    public readonly toHtml:
+      | ToHtmlConverter<
+          PeritextMlElement<
+            Tag,
+            JsonNodeView<SchemaToJsonNode<Schema>>,
+            Behavior extends SliceBehavior.Marker ? false : true
+          >
+        >
+      | undefined = void 0,
 
     /**
      * Specifies a mapping of converters from HTML {@link JsonMlElement} to
      * {@link PeritextMlElement}. This way a slice type can specify multiple
      * HTML tags that are converted to the same slice type.
-     * 
+     *
      * For example, both, `<b>` and `<strong>` tags can be converted to the
      * {@link SliceTypeCon.b} slice type.
      */
     public readonly fromHtml?: {
-      [htmlTag: string]: FromHtmlConverter<PeritextMlElement<Tag, JsonNodeView<SchemaToJsonNode<Schema>>, Behavior extends SliceBehavior.Marker ? false : true>>;
+      [htmlTag: string]: FromHtmlConverter<
+        PeritextMlElement<
+          Tag,
+          JsonNodeView<SchemaToJsonNode<Schema>>,
+          Behavior extends SliceBehavior.Marker ? false : true
+        >
+      >;
     },
   ) {}
 }
@@ -85,8 +98,7 @@ export class SliceRegistryEntry<
  */
 export class SliceRegistry {
   private map: Map<TagType, SliceRegistryEntry> = new Map();
-  private _fromHtml: Map<string, [entry: SliceRegistryEntry, converter: FromHtmlConverter][]> =
-    new Map();
+  private _fromHtml: Map<string, [entry: SliceRegistryEntry, converter: FromHtmlConverter][]> = new Map();
 
   public add(entry: SliceRegistryEntry<any, any, any>): void {
     const {tag, fromHtml} = entry;
@@ -100,8 +112,7 @@ export class SliceRegistry {
       }
     }
     const tagStr = CommonSliceType[tag as SliceTypeCon];
-    if (tagStr && typeof tagStr === 'string')
-      _fromHtml.set(tagStr, [[entry, () => [tag, null]]]);
+    if (tagStr && typeof tagStr === 'string') _fromHtml.set(tagStr, [[entry, () => [tag, null]]]);
   }
 
   public toHtml(el: PeritextMlElement): ReturnType<ToHtmlConverter<any>> | undefined {

src/json-crdt-extensions/peritext/registry/registry.ts

@@ -1,13 +1,13 @@
 import {s} from '../../../json-crdt-patch';
 import {SliceBehavior, SliceTypeCon as TAG} from '../slice/constants';
-import {SliceRegistry, SliceRegistryEntry, TagType} from './SliceRegistry';
+import {SliceRegistry, SliceRegistryEntry, type TagType} from './SliceRegistry';
 import type {JsonNodeView} from '../../../json-crdt/nodes';
 import type {SchemaToJsonNode} from '../../../json-crdt/schema/types';
 import type {PeritextMlElement} from '../block/types';
 
 /**
  * Default annotation type registry.
-*/
+ */
 export const registry = new SliceRegistry();
 
 const undefSchema = s.con(undefined);
@@ -18,16 +18,7 @@ const i0 = <Tag extends TagType = TagType>(
   tag: Tag,
   fromHtml?: SliceRegistryEntry<SliceBehavior.One, Tag, typeof undefSchema>['fromHtml'],
 ): void => {
-  registry.add(
-    new SliceRegistryEntry(
-      SliceBehavior.One,
-      tag,
-      undefSchema,
-      false,
-      void 0,
-      fromHtml,
-    )
-  );
+  registry.add(new SliceRegistryEntry(SliceBehavior.One, tag, undefSchema, false, void 0, fromHtml));
 };
 
 const i1 = <Tag extends TagType = TagType>(tag: Tag, htmlTags: string[]): void => {
@@ -56,23 +47,16 @@ const aSchema = s.obj({
   title: s.str<string>(''),
 });
 registry.add(
-  new SliceRegistryEntry(
-    SliceBehavior.Many,
-    TAG.a,
-    aSchema,
-    false,
-    void 0,
-    {
-      a: (jsonml) => {
-        const attr = jsonml[1] || {};
-        const data: JsonNodeView<SchemaToJsonNode<typeof aSchema>> = {
-          href: attr.href ?? '',
-          title: attr.title ?? '',
-        };
-        return [TAG.a, {data, inline: true}] as PeritextMlElement<TAG.a, any, true>;
-      },
+  new SliceRegistryEntry(SliceBehavior.Many, TAG.a, aSchema, false, void 0, {
+    a: (jsonml) => {
+      const attr = jsonml[1] || {};
+      const data: JsonNodeView<SchemaToJsonNode<typeof aSchema>> = {
+        href: attr.href ?? '',
+        title: attr.title ?? '',
+      };
+      return [TAG.a, {data, inline: true}] as PeritextMlElement<TAG.a, any, true>;
     },
-  )
+  }),
 );
 
 // TODO: add more default annotations with "Many" behavior
@@ -89,23 +73,16 @@ registry.add(
 
 // --------------------------------------- Block elements with "Marker" behavior
 
-const commonBlockSchema = s.obj({}, {
-  indent: s.con(0),
-  align: s.str<'left' | 'center' | 'right' | 'justify'>('left'),
-});
+const commonBlockSchema = s.obj(
+  {},
+  {
+    indent: s.con(0),
+    align: s.str<'left' | 'center' | 'right' | 'justify'>('left'),
+  },
+);
 
-const b0 = <Tag extends TagType = TagType>(
-  tag: Tag,
-  container: boolean,
-) => {
-  registry.add(
-    new SliceRegistryEntry(
-      SliceBehavior.Marker,
-      tag,
-      commonBlockSchema,
-      container,
-    )
-  );
+const b0 = <Tag extends TagType = TagType>(tag: Tag, container: boolean) => {
+  registry.add(new SliceRegistryEntry(SliceBehavior.Marker, tag, commonBlockSchema, container));
 };
 
 b0(TAG.p, false);

src/json-crdt-extensions/peritext/slice/types.ts

@@ -33,9 +33,9 @@ import type {Anchor} from '../rga/constants';
  * [2]
  * [3, 4]
  * ```
- * 
+ *
  * Block split with discriminant, to differentiate between two adjacent blocks:
- * 
+ *
  * ```ts
  * [['<blockquote>', 0], '<p>']
  * [['<blockquote>', 1], '<p>']

src/json-crdt-extensions/peritext/slice/util.ts

@@ -40,5 +40,5 @@ export const formatType = (step: SliceTypeStep): string => {
     tag = step;
   }
   if (typeof tag === 'number' && Math.abs(tag) <= 64 && SliceTypeName[tag]) tag = SliceTypeName[tag] ?? tag;
-  return '<' + tag + (discriminant >= 0 ? (':' + discriminant) : '') + '>';
+  return '<' + tag + (discriminant >= 0 ? ':' + discriminant : '') + '>';
 };

src/json-crdt-extensions/peritext/util/commonLength.ts

@@ -10,8 +10,8 @@ export const commonLength = (a: SliceTypeSteps, b: SliceTypeSteps): number => {
     const aTag = Array.isArray(aStep) ? aStep[0] : aStep;
     const bTag = Array.isArray(bStep) ? bStep[0] : bStep;
     if (aTag !== bTag) break;
-    let aDiscriminant = Array.isArray(aStep) ? aStep[1] : 0;
-    let bDiscriminant = Array.isArray(bStep) ? bStep[0] : 0;
+    const aDiscriminant = Array.isArray(aStep) ? aStep[1] : 0;
+    const bDiscriminant = Array.isArray(bStep) ? bStep[0] : 0;
     if (aDiscriminant !== bDiscriminant) break;
     i++;
   }