@milkdown/preset-gfm 7.3.1 → 7.3.3

package/src/node/table/index.ts

@@ -16,7 +16,7 @@ const originalSchema = tableNodes({
   cellAttributes: {
     alignment: {
       default: 'left',
-      getFromDOM: dom => (dom as HTMLElement).style.textAlign || 'left',
+      getFromDOM: dom => (dom).style.textAlign || 'left',
       setDOMAttr: (value, attrs) => {
         attrs.style = `text-align: ${value || 'left'}`
       },
@@ -176,7 +176,8 @@ withMeta(tableHeaderSchema.ctx, {
 /// A input rule for creating table.
 /// For example, `|2x2|` will create a 2x2 table.
 export const insertTableInputRule = $inputRule(ctx => new InputRule(
-  /^\|(?<col>\d+)[xX](?<row>\d+)\|\s$/, (state, match, start, end) => {
+  /^\|(?<col>\d+)[xX](?<row>\d+)\|\s$/,
+  (state, match, start, end) => {
     const $start = state.doc.resolve(start)
     if (!$start.node(-1).canReplaceWith($start.index(-1), $start.indexAfter(-1), tableSchema.type(ctx)))
       return null
@@ -237,7 +238,7 @@ withMeta(breakTableCommand, {
 /// A command for inserting a table.
 /// You can specify the number of rows and columns.
 /// By default, it will insert a 3x3 table.
-export const insertTableCommand = $command('InsertTable', ctx => ({ row, col }: { row?: number; col?: number } = {}) => (state, dispatch) => {
+export const insertTableCommand = $command('InsertTable', ctx => ({ row, col }: { row?: number, col?: number } = {}) => (state, dispatch) => {
   const { selection, tr } = state
   const { from } = selection
   const table = createTable(ctx, row, col)
@@ -258,7 +259,7 @@ withMeta(insertTableCommand, {
 
 /// A command for moving a row in a table.
 /// You should specify the `from` and `to` index.
-export const moveRowCommand = $command('MoveRow', () => ({ from, to }: { from?: number; to?: number } = {}) => (state, dispatch) => {
+export const moveRowCommand = $command('MoveRow', () => ({ from, to }: { from?: number, to?: number } = {}) => (state, dispatch) => {
   const { tr } = state
   const result = dispatch?.(moveRow(tr, from ?? 0, to ?? 0, true))
 
@@ -272,7 +273,7 @@ withMeta(moveRowCommand, {
 
 /// A command for moving a column in a table.
 /// You should specify the `from` and `to` index.
-export const moveColCommand = $command('MoveCol', () => ({ from, to }: { from?: number; to?: number } = {}) => (state, dispatch) => {
+export const moveColCommand = $command('MoveCol', () => ({ from, to }: { from?: number, to?: number } = {}) => (state, dispatch) => {
   const { tr } = state
   const result = dispatch?.(moveCol(tr, from ?? 0, to ?? 0, true))
 

package/src/node/table/utils.ts

@@ -18,7 +18,7 @@ export interface CellPos {
 }
 
 /// @internal
-export const createTable = (ctx: Ctx, rowsCount = 3, colsCount = 3): Node => {
+export function createTable(ctx: Ctx, rowsCount = 3, colsCount = 3): Node {
   const cells = Array(colsCount)
     .fill(0)
     .map(() => tableCellSchema.type(ctx).createAndFill()!)
@@ -35,11 +35,12 @@ export const createTable = (ctx: Ctx, rowsCount = 3, colsCount = 3): Node => {
 }
 
 /// Find the table node with position information for current selection.
-export const findTable = (selection: Selection) =>
-  findParentNode(node => node.type.spec.tableRole === 'table')(selection)
+export function findTable(selection: Selection) {
+  return findParentNode(node => node.type.spec.tableRole === 'table')(selection)
+}
 
 /// Get cells in a column of a table.
-export const getCellsInCol = (columnIndex: number, selection: Selection): CellPos[] | undefined => {
+export function getCellsInCol(columnIndex: number, selection: Selection): CellPos[] | undefined {
   const table = findTable(selection)
   if (!table)
     return undefined
@@ -64,7 +65,7 @@ export const getCellsInCol = (columnIndex: number, selection: Selection): CellPo
 }
 
 /// Get cells in a row of a table.
-export const getCellsInRow = (rowIndex: number, selection: Selection): CellPos[] | undefined => {
+export function getCellsInRow(rowIndex: number, selection: Selection): CellPos[] | undefined {
   const table = findTable(selection)
   if (!table)
     return undefined
@@ -89,7 +90,7 @@ export const getCellsInRow = (rowIndex: number, selection: Selection): CellPos[]
 }
 
 /// Get all cells in a table.
-export const getAllCellsInTable = (selection: Selection) => {
+export function getAllCellsInTable(selection: Selection) {
   const table = findTable(selection)
   if (!table)
     return
@@ -109,7 +110,7 @@ export const getAllCellsInTable = (selection: Selection) => {
 }
 
 /// Select a possible table in current selection.
-export const selectTable = (tr: Transaction) => {
+export function selectTable(tr: Transaction) {
   const cells = getAllCellsInTable(tr.selection)
   if (cells && cells[0]) {
     const $firstCell = tr.doc.resolve(cells[0].pos)
@@ -142,29 +143,31 @@ export function addRowWithAlignment(ctx: Ctx, tr: Transaction, { map, tableStart
 }
 
 /// @internal
-export const selectLine = (type: 'row' | 'col') => (index: number) => (tr: Transaction) => {
-  const table = findTable(tr.selection)
-  const isRowSelection = type === 'row'
-  if (table) {
-    const map = TableMap.get(table.node)
-
-    // Check if the index is valid
-    if (index >= 0 && index < (isRowSelection ? map.height : map.width)) {
-      const lastCell = map.positionAt(
-        isRowSelection ? index : map.height - 1,
-        isRowSelection ? map.width - 1 : index,
-        table.node,
-      )
-      const $lastCell = tr.doc.resolve(table.start + lastCell)
-
-      const createCellSelection = isRowSelection ? CellSelection.rowSelection : CellSelection.colSelection
-
-      const firstCell = map.positionAt(isRowSelection ? index : 0, isRowSelection ? 0 : index, table.node)
-      const $firstCell = tr.doc.resolve(table.start + firstCell)
-      return cloneTr(tr.setSelection(createCellSelection($lastCell, $firstCell) as unknown as Selection))
+export function selectLine(type: 'row' | 'col') {
+  return (index: number) => (tr: Transaction) => {
+    const table = findTable(tr.selection)
+    const isRowSelection = type === 'row'
+    if (table) {
+      const map = TableMap.get(table.node)
+
+      // Check if the index is valid
+      if (index >= 0 && index < (isRowSelection ? map.height : map.width)) {
+        const lastCell = map.positionAt(
+          isRowSelection ? index : map.height - 1,
+          isRowSelection ? map.width - 1 : index,
+          table.node,
+        )
+        const $lastCell = tr.doc.resolve(table.start + lastCell)
+
+        const createCellSelection = isRowSelection ? CellSelection.rowSelection : CellSelection.colSelection
+
+        const firstCell = map.positionAt(isRowSelection ? index : 0, isRowSelection ? 0 : index, table.node)
+        const $firstCell = tr.doc.resolve(table.start + firstCell)
+        return cloneTr(tr.setSelection(createCellSelection($lastCell, $firstCell) as unknown as Selection))
+      }
     }
+    return tr
   }
-  return tr
 }
 
 /// If the selection is in a table,
@@ -175,13 +178,13 @@ export const selectRow = selectLine('row')
 /// select the {index} column.
 export const selectCol = selectLine('col')
 
-const transpose = <T>(array: T[][]) => {
+function transpose<T>(array: T[][]) {
   return array[0]!.map((_, i) => {
     return array.map(column => column[i])
   }) as T[][]
 }
 
-const convertArrayOfRowsToTableNode = (tableNode: Node, arrayOfNodes: (Node | null)[][]) => {
+function convertArrayOfRowsToTableNode(tableNode: Node, arrayOfNodes: (Node | null)[][]) {
   const rowsPM = []
   const map = TableMap.get(tableNode)
   for (let rowIndex = 0; rowIndex < map.height; rowIndex++) {
@@ -216,7 +219,7 @@ const convertArrayOfRowsToTableNode = (tableNode: Node, arrayOfNodes: (Node | nu
   return newTable
 }
 
-const convertTableNodeToArrayOfRows = (tableNode: Node) => {
+function convertTableNodeToArrayOfRows(tableNode: Node) {
   const map = TableMap.get(tableNode)
   const rows: (Node | null)[][] = []
   for (let rowIndex = 0; rowIndex < map.height; rowIndex++) {
@@ -242,12 +245,7 @@ const convertTableNodeToArrayOfRows = (tableNode: Node) => {
   return rows
 }
 
-const moveRowInArrayOfRows = (
-  rows: (Node | null)[][],
-  indexesOrigin: number[],
-  indexesTarget: number[],
-  directionOverride: -1 | 1 | 0,
-) => {
+function moveRowInArrayOfRows(rows: (Node | null)[][], indexesOrigin: number[], indexesTarget: number[], directionOverride: -1 | 1 | 0) {
   const direction = indexesOrigin[0]! > indexesTarget[0]! ? -1 : 1
 
   const rowsExtracted = rows.splice(indexesOrigin[0]!, indexesOrigin.length)
@@ -271,12 +269,7 @@ const moveRowInArrayOfRows = (
   return rows
 }
 
-const moveTableColumn = (
-  table: ContentNodeWithPos,
-  indexesOrigin: number[],
-  indexesTarget: number[],
-  direction: -1 | 1 | 0,
-) => {
+function moveTableColumn(table: ContentNodeWithPos, indexesOrigin: number[], indexesTarget: number[], direction: -1 | 1 | 0) {
   let rows = transpose(convertTableNodeToArrayOfRows(table.node))
 
   rows = moveRowInArrayOfRows(rows, indexesOrigin, indexesTarget, direction)
@@ -285,12 +278,7 @@ const moveTableColumn = (
   return convertArrayOfRowsToTableNode(table.node, rows)
 }
 
-const moveTableRow = (
-  table: ContentNodeWithPos,
-  indexesOrigin: number[],
-  indexesTarget: number[],
-  direction: -1 | 1 | 0,
-) => {
+function moveTableRow(table: ContentNodeWithPos, indexesOrigin: number[], indexesTarget: number[], direction: -1 | 1 | 0) {
   let rows = convertTableNodeToArrayOfRows(table.node)
 
   rows = moveRowInArrayOfRows(rows, indexesOrigin, indexesTarget, direction)
@@ -298,7 +286,7 @@ const moveTableRow = (
   return convertArrayOfRowsToTableNode(table.node, rows)
 }
 
-const getSelectionRangeInColumn = (columnIndex: number, tr: Transaction) => {
+function getSelectionRangeInColumn(columnIndex: number, tr: Transaction) {
   let startIndex = columnIndex
   let endIndex = columnIndex
 
@@ -363,7 +351,7 @@ const getSelectionRangeInColumn = (columnIndex: number, tr: Transaction) => {
   return { $anchor, $head, indexes }
 }
 
-const getSelectionRangeInRow = (rowIndex: number, tr: Transaction) => {
+function getSelectionRangeInRow(rowIndex: number, tr: Transaction) {
   let startIndex = rowIndex
   let endIndex = rowIndex
   // looking for selection start row (startIndex)

package/src/plugin/auto-insert-zero-space-plugin.ts

@@ -36,10 +36,10 @@ export const autoInsertZeroSpaceInTablePlugin = $prose((ctx) => {
 
           if (
             browser.safari
-              && isInTable(state)
-              && selection.empty
-              && isParagraph($from.parent)
-              && $from.parent.textContent.startsWith('\u2060')
+            && isInTable(state)
+            && selection.empty
+            && isParagraph($from.parent)
+            && $from.parent.textContent.startsWith('\u2060')
           )
             dispatch(tr.delete($from.start(), $from.start() + 1))
 

package/src/plugin/remark-gfm-plugin.ts

@@ -1,10 +1,12 @@
 /* Copyright 2021, Milkdown by Mirone. */
+import type { $Remark } from '@milkdown/utils'
 import { $remark } from '@milkdown/utils'
+import type { Options } from 'remark-gfm'
 import remarkGFM from 'remark-gfm'
 import { withMeta } from '../__internal__'
 
 /// This plugin is wrapping the [remark-gfm](https://github.com/remarkjs/remark-gfm).
-export const remarkGFMPlugin = $remark('remarkGFM', () => remarkGFM)
+export const remarkGFMPlugin: $Remark<'remarkGFM', Options | null | undefined> = $remark('remarkGFM', () => remarkGFM)
 
 withMeta(remarkGFMPlugin.plugin, {
   displayName: 'Remark<remarkGFMPlugin>',