Merge branch 'main' into feature/new-highlight-extension

# Conflicts:
#	docs/src/docPages/api/extensions.md
#	docs/src/links.yaml
#	packages/core/src/extensions/toggleMark.ts

packages/core/src/utils/callOrReturn.ts

@@ -0,0 +1,17 @@
+/**
+ * Optionally calls `value` as a function.
+ * Otherwise it is returned directly.
+ * @param value Function or any value.
+ * @param context Optional context to bind to function.
+ */
+export default function callOrReturn(value: any, context?: any) {
+  if (typeof value === 'function') {
+    if (context) {
+      return value.bind(context)()
+    }
+
+    return value()
+  }
+
+  return value
+}

packages/core/src/utils/capitalize.ts

@@ -1,3 +0,0 @@
-export default function capitalize(value = ''): string {
-  return value.charAt(0).toUpperCase() + value.slice(1)
-}

packages/core/src/utils/fromString.ts

@@ -0,0 +1,19 @@
+export default function fromString(value: any) {
+  if (typeof value !== 'string') {
+    return value
+  }
+
+  if (value.match(/^\d*(\.\d+)?$/)) {
+    return Number(value)
+  }
+
+  if (value === 'true') {
+    return true
+  }
+
+  if (value === 'false') {
+    return false
+  }
+
+  return value
+}

packages/core/src/utils/generateHTML.ts

@@ -1,11 +1,11 @@
 import { Node } from 'prosemirror-model'
 import getSchema from './getSchema'
-import getHtmlFromFragment from './getHtmlFromFragment'
+import getHTMLFromFragment from './getHTMLFromFragment'
 import { Extensions } from '../types'
 
