Fix generics

udecode · Jan 31, 2023 · 5c4cf6f · 5c4cf6f
1 parent 1b14eef
commit 5c4cf6f
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 29 deletions.
diff --git a/packages/serializers/md/src/remark-slate/remarkDefaultElementRules.ts b/packages/serializers/md/src/remark-slate/remarkDefaultElementRules.ts
@@ -8,6 +8,7 @@ import {
   TDescendant,
   TElement,
   TText,
+  Value,
 } from '@udecode/plate-core';
 import {
   ELEMENT_H1,
@@ -31,7 +32,7 @@ import { remarkTransformElementChildren } from './remarkTransformElementChildren
 import { RemarkElementRules } from './types';
 
 // FIXME: underline, subscript superscript not yet supported by remark-slate
-export const remarkDefaultElementRules: RemarkElementRules = {
+export const remarkDefaultElementRules: RemarkElementRules<Value> = {
   heading: {
     transform: (node, options) => {
       const headingType = {

diff --git a/packages/serializers/md/src/remark-slate/remarkDefaultTextRules.ts b/packages/serializers/md/src/remark-slate/remarkDefaultTextRules.ts
@@ -1,8 +1,8 @@
 import { MARK_BOLD, MARK_CODE, MARK_ITALIC } from '@udecode/plate-basic-marks';
-import { getPluginType } from '@udecode/plate-core';
+import { getPluginType, Value } from '@udecode/plate-core';
 import { RemarkTextRules } from './types';
 
-export const remarkDefaultTextRules: RemarkTextRules = {
+export const remarkDefaultTextRules: RemarkTextRules<Value> = {
   text: {},
   emphasis: { mark: ({ editor }) => getPluginType(editor, MARK_ITALIC) },
   strong: { mark: ({ editor }) => getPluginType(editor, MARK_BOLD) },

diff --git a/packages/serializers/md/src/remark-slate/remarkPlugin.ts b/packages/serializers/md/src/remark-slate/remarkPlugin.ts
@@ -1,7 +1,8 @@
+import { Value } from '@udecode/plate-core';
 import { remarkTransformNode } from './remarkTransformNode';
 import { MdastNode, RemarkPluginOptions } from './types';
 
-export function remarkPlugin(options: RemarkPluginOptions) {
+export function remarkPlugin<V extends Value>(options: RemarkPluginOptions<V>) {
   const compiler = (node: { children: Array<MdastNode> }) => {
     return node.children.flatMap((child) =>
       remarkTransformNode(child, options)

diff --git a/packages/serializers/md/src/remark-slate/remarkTransformElement.ts b/packages/serializers/md/src/remark-slate/remarkTransformElement.ts
@@ -1,10 +1,10 @@
-import { TElement } from '@udecode/plate-core';
+import { TElement, Value } from '@udecode/plate-core';
 import { remarkDefaultElementRules } from './remarkDefaultElementRules';
 import { MdastNode, RemarkPluginOptions } from './types';
 
-export const remarkTransformElement = (
+export const remarkTransformElement = <V extends Value>(
   node: MdastNode,
-  options: RemarkPluginOptions
+  options: RemarkPluginOptions<V>
 ): TElement | TElement[] => {
   const { elementRules = remarkDefaultElementRules } = options;
 

diff --git a/packages/serializers/md/src/remark-slate/remarkTransformElementChildren.ts b/packages/serializers/md/src/remark-slate/remarkTransformElementChildren.ts
@@ -1,10 +1,10 @@
-import { TDescendant } from '@udecode/plate-core';
+import { TDescendant, Value } from '@udecode/plate-core';
 import { remarkTransformNode } from './remarkTransformNode';
 import { MdastNode, RemarkPluginOptions } from './types';
 
-export const remarkTransformElementChildren = (
+export const remarkTransformElementChildren = <V extends Value>(
   node: MdastNode,
-  options: RemarkPluginOptions
+  options: RemarkPluginOptions<V>
 ): TDescendant[] => {
   const { children } = node;
   if (!children) return [];

diff --git a/packages/serializers/md/src/remark-slate/remarkTransformNode.ts b/packages/serializers/md/src/remark-slate/remarkTransformNode.ts
@@ -1,12 +1,12 @@
-import { TDescendant } from '@udecode/plate-core';
+import { TDescendant, Value } from '@udecode/plate-core';
 import { remarkTextTypes } from './remarkTextTypes';
 import { remarkTransformElement } from './remarkTransformElement';
 import { remarkTransformText } from './remarkTransformText';
 import { MdastNode, RemarkPluginOptions } from './types';
 
-export const remarkTransformNode = (
+export const remarkTransformNode = <V extends Value>(
   node: MdastNode,
-  options: RemarkPluginOptions
+  options: RemarkPluginOptions<V>
 ): TDescendant | TDescendant[] => {
   const { type } = node;
 

diff --git a/packages/serializers/md/src/remark-slate/remarkTransformText.ts b/packages/serializers/md/src/remark-slate/remarkTransformText.ts
@@ -1,10 +1,10 @@
-import { TText } from '@udecode/plate-core';
+import { TText, Value } from '@udecode/plate-core';
 import { remarkDefaultTextRules } from './remarkDefaultTextRules';
 import { MdastNode, RemarkPluginOptions } from './types';
 
-export const remarkTransformText = (
+export const remarkTransformText = <V extends Value>(
   node: MdastNode,
-  options: RemarkPluginOptions,
+  options: RemarkPluginOptions<V>,
   inheritedMarkProps: { [key: string]: boolean } = {}
 ): TText | TText[] => {
   const { editor, textRules = remarkDefaultTextRules } = options;

diff --git a/packages/serializers/md/src/remark-slate/types.ts b/packages/serializers/md/src/remark-slate/types.ts
@@ -1,4 +1,4 @@
-import { PlateEditor, TElement } from '@udecode/plate-core';
+import { PlateEditor, TElement, Value } from '@udecode/plate-core';
 
 export type MdastElementType =
   | 'paragraph'
@@ -38,28 +38,28 @@ export interface MdastNode {
   indent?: any;
 }
 
-export type RemarkElementRule = {
+export type RemarkElementRule<V extends Value> = {
   transform: (
     node: MdastNode,
-    options: RemarkPluginOptions
+    options: RemarkPluginOptions<V>
   ) => TElement | TElement[];
 };
 
-export type RemarkElementRules = {
-  [key in MdastElementType]?: RemarkElementRule;
+export type RemarkElementRules<V extends Value> = {
+  [key in MdastElementType]?: RemarkElementRule<V>;
 };
 
-export type RemarkTextRule = {
-  mark?: (options: RemarkPluginOptions) => string;
+export type RemarkTextRule<V extends Value> = {
+  mark?: (options: RemarkPluginOptions<V>) => string;
   transform?: (text: string) => string;
 };
 
-export type RemarkTextRules = {
-  [key in MdastTextType]?: RemarkTextRule;
+export type RemarkTextRules<V extends Value> = {
+  [key in MdastTextType]?: RemarkTextRule<V>;
 };
 
-export type RemarkPluginOptions = {
-  editor: PlateEditor;
-  elementRules?: RemarkElementRules;
-  textRules?: RemarkTextRules;
+export type RemarkPluginOptions<V extends Value> = {
+  editor: PlateEditor<V>;
+  elementRules?: RemarkElementRules<V>;
+  textRules?: RemarkTextRules<V>;
 };