merge from upstream

.gitignore

@@ -1,3 +1,4 @@
 /node_modules
 .tern-port
 /dist
+/test/*.js

.npmrc

@@ -0,0 +1 @@
+package-lock=false

CHANGELOG.md

@@ -1,3 +1,215 @@
+## 1.22.3 (2024-08-06)
+
+### Bug fixes
+
+Fix some corner cases in the way the DOM parser tracks active marks.
+
+## 1.22.2 (2024-07-18)
+
+### Bug fixes
+
+Make attribute validation messages more informative.
+
+## 1.22.1 (2024-07-14)
+
+### Bug fixes
+
+Add code to `DOMSerializer` that rejects DOM output specs when they originate from attribute values, to protect against XSS attacks that use corrupt attribute input.
+
+## 1.22.0 (2024-07-14)
+
+### New features
+
+Attribute specs now support a `validate` property that can be used to provide a validation function for the attribute, to guard against corrupt JSON input.
+
+## 1.21.3 (2024-06-26)
+
+### Bug fixes
+
+Fix an issue where parse rules for CSS properties that were shorthands for a number of more detailed properties weren't matching properly.
+
+## 1.21.2 (2024-06-25)
+
+### Bug fixes
+
+Make sure resolved positions (and thus the document and schema hanging off them) don't get kept in the cache when their document can be garbage-collected.
+
+## 1.21.1 (2024-06-03)
+
+### Bug fixes
+
+Improve performance and accuracy of `DOMParser` style matching by using the DOM's own `style` object.
+
+## 1.21.0 (2024-05-06)
+
+### New features
+
+The new `linebreakReplacement` property on node specs makes it possible to configure a node type that `setBlockType` will convert to and from line breaks when appropriate.
+
+## 1.20.0 (2024-04-08)
+
+### New features
+
+The `ParseRule` type is now a union of `TagParseRule` and `StyleParseRule`, with more specific types being used when appropriate.
+
+## 1.19.4 (2023-12-11)
+
+### Bug fixes
+
+Make `textBetween` emit block separators for empty textblocks.
+
+## 1.19.3 (2023-07-13)
+
+### Bug fixes
+
+Don't apply style parse rules for nodes that are skipped by other parse rules.
+
+## 1.19.2 (2023-05-23)
+
+### Bug fixes
+
+Allow parse rules with a `clearMark` directive to clear marks that have already been applied.
+
+## 1.19.1 (2023-05-17)
+
+### Bug fixes
+
+Fix the types of `Fragment.desendants` to include the index parameter to the callback. Add release note
+
+Include CommonJS type declarations in the package to please new TypeScript resolution settings.
+
+## 1.19.0 (2023-01-18)
+
+### New features
+
+Parse rules for styles can now provide a `clearMark` property to remove pending marks (for example for `font-style: normal`).
+
+## 1.18.3 (2022-11-18)
+
+### Bug fixes
+
+Copy all properties from the input spec to `Schema.spec`.
+
+## 1.18.2 (2022-11-14)
+
+### Bug fixes
+
+Improve DOM parsing of nested block elements mixing block and inline children.
+
+## 1.18.1 (2022-06-15)
+
+### Bug fixes
+
+Upgrade to orderedmap 2.0.0 to avoid around a TypeScript compilation issue.
+
+## 1.18.0 (2022-06-07)
+
+### New features
+
+Node specs for leaf nodes now support a property `leafText` which, when given, will be used by `textContent` and `textBetween` to serialize the node.
+
+Add optional type parameters to `Schema` for the node and mark names. Clarify Schema type parameters
+
+## 1.17.0 (2022-05-30)
+
+### Bug fixes
+
+Fix a crash in DOM parsing.
+
+### New features
+
+Include TypeScript type declarations.
+
+## 1.16.1 (2021-12-29)
+
+### Bug fixes
+
+Fix a bug in the way whitespace-preservation options were handled in `DOMParser`.
+
+## 1.16.0 (2021-12-27)
+
+### New features
+
+A new `NodeSpec` property, `whitespace`, allows more control over the way whitespace in the content of the node is parsed.
+
+## 1.15.0 (2021-10-25)
+
+### New features
+
+`textBetween` now allows its leaf text argument to be a function.
+
+## 1.14.3 (2021-07-22)
+
+### Bug fixes
+
+`DOMSerializer.serializeNode` will no longer ignore the node's marks.
+
+## 1.14.2 (2021-06-16)
+
+### Bug fixes
+
+Be less agressive about dropping whitespace when the context isn't know in `DOMParser.parseSlice`.
+
+## 1.14.1 (2021-04-26)
+
+### Bug fixes
+
+DOM parsing with `preserveWhitespace: "full"` will no longer ignore whitespace-only nodes.
+
+## 1.14.0 (2021-04-06)
+
+### Bug fixes
+
+`Node.check` will now error if a node has an invalid combination of marks.
+
+Don't leave carriage return characters in parsed DOM content, since they confuse Chrome's cursor motion.
+
+### New features
+
+`Fragment.textBetween` is now public.
+
+## 1.13.3 (2021-02-04)
+
+### Bug fixes
+
+Fix an issue where nested tags that match mark parser rules could cause the parser to apply marks in invalid places.
+
+## 1.13.2 (2021-02-04)
+
+### Bug fixes
+
+`MarkType.removeFromSet` now removes all instances of the mark, not just the first one.
+
+## 1.13.1 (2020-12-20)
+
+### Bug fixes
+
+Fix a bug where nested marks of the same type would be applied to the wrong node when parsing from DOM.
+
+## 1.13.0 (2020-12-11)
+
+### New features
+
+Parse rules can now have a `consuming: false` property which allows other rules to match their tag or style even when they apply.
+
+## 1.12.0 (2020-10-11)
+
+### New features
+
+The output of `toDOM` functions can now be a `{dom, contentDOM}` object specifying the precise parent and content DOM elements.
+
+## 1.11.2 (2020-09-12)
+
+### Bug fixes
+
+Fix issue where 1.11.1 uses an array method not available on Internet Explorer.
+
+## 1.11.1 (2020-09-11)
+
+### Bug fixes
+
+Fix an issue where an inner node's mark information could reset the same mark provided by an outer node in the DOM parser.
+
 ## 1.11.0 (2020-07-08)
 
 ### New features

LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2015-2017 by Marijn Haverbeke <[email protected]> and others
+Copyright (C) 2015-2017 by Marijn Haverbeke <[email protected]> and others
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,6 +1,6 @@
 # prosemirror-model
 
-[ [**WEBSITE**](https://prosemirror.net) | [**ISSUES**](https://github.com/prosemirror/prosemirror/issues) | [**FORUM**](https://discuss.prosemirror.net) | [**GITTER**](https://gitter.im/ProseMirror/prosemirror) | [**CHANGELOG**](https://github.com/ProseMirror/prosemirror-model/blob/master/CHANGELOG.md) ]
+[ [**WEBSITE**](https://prosemirror.net) | [**ISSUES**](https://github.com/prosemirror/prosemirror/issues) | [**FORUM**](https://discuss.prosemirror.net) | [**CHANGELOG**](https://github.com/ProseMirror/prosemirror-model/blob/master/CHANGELOG.md) ]
 
 This is a [core module](https://prosemirror.net/docs/ref/#model) of [ProseMirror](https://prosemirror.net).
 ProseMirror is a well-behaved rich semantic content editor based on

package.json

@@ -1,14 +1,21 @@
 {
   "name": "prosemirror-model",
-  "version": "1.11.0",
+  "version": "1.22.3",
   "description": "ProseMirror's document model",
-  "main": "dist/index.js",
-  "module": "dist/index.es.js",
+  "type": "module",
+  "main": "dist/index.cjs",
+  "module": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "exports": {
+    "import": "./dist/index.js",
+    "require": "./dist/index.cjs"
+  },
+  "sideEffects": false,
   "license": "MIT",
   "maintainers": [
     {
       "name": "Marijn Haverbeke",
-      "email": "[email protected]",
+      "email": "[email protected]",
       "web": "http://marijnhaverbeke.nl"
     }
   ],
@@ -17,20 +24,15 @@
     "url": "git://github.com/prosemirror/prosemirror-model.git"
   },
   "dependencies": {
-    "orderedmap": "^1.1.0"
+    "orderedmap": "^2.0.0"
   },
   "devDependencies": {
-    "mocha": "^3.0.2",
-    "ist": "^1.0.0",
-    "jsdom": "^10.1.0",
-    "prosemirror-test-builder": "^1.0.0",
-    "rollup": "^2.26.3",
-    "@rollup/plugin-buble": "^0.21.3"
+    "@prosemirror/buildhelper": "^0.1.5",
+    "jsdom": "^20.0.0",
+    "prosemirror-test-builder": "^1.0.0"
   },
   "scripts": {
-    "test": "node etc/link-self.js && mocha test/test-*.js",
-    "build": "rollup -c",
-    "watch": "rollup -c -w",
-    "prepare": "npm run build"
+    "test": "pm-runtests",
+    "prepare": "pm-buildhelper src/index.ts"
   }
 }

src/README.md

@@ -11,6 +11,7 @@ describes the type of the content, and holds a
 @Fragment
 @Mark
 @Slice
+@Attrs
 @ReplaceError
 
 ### Resolved Positions
@@ -52,6 +53,9 @@ to use this module.)
 
 @DOMParser
 @ParseOptions
+@GenericParseRule
+@TagParseRule
+@StyleParseRule
 @ParseRule
 
 @DOMSerializer

src/comparedeep.js → src/comparedeep.ts

@@ -1,4 +1,4 @@
-export function compareDeep(a, b) {
+export function compareDeep(a: any, b: any) {
   if (a === b) return true
   if (!(a && typeof a == "object") ||
       !(b && typeof b == "object")) return false