-export default function generateHtml(doc: object, extensions: Extensions): string {
+export default function generateHTML(doc: object, extensions: Extensions): string {
   const schema = getSchema(extensions)
   const contentNode = Node.fromJSON(schema, doc)
 
-  return getHtmlFromFragment(contentNode, schema)
+  return getHTMLFromFragment(contentNode, schema)
 }

packages/core/src/utils/getHTMLFromFragment.ts

@@ -1,6 +1,6 @@
 import { Node, DOMSerializer, Schema } from 'prosemirror-model'
 
-export default function getHtmlFromFragment(doc: Node, schema: Schema): string {
+export default function getHTMLFromFragment(doc: Node, schema: Schema): string {
   const fragment = DOMSerializer
     .fromSchema(schema)
     .serializeFragment(doc.content)

packages/core/src/utils/getRenderedAttributes.ts

@@ -1,8 +1,8 @@
 import { Node, Mark } from 'prosemirror-model'
-import { ExtensionAttribute } from '../types'
+import { ExtensionAttribute, AnyObject } from '../types'
 import mergeAttributes from './mergeAttributes'
 
-export default function getRenderedAttributes(nodeOrMark: Node | Mark, extensionAttributes: ExtensionAttribute[]): { [key: string]: any } {
+export default function getRenderedAttributes(nodeOrMark: Node | Mark, extensionAttributes: ExtensionAttribute[]): AnyObject {
   return extensionAttributes
     .filter(item => item.attribute.rendered)
     .map(item => {

packages/core/src/utils/getSchema.ts

@@ -5,6 +5,7 @@ import getAttributesFromExtensions from './getAttributesFromExtensions'
 import getRenderedAttributes from './getRenderedAttributes'
 import isEmptyObject from './isEmptyObject'
 import injectExtensionAttributesToParseRule from './injectExtensionAttributesToParseRule'
+import callOrReturn from './callOrReturn'
 
 function cleanUpSchemaItem<T>(data: T) {
   return Object.fromEntries(Object.entries(data).filter(([key, value]) => {
@@ -25,16 +26,16 @@ export default function getSchema(extensions: Extensions): Schema {
     const extensionAttributes = allAttributes.filter(attribute => attribute.type === extension.name)
     const context = { options: extension.options }
     const schema: NodeSpec = cleanUpSchemaItem({
-      content: extension.content,
-      marks: extension.marks,
-      group: extension.group,
-      inline: extension.inline,
-      atom: extension.atom,
-      selectable: extension.selectable,
-      draggable: extension.draggable,
-      code: extension.code,
-      defining: extension.defining,
-      isolating: extension.isolating,
+      content: callOrReturn(extension.content, context),
+      marks: callOrReturn(extension.marks, context),
+      group: callOrReturn(extension.group, context),
+      inline: callOrReturn(extension.inline, context),
+      atom: callOrReturn(extension.atom, context),
+      selectable: callOrReturn(extension.selectable, context),
+      draggable: callOrReturn(extension.draggable, context),
+      code: callOrReturn(extension.code, context),
+      defining: callOrReturn(extension.defining, context),
+      isolating: callOrReturn(extension.isolating, context),
       attrs: Object.fromEntries(extensionAttributes.map(extensionAttribute => {
         return [extensionAttribute.name, { default: extensionAttribute?.attribute?.default }]
       })),
@@ -60,10 +61,10 @@ export default function getSchema(extensions: Extensions): Schema {
     const extensionAttributes = allAttributes.filter(attribute => attribute.type === extension.name)
     const context = { options: extension.options }
     const schema: MarkSpec = cleanUpSchemaItem({
-      inclusive: extension.inclusive,
-      excludes: extension.excludes,
-      group: extension.group,
-      spanning: extension.spanning,
+      inclusive: callOrReturn(extension.inclusive, context),
+      excludes: callOrReturn(extension.excludes, context),
+      group: callOrReturn(extension.group, context),
+      spanning: callOrReturn(extension.spanning, context),
       attrs: Object.fromEntries(extensionAttributes.map(extensionAttribute => {
         return [extensionAttribute.name, { default: extensionAttribute?.attribute?.default }]
       })),

packages/core/src/utils/injectExtensionAttributesToParseRule.ts

@@ -1,5 +1,6 @@
 import { ParseRule } from 'prosemirror-model'
 import { ExtensionAttribute } from '../types'
+import fromString from './fromString'
 
 /**
  * This function merges extension attributes into parserule attributes (`attrs` or `getAttrs`).
@@ -29,7 +30,7 @@ export default function injectExtensionAttributesToParseRule(parseRule: ParseRul
           const attributes = item.attribute.parseHTML
             ? item.attribute.parseHTML(node as HTMLElement) || {}
             : {
-              [item.name]: (node as HTMLElement).getAttribute(item.name),
+              [item.name]: fromString((node as HTMLElement).getAttribute(item.name)),
             }
 
           const filteredAttributes = Object.fromEntries(Object.entries(attributes)

packages/core/src/utils/isList.ts

@@ -0,0 +1,20 @@
+import { Extensions } from '../types'
+import splitExtensions from './splitExtensions'
+import callOrReturn from './callOrReturn'
+
+export default function isList(name: string, extensions: Extensions) {
+  const { nodeExtensions } = splitExtensions(extensions)
+  const extension = nodeExtensions.find(item => item.name === name)
+
+  if (!extension) {
+    return false
+  }
+
+  const groups = callOrReturn(extension.group, { options: extension.options })
+
+  if (typeof groups !== 'string') {
+    return false
+  }
+
+  return groups.split(' ').includes('list')
+}

packages/core/src/utils/mergeAttributes.ts

@@ -5,18 +5,19 @@ export default function mergeAttributes(...object: AnyObject[]) {
     const mergedAttributes = { ...items }
 
     Object.entries(item).forEach(([key, value]) => {
-      if (!mergedAttributes[key]) {
+      const exists = mergedAttributes[key]
+
+      if (!exists) {
         mergedAttributes[key] = value
         return
       }
 
       if (key === 'class') {
         mergedAttributes[key] = [mergedAttributes[key], value].join(' ')
-        return
-      }
-
-      if (key === 'style') {
+      } else if (key === 'style') {
         mergedAttributes[key] = [mergedAttributes[key], value].join('; ')
+      } else {
+        mergedAttributes[key] = value
       }
     })