@markuplint/ml-core 4.0.0-dev.28 → 4.0.0-rc.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (50) hide show
  1. package/LICENSE +1 -1
  2. package/lib/configs.browser.js +10 -8
  3. package/lib/convert-ruleset.d.ts +1 -1
  4. package/lib/convert-ruleset.js +1 -1
  5. package/lib/index.d.ts +1 -2
  6. package/lib/index.js +1 -2
  7. package/lib/ml-core.d.ts +1 -1
  8. package/lib/ml-dom/helper/create-node.d.ts +2 -2
  9. package/lib/ml-dom/helper/create-node.js +32 -7
  10. package/lib/ml-dom/helper/get-indent.js +1 -1
  11. package/lib/ml-dom/manipulations/child-node-methods.js +1 -1
  12. package/lib/ml-dom/node/attr.d.ts +18 -0
  13. package/lib/ml-dom/node/attr.js +69 -31
  14. package/lib/ml-dom/node/block.js +1 -3
  15. package/lib/ml-dom/node/character-data.d.ts +2 -2
  16. package/lib/ml-dom/node/character-data.js +1 -1
  17. package/lib/ml-dom/node/child-node.d.ts +2 -2
  18. package/lib/ml-dom/node/document-fragment.d.ts +2 -2
  19. package/lib/ml-dom/node/document-fragment.js +1 -1
  20. package/lib/ml-dom/node/document-type.js +1 -3
  21. package/lib/ml-dom/node/document.d.ts +4 -4
  22. package/lib/ml-dom/node/document.js +12 -11
  23. package/lib/ml-dom/node/dom-token-list.js +3 -3
  24. package/lib/ml-dom/node/element-close-tag.d.ts +20 -0
  25. package/lib/ml-dom/node/element-close-tag.js +39 -0
  26. package/lib/ml-dom/node/element.d.ts +14 -6
  27. package/lib/ml-dom/node/element.js +62 -46
  28. package/lib/ml-dom/node/named-node-map.js +1 -1
  29. package/lib/ml-dom/node/node-store.d.ts +3 -3
  30. package/lib/ml-dom/node/node.d.ts +2 -2
  31. package/lib/ml-dom/node/node.js +18 -11
  32. package/lib/ml-dom/node/parent-node.d.ts +2 -2
  33. package/lib/ml-dom/node/parent-node.js +1 -1
  34. package/lib/ml-dom/node/text.js +1 -1
  35. package/lib/ml-dom/node/types.d.ts +2 -3
  36. package/lib/ml-dom/node/unexpected-call-error.d.ts +1 -1
  37. package/lib/ml-dom/node/unexpected-call-error.js +1 -1
  38. package/lib/ml-dom/token/token.d.ts +3 -3
  39. package/lib/ml-dom/token/token.js +5 -5
  40. package/lib/ml-rule/ml-rule.d.ts +1 -1
  41. package/lib/ml-rule/types.d.ts +3 -0
  42. package/lib/ruleset/index.d.ts +1 -1
  43. package/lib/ruleset/index.js +1 -1
  44. package/lib/test/index.d.ts +6 -4
  45. package/lib/test/index.js +6 -2
  46. package/lib/types.d.ts +3 -3
  47. package/lib/utils/get-location-from-chars.js +1 -1
  48. package/package.json +13 -13
  49. package/lib/configs.d.ts +0 -2
  50. package/lib/configs.js +0 -37
package/LICENSE CHANGED
@@ -1,6 +1,6 @@
1
1
  MIT License
2
2
 
3
- Copyright (c) 2017-2019 Yusuke Hirao
3
+ Copyright (c) 2017-2024 Yusuke Hirao
4
4
 
5
5
  Permission is hereby granted, free of charge, to any person obtaining a copy
6
6
  of this software and associated documentation files (the "Software"), to deal
@@ -1,10 +1,12 @@
1
1
  export async function getPreset(name) {
2
- const res = await fetch(`@markuplint/config-presets/preset.${name}.json`).catch(() =>
3
- // eslint-disable-next-line unicorn/error-message
4
- new Error());
5
- if (res instanceof Error) {
6
- throw new ReferenceError(`Preset markuplint:${name} is not found`);
7
- }
8
- const json = await res.json();
9
- return json;
2
+ const res = await fetch(`@markuplint/config-presets/preset.${name}.json`).catch(
3
+ () =>
4
+ // eslint-disable-next-line unicorn/error-message
5
+ new Error(),
6
+ );
7
+ if (res instanceof Error) {
8
+ throw new ReferenceError(`Preset markuplint:${name} is not found`);
9
+ }
10
+ const json = await res.json();
11
+ return json;
10
12
  }
@@ -1,3 +1,3 @@
1
1
  import type { Config } from '@markuplint/ml-config';
2
- import Ruleset from './ruleset/index.js';
2
+ import { Ruleset } from './ruleset/index.js';
3
3
  export declare function convertRuleset(config?: Config): Ruleset;
@@ -1,4 +1,4 @@
1
- import Ruleset from './ruleset/index.js';
1
+ import { Ruleset } from './ruleset/index.js';
2
2
  export function convertRuleset(config = {}) {
3
3
  return new Ruleset(config);
4
4
  }
package/lib/index.d.ts CHANGED
@@ -1,9 +1,8 @@
1
1
  export { RuleInfo, RuleConfig, RuleConfigValue } from '@markuplint/ml-config';
2
2
  export { ariaSpecs, contentModelCategoryToTagNames, getAttrSpecs, getComputedRole, getImplicitRole, getPermittedRoles, getRoleSpec, getSpec, resolveNamespace, } from '@markuplint/ml-spec';
3
- export { default as Ruleset } from './ruleset/index.js';
3
+ export { Ruleset } from './ruleset/index.js';
4
4
  export { enableDebug } from './debug.js';
5
5
  export { getIndent } from './ml-dom/helper/get-indent.js';
6
- export * from './configs.js';
7
6
  export * from './convert-ruleset.js';
8
7
  export * from './ml-core.js';
9
8
  export * from './ml-dom/index.js';
package/lib/index.js CHANGED
@@ -1,8 +1,7 @@
1
1
  export { ariaSpecs, contentModelCategoryToTagNames, getAttrSpecs, getComputedRole, getImplicitRole, getPermittedRoles, getRoleSpec, getSpec, resolveNamespace, } from '@markuplint/ml-spec';
2
- export { default as Ruleset } from './ruleset/index.js';
2
+ export { Ruleset } from './ruleset/index.js';
3
3
  export { enableDebug } from './debug.js';
4
4
  export { getIndent } from './ml-dom/helper/get-indent.js';
5
- export * from './configs.js';
6
5
  export * from './convert-ruleset.js';
7
6
  export * from './ml-core.js';
8
7
  export * from './ml-dom/index.js';
package/lib/ml-core.d.ts CHANGED
@@ -10,7 +10,7 @@ export type MLCoreParams = {
10
10
  export declare class MLCore {
11
11
  #private;
12
12
  constructor({ parser, sourceCode, ruleset, rules, locale, schemas, parserOptions, pretenders, filename, debug, configErrors, }: MLCoreParams);
13
- get document(): ParserError | Document<RuleConfigValue, PlainData>;
13
+ get document(): Document<RuleConfigValue, PlainData> | ParserError;
14
14
  setCode(sourceCode: string): void;
15
15
  update({ parser, ruleset, rules, locale, schemas, parserOptions, configErrors }: Partial<MLFabric>): void;
16
16
  verify(fix?: boolean): Promise<Violation[]>;
@@ -1,5 +1,5 @@
1
1
  import type { MLDocument } from '../node/document.js';
2
2
  import type { MappedNode } from '../node/types.js';
3
- import type { MLASTAbstractNode } from '@markuplint/ml-ast';
3
+ import type { MLASTNode } from '@markuplint/ml-ast';
4
4
  import type { PlainData, RuleConfigValue } from '@markuplint/ml-config';
5
- export declare function createNode<N extends MLASTAbstractNode, T extends RuleConfigValue, O extends PlainData = undefined>(astNode: N, document: MLDocument<T, O>): MappedNode<N, T, O>;
5
+ export declare function createNode<N extends MLASTNode, T extends RuleConfigValue, O extends PlainData = undefined>(astNode: N, document: MLDocument<T, O>): MappedNode<N, T, O>;
@@ -6,22 +6,47 @@ import { MLText } from '../node/text.js';
6
6
  export function createNode(astNode,
7
7
  // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
8
8
  document) {
9
- const _astNode = astNode;
10
- switch (_astNode.type) {
9
+ switch (astNode.type) {
11
10
  case 'doctype': {
12
- return new MLDocumentType(_astNode, document);
11
+ return new MLDocumentType(astNode, document);
13
12
  }
14
13
  case 'starttag': {
15
- return new MLElement(_astNode, document);
14
+ return new MLElement(astNode, document);
16
15
  }
17
16
  case 'psblock': {
18
- return new MLBlock(_astNode, document);
17
+ return new MLBlock(astNode, document);
19
18
  }
20
19
  case 'comment': {
21
- return new MLComment(_astNode, document);
20
+ return new MLComment(astNode, document);
22
21
  }
23
22
  case 'text': {
24
- return new MLText(_astNode, document);
23
+ return new MLText(astNode, document);
24
+ }
25
+ case 'invalid': {
26
+ switch (astNode.kind) {
27
+ case 'starttag': {
28
+ return new MLElement({
29
+ ...astNode,
30
+ type: 'starttag',
31
+ nodeName: 'x-invalid',
32
+ namespace: 'http://www.w3.org/1999/xhtml',
33
+ elementType: 'web-component',
34
+ attributes: [],
35
+ childNodes: [],
36
+ pairNode: null,
37
+ tagOpenChar: '',
38
+ tagCloseChar: '',
39
+ isGhost: false,
40
+ }, document);
41
+ }
42
+ default: {
43
+ return new MLText({
44
+ ...astNode,
45
+ type: 'text',
46
+ nodeName: '#text',
47
+ }, document);
48
+ }
49
+ }
25
50
  }
26
51
  }
27
52
  throw new TypeError(`Invalid AST node types "${astNode.type}"`);
@@ -26,7 +26,7 @@ node) {
26
26
  if (node.isRawTextElementContent()) {
27
27
  return null;
28
28
  }
29
- const matched = node.raw.match(/^(\s*(?:\r?\n)+\s*)\S+/);
29
+ const matched = node.raw.match(/^([\t\v\f\r \u00A0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*\n\s*)\S+/);
30
30
  if (matched) {
31
31
  const spaces = matched[1];
32
32
  if (spaces) {
@@ -1,4 +1,4 @@
1
- import UnexpectedCallError from '../node/unexpected-call-error.js';
1
+ import { UnexpectedCallError } from '../node/unexpected-call-error.js';
2
2
  /**
3
3
  *
4
4
  * @see https://dom.spec.whatwg.org/#ref-for-dom-childnode-before%E2%91%A0
@@ -91,8 +91,26 @@ export declare class MLAttr<T extends RuleConfigValue, O extends PlainData = und
91
91
  * @see https://dom.spec.whatwg.org/#dom-attr-value
92
92
  */
93
93
  get value(): string;
94
+ /**
95
+ * Fixes the attribute value.
96
+ * If the attribute is not a spread attribute, it calls the `fix` method of the `valueNode`.
97
+ *
98
+ * @implements `@markuplint/ml-core` API: `MLAttr`
99
+ *
100
+ * @param raw - The raw attribute value.
101
+ */
102
+ fix(raw: string): void;
94
103
  /**
95
104
  * @implements `@markuplint/ml-core` API: `MLAttr`
96
105
  */
97
106
  toNormalizeString(): string;
107
+ /**
108
+ * Returns a string representation of the attribute.
109
+ *
110
+ * @implements DOM API: `Attr`
111
+ *
112
+ * @param includesSpacesBeforeName - Whether to include spaces before the attribute name.
113
+ * @returns The string representation of the attribute.
114
+ */
115
+ toString(fixed?: boolean): string;
98
116
  }
@@ -14,11 +14,9 @@ import { resolveNamespace } from '@markuplint/ml-spec';
14
14
  import { MLToken } from '../token/token.js';
15
15
  import { MLDomTokenList } from './dom-token-list.js';
16
16
  import { MLNode } from './node.js';
17
- import UnexpectedCallError from './unexpected-call-error.js';
17
+ import { UnexpectedCallError } from './unexpected-call-error.js';
18
18
  export class MLAttr extends MLNode {
19
- constructor(
20
- // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
21
- astToken,
19
+ constructor(astToken,
22
20
  // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
23
21
  ownElement) {
24
22
  super(astToken, ownElement.ownerMLDocument);
@@ -41,32 +39,35 @@ export class MLAttr extends MLNode {
41
39
  * @implements `@markuplint/ml-core` API: `MLAttr`
42
40
  */
43
41
  this.valueType = 'string';
44
- if (this._astToken.type === 'html-attr') {
45
- this.spacesBeforeName = new MLToken(this._astToken.spacesBeforeName);
46
- this.nameNode = new MLToken(this._astToken.name);
47
- this.spacesBeforeEqual = new MLToken(this._astToken.spacesBeforeEqual);
48
- this.equal = new MLToken(this._astToken.equal);
49
- this.spacesAfterEqual = new MLToken(this._astToken.spacesAfterEqual);
50
- this.startQuote = new MLToken(this._astToken.startQuote);
51
- this.valueNode = new MLToken(this._astToken.value);
52
- this.endQuote = new MLToken(this._astToken.endQuote);
53
- this.isDynamicValue = this._astToken.isDynamicValue;
54
- this.isDirective = this._astToken.isDirective;
55
- this.candidate = this._astToken.candidate;
56
- __classPrivateFieldSet(this, _MLAttr_potentialName, this._astToken.potentialName ?? this.nameNode?.raw ?? '', "f");
57
- __classPrivateFieldSet(this, _MLAttr_potentialValue, this._astToken.value.raw ?? '', "f");
58
- }
59
- else {
60
- this.valueType = this._astToken.valueType;
61
- this.isDuplicatable = this._astToken.isDuplicatable;
62
- __classPrivateFieldSet(this, _MLAttr_potentialName, this._astToken.potentialName, "f");
63
- __classPrivateFieldSet(this, _MLAttr_potentialValue, this._astToken.potentialValue, "f");
42
+ this.ownerElement = ownElement;
43
+ if (this._astToken.type === 'spread') {
44
+ __classPrivateFieldSet(this, _MLAttr_namespaceURI, ownElement.namespaceURI, "f");
45
+ this.valueType = 'code';
46
+ __classPrivateFieldSet(this, _MLAttr_localName, '#spread', "f");
47
+ __classPrivateFieldSet(this, _MLAttr_potentialName, '#spread', "f");
48
+ __classPrivateFieldSet(this, _MLAttr_potentialValue, this._astToken.raw, "f");
49
+ this.isDirective = true;
50
+ this.isDynamicValue = true;
51
+ this.isDuplicatable = true;
52
+ return;
64
53
  }
54
+ this.spacesBeforeName = new MLToken(this._astToken.spacesBeforeName);
55
+ this.nameNode = new MLToken(this._astToken.name);
56
+ this.spacesBeforeEqual = new MLToken(this._astToken.spacesBeforeEqual);
57
+ this.equal = new MLToken(this._astToken.equal);
58
+ this.spacesAfterEqual = new MLToken(this._astToken.spacesAfterEqual);
59
+ this.startQuote = new MLToken(this._astToken.startQuote);
60
+ this.valueNode = new MLToken(this._astToken.value);
61
+ this.endQuote = new MLToken(this._astToken.endQuote);
62
+ this.isDynamicValue = this._astToken.isDynamicValue;
63
+ this.isDirective = this._astToken.isDirective;
64
+ this.candidate = this._astToken.candidate;
65
+ __classPrivateFieldSet(this, _MLAttr_potentialName, this._astToken.potentialName ?? this.nameNode?.raw ?? '', "f");
66
+ __classPrivateFieldSet(this, _MLAttr_potentialValue, this._astToken.potentialValue ?? this.valueNode?.raw ?? '', "f");
67
+ this.isDuplicatable = this._astToken.isDuplicatable;
65
68
  const ns = resolveNamespace(__classPrivateFieldGet(this, _MLAttr_potentialName, "f"), ownElement.namespaceURI);
66
69
  __classPrivateFieldSet(this, _MLAttr_localName, ns.localName, "f");
67
70
  __classPrivateFieldSet(this, _MLAttr_namespaceURI, ns.namespaceURI, "f");
68
- this.ownerElement = ownElement;
69
- this.isDuplicatable = this._astToken.isDuplicatable;
70
71
  }
71
72
  /**
72
73
  * **IT THROWS AN ERROR WHEN CALLING THIS.**
@@ -149,18 +150,55 @@ export class MLAttr extends MLNode {
149
150
  get value() {
150
151
  return __classPrivateFieldGet(this, _MLAttr_potentialValue, "f");
151
152
  }
153
+ /**
154
+ * Fixes the attribute value.
155
+ * If the attribute is not a spread attribute, it calls the `fix` method of the `valueNode`.
156
+ *
157
+ * @implements `@markuplint/ml-core` API: `MLAttr`
158
+ *
159
+ * @param raw - The raw attribute value.
160
+ */
161
+ fix(raw) {
162
+ if (this.localName === '#spread') {
163
+ return;
164
+ }
165
+ // `valueNode` is not null when it is no spread.
166
+ this.valueNode?.fix(raw);
167
+ }
152
168
  /**
153
169
  * @implements `@markuplint/ml-core` API: `MLAttr`
154
170
  */
155
171
  toNormalizeString() {
156
172
  if (this.nameNode && this.equal && this.startQuote && this.valueNode && this.endQuote) {
157
- return (this.nameNode.originRaw +
158
- this.equal.originRaw +
159
- this.startQuote.originRaw +
160
- this.valueNode.originRaw +
161
- this.endQuote.originRaw);
173
+ return this.nameNode.raw + this.equal.raw + this.startQuote.raw + this.valueNode.raw + this.endQuote.raw;
162
174
  }
163
175
  return this.raw;
164
176
  }
177
+ /**
178
+ * Returns a string representation of the attribute.
179
+ *
180
+ * @implements DOM API: `Attr`
181
+ *
182
+ * @param includesSpacesBeforeName - Whether to include spaces before the attribute name.
183
+ * @returns The string representation of the attribute.
184
+ */
185
+ toString(fixed = false) {
186
+ if (!fixed) {
187
+ return this.raw;
188
+ }
189
+ if (this.localName === '#spread') {
190
+ return this.raw;
191
+ }
192
+ const tokens = [this.nameNode?.toString(true) ?? ''];
193
+ if (this.equal && this.equal.toString(true) !== '') {
194
+ tokens.push(this.spacesBeforeEqual?.toString(true) ?? '', this.equal?.toString(true) ?? '', this.spacesAfterEqual?.toString(true) ?? '', this.startQuote?.toString(true) ?? '', this.valueNode?.toString(true) ?? '', this.endQuote?.toString(true) ?? '');
195
+ }
196
+ else if (this.valueNode && this.valueNode.toString(true) !== '') {
197
+ tokens.push(
198
+ //
199
+ '=', this.startQuote?.toString(true) || '"', this.valueNode.toString(true), this.endQuote?.toString(true) || '"');
200
+ }
201
+ return tokens.join('');
202
+ }
165
203
  }
166
204
  _MLAttr_localName = new WeakMap(), _MLAttr_namespaceURI = new WeakMap(), _MLAttr_potentialName = new WeakMap(), _MLAttr_potentialValue = new WeakMap();
@@ -1,9 +1,7 @@
1
1
  import { after, before, remove, replaceWith } from '../manipulations/child-node-methods.js';
2
2
  import { MLNode } from './node.js';
3
3
  export class MLBlock extends MLNode {
4
- constructor(
5
- // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
6
- astNode,
4
+ constructor(astNode,
7
5
  // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
8
6
  document) {
9
7
  super(astNode, document);
@@ -1,8 +1,8 @@
1
1
  import type { MLElement } from './element.js';
2
- import type { MLASTAbstractNode } from '@markuplint/ml-ast';
2
+ import type { MLASTNode } from '@markuplint/ml-ast';
3
3
  import type { PlainData, RuleConfigValue } from '@markuplint/ml-config';
4
4
  import { MLNode } from './node.js';
5
- export declare abstract class MLCharacterData<T extends RuleConfigValue, O extends PlainData = undefined, A extends MLASTAbstractNode = MLASTAbstractNode> extends MLNode<T, O, A> implements CharacterData {
5
+ export declare abstract class MLCharacterData<T extends RuleConfigValue, O extends PlainData = undefined, A extends MLASTNode = MLASTNode> extends MLNode<T, O, A> implements CharacterData {
6
6
  /**
7
7
  * @implements DOM API: `CharacterData`
8
8
  * @see https://dom.spec.whatwg.org/#dom-characterdata-data
@@ -1,6 +1,6 @@
1
1
  import { after, before, nextElementSibling, previousElementSibling, remove, replaceWith, } from '../manipulations/child-node-methods.js';
2
2
  import { MLNode } from './node.js';
3
- import UnexpectedCallError from './unexpected-call-error.js';
3
+ import { UnexpectedCallError } from './unexpected-call-error.js';
4
4
  export class MLCharacterData extends MLNode {
5
5
  /**
6
6
  * @implements DOM API: `CharacterData`
@@ -1,9 +1,9 @@
1
1
  import type { MLBlock } from './block.js';
2
2
  import type { MLCharacterData } from './character-data.js';
3
- import type { MLDocumentType } from './document-type.js';
3
+ import type { MLComment } from './comment.js';
4
4
  import type { MLElement } from './element.js';
5
5
  import type { MLNode } from './node.js';
6
6
  import type { MLText } from './text.js';
7
7
  import type { PlainData, RuleConfigValue } from '@markuplint/ml-config';
8
- export type MLChildNode<T extends RuleConfigValue, O extends PlainData = undefined> = MLDocumentType<T, O> | MLCharacterData<T, O> | MLText<T, O> | MLElement<T, O> | MLBlock<T, O>;
8
+ export type MLChildNode<T extends RuleConfigValue, O extends PlainData = undefined> = MLCharacterData<T, O> | MLComment<T, O> | MLText<T, O> | MLElement<T, O> | MLBlock<T, O>;
9
9
  export declare function isChildNode<T extends RuleConfigValue, O extends PlainData = undefined>(node: MLNode<T, O>): node is MLChildNode<T, O>;
@@ -1,8 +1,8 @@
1
1
  import type { DocumentFragmentNodeType } from './types.js';
2
- import type { MLASTAbstractNode } from '@markuplint/ml-ast';
2
+ import type { MLASTNode } from '@markuplint/ml-ast';
3
3
  import type { PlainData, RuleConfigValue } from '@markuplint/ml-config';
4
4
  import { MLParentNode } from './parent-node.js';
5
- export declare class MLDocumentFragment<T extends RuleConfigValue, O extends PlainData = undefined> extends MLParentNode<T, O, MLASTAbstractNode> implements DocumentFragment {
5
+ export declare class MLDocumentFragment<T extends RuleConfigValue, O extends PlainData = undefined> extends MLParentNode<T, O, MLASTNode> implements DocumentFragment {
6
6
  /**
7
7
  * Returns a string appropriate for the type of node as `DocumentFragment`
8
8
  *
@@ -1,5 +1,5 @@
1
1
  import { MLParentNode } from './parent-node.js';
2
- import UnexpectedCallError from './unexpected-call-error.js';
2
+ import { UnexpectedCallError } from './unexpected-call-error.js';
3
3
  export class MLDocumentFragment extends MLParentNode {
4
4
  /**
5
5
  * Returns a string appropriate for the type of node as `DocumentFragment`
@@ -1,9 +1,7 @@
1
1
  import { after, before, remove, replaceWith } from '../manipulations/child-node-methods.js';
2
2
  import { MLNode } from './node.js';
3
3
  export class MLDocumentType extends MLNode {
4
- constructor(
5
- // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
6
- astNode,
4
+ constructor(astNode,
7
5
  // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
8
6
  document) {
9
7
  super(astNode, document);
@@ -6,7 +6,7 @@ import type { MLNode } from './node.js';
6
6
  import type { MLText } from './text.js';
7
7
  import type { AccessibilityProperties, DocumentNodeType } from './types.js';
8
8
  import type { MLRule } from '../../ml-rule/index.js';
9
- import type Ruleset from '../../ruleset/index.js';
9
+ import type { Ruleset } from '../../ruleset/index.js';
10
10
  import type { MLSchema } from '../../types.js';
11
11
  import type { Walker } from '../helper/walkers.js';
12
12
  import type { MLToken } from '../token/token.js';
@@ -1479,7 +1479,7 @@ export declare class MLDocument<T extends RuleConfigValue, O extends PlainData =
1479
1479
  /**
1480
1480
  * @implements `@markuplint/ml-core` API: `MLDocument`
1481
1481
  */
1482
- getTokenList(): readonly MLToken<import("@markuplint/ml-ast").MLToken>[];
1482
+ getTokenList(): readonly MLToken<import("@markuplint/ml-ast").MLASTToken>[];
1483
1483
  /**
1484
1484
  * **IT THROWS AN ERROR WHEN CALLING THIS.**
1485
1485
  *
@@ -1566,7 +1566,7 @@ export declare class MLDocument<T extends RuleConfigValue, O extends PlainData =
1566
1566
  /**
1567
1567
  * @implements `@markuplint/ml-core` API: `MLDocument`
1568
1568
  */
1569
- searchNodeByLocation(line: number, col: number): MLNode<T, O, import("@markuplint/ml-ast").MLASTAbstractNode> | null;
1569
+ searchNodeByLocation(line: number, col: number): MLNode<T, O, import("@markuplint/ml-ast").MLASTNode> | null;
1570
1570
  /**
1571
1571
  * @implements `@markuplint/ml-core` API: `MLDocument`
1572
1572
  */
@@ -1574,7 +1574,7 @@ export declare class MLDocument<T extends RuleConfigValue, O extends PlainData =
1574
1574
  /**
1575
1575
  * @implements `@markuplint/ml-core` API: `MLDocument`
1576
1576
  */
1577
- toString(): string;
1577
+ toString(fixed?: boolean): string;
1578
1578
  /**
1579
1579
  * @implements `@markuplint/ml-core` API: `MLDocument`
1580
1580
  */
@@ -21,7 +21,7 @@ import { sequentialWalker, syncWalk } from '../helper/walkers.js';
21
21
  import { nodeListToHTMLCollection } from './node-list.js';
22
22
  import { MLParentNode } from './parent-node.js';
23
23
  import { RuleMapper } from './rule-mapper.js';
24
- import UnexpectedCallError from './unexpected-call-error.js';
24
+ import { UnexpectedCallError } from './unexpected-call-error.js';
25
25
  const log = coreLog.extend('ml-dom');
26
26
  const docLog = log.extend('document');
27
27
  const ruleLog = docLog.extend('rule');
@@ -31,9 +31,7 @@ export class MLDocument extends MLParentNode {
31
31
  * @param ast node list of markuplint AST
32
32
  * @param ruleset ruleset object
33
33
  */
34
- constructor(
35
- // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
36
- ast, ruleset, schemas, options) {
34
+ constructor(ast, ruleset, schemas, options) {
37
35
  // @ts-ignore
38
36
  super(ast, null);
39
37
  /**
@@ -2090,12 +2088,18 @@ export class MLDocument extends MLParentNode {
2090
2088
  /**
2091
2089
  * @implements `@markuplint/ml-core` API: `MLDocument`
2092
2090
  */
2093
- toString() {
2094
- const html = [];
2091
+ toString(fixed = false) {
2092
+ if (!fixed) {
2093
+ return this.raw;
2094
+ }
2095
+ let raw = this.raw;
2096
+ let offset = 0;
2095
2097
  for (const node of this.getTokenList()) {
2096
- html.push(node.toString());
2098
+ const nodeRaw = node.toString(true);
2099
+ raw = raw.slice(0, node.startOffset + offset) + nodeRaw + raw.slice(node.endOffset + offset);
2100
+ offset += nodeRaw.length - (node.endOffset - node.startOffset);
2097
2101
  }
2098
- return html.join('');
2102
+ return raw;
2099
2103
  }
2100
2104
  walkOn(type, walker, skipWhenRuleIsDisabled = true) {
2101
2105
  return sequentialWalker(this.nodeList, node => {
@@ -2141,9 +2145,6 @@ export class MLDocument extends MLParentNode {
2141
2145
  if (docLog.enabled) {
2142
2146
  docLog('Pretending: %O', pretenders);
2143
2147
  }
2144
- if (!pretenders) {
2145
- return;
2146
- }
2147
2148
  for (const node of this.nodeList) {
2148
2149
  if (node.is(node.ELEMENT_NODE)) {
2149
2150
  node.pretending(pretenders);
@@ -10,8 +10,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
10
10
  return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
11
11
  };
12
12
  var _MLDomTokenList_origin, _MLDomTokenList_ownerAttrs, _MLDomTokenList_set;
13
- import { getCol, getLine } from '@markuplint/parser-utils';
14
- import UnexpectedCallError from './unexpected-call-error.js';
13
+ import { getCol, getLine } from '@markuplint/parser-utils/location';
14
+ import { UnexpectedCallError } from './unexpected-call-error.js';
15
15
  export class MLDomTokenList extends Array {
16
16
  constructor(tokens,
17
17
  // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
@@ -114,7 +114,7 @@ export class MLDomTokenList extends Array {
114
114
  throw new UnexpectedCallError('Not supported "toggle" method');
115
115
  }
116
116
  _pick(token, _offset = 0) {
117
- token = token.trim().split(/\s+/g)[0] ?? '';
117
+ token = token.trim().split(/\s+/)[0] ?? '';
118
118
  if (!token) {
119
119
  return null;
120
120
  }
@@ -0,0 +1,20 @@
1
+ import type { MLDocument } from './document.js';
2
+ import type { MLElement } from './element.js';
3
+ import type { MLASTElementCloseTag } from '@markuplint/ml-ast';
4
+ import type { PlainData, RuleConfigValue } from '@markuplint/ml-config';
5
+ import { MLNode } from './node.js';
6
+ export declare class MLElementCloseTag<T extends RuleConfigValue, O extends PlainData = undefined> extends MLNode<T, O, MLASTElementCloseTag> {
7
+ readonly pair: MLElement<T, O>;
8
+ constructor(astNode: MLASTElementCloseTag, document: MLDocument<T, O>, pair: MLElement<T, O>);
9
+ /**
10
+ * Returns a string appropriate for the type of node as `MLBlock`
11
+ *
12
+ * @implements `@markuplint/ml-core` API: `MLBlock`
13
+ */
14
+ get nodeName(): string;
15
+ /**
16
+ * @implements `@markuplint/ml-core` API: `MLElement`
17
+ */
18
+ get rawName(): string;
19
+ toString(fixed?: boolean): string;
20
+ }
@@ -0,0 +1,39 @@
1
+ import { MLNode } from './node.js';
2
+ export class MLElementCloseTag extends MLNode {
3
+ constructor(astNode,
4
+ // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
5
+ document,
6
+ // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
7
+ pair) {
8
+ super(astNode, document);
9
+ this.pair = pair;
10
+ }
11
+ /**
12
+ * Returns a string appropriate for the type of node as `MLBlock`
13
+ *
14
+ * @implements `@markuplint/ml-core` API: `MLBlock`
15
+ */
16
+ get nodeName() {
17
+ return this.pair.nodeName;
18
+ }
19
+ /**
20
+ * @implements `@markuplint/ml-core` API: `MLElement`
21
+ */
22
+ get rawName() {
23
+ return this._astToken.nodeName;
24
+ }
25
+ toString(fixed = false) {
26
+ if (!fixed) {
27
+ return this.raw;
28
+ }
29
+ if (this.pair.isOmitted) {
30
+ return this.raw;
31
+ }
32
+ return [
33
+ this.pair.tagOpenChar,
34
+ this.pair.tagOpenChar === '' ? '' : '/',
35
+ this.pair.fixedNodeName === this.pair.rawName ? this.rawName : this.pair.fixedNodeName,
36
+ this.pair.tagCloseChar,
37
+ ].join('');
38
+ }
39
+ }
@@ -8,13 +8,19 @@ import type { ARIAVersion } from '@markuplint/ml-spec';
8
8
  import { MLToken } from '../token/token.js';
9
9
  import { MLAttr } from './attr.js';
10
10
  import { MLDomTokenList } from './dom-token-list.js';
11
+ import { MLElementCloseTag } from './element-close-tag.js';
11
12
  import { MLParentNode } from './parent-node.js';
12
13
  export declare class MLElement<T extends RuleConfigValue, O extends PlainData = undefined> extends MLParentNode<T, O, MLASTElement> implements Element, HTMLOrSVGElement, HTMLElement {
13
14
  #private;
14
- readonly closeTag: MLToken | null;
15
+ readonly closeTag: MLElementCloseTag<T, O> | null;
16
+ /**
17
+ * Element type
18
+ *
19
+ * - `html`: From native HTML Standard
20
+ * - `web-component`: As the Web Component according to HTML Standard
21
+ * - `authored`: Authored element (JSX Element etc.) through the view framework or the template engine.
22
+ */
15
23
  readonly elementType: ElementType;
16
- readonly endSpace: MLToken | null;
17
- readonly hasSpreadAttr: boolean;
18
24
  readonly isForeignElement: boolean;
19
25
  readonly isOmitted: boolean;
20
26
  readonly namespaceURI: NamespaceURI;
@@ -24,6 +30,8 @@ export declare class MLElement<T extends RuleConfigValue, O extends PlainData =
24
30
  readonly ontouchstart?: ((this: GlobalEventHandlers, ev: TouchEvent) => any) | null | undefined;
25
31
  pretenderContext: PretenderContext<MLElement<T, O>, T, O> | null;
26
32
  readonly selfClosingSolidus: MLToken | null;
33
+ readonly tagCloseChar: string;
34
+ readonly tagOpenChar: string;
27
35
  constructor(astNode: MLASTElement, document: MLDocument<T, O>);
28
36
  /**
29
37
  * **IT THROWS AN ERROR WHEN CALLING THIS.**
@@ -469,6 +477,7 @@ export declare class MLElement<T extends RuleConfigValue, O extends PlainData =
469
477
  * @implements `@markuplint/ml-core` API: `MLElement`
470
478
  */
471
479
  get fixedNodeName(): string;
480
+ get hasSpreadAttr(): boolean;
472
481
  /**
473
482
  * **IT THROWS AN ERROR WHEN CALLING THIS.**
474
483
  *
@@ -1398,7 +1407,6 @@ export declare class MLElement<T extends RuleConfigValue, O extends PlainData =
1398
1407
  * @see https://dom.spec.whatwg.org/#ref-for-dom-nondocumenttypechildnode-previouselementsibling%E2%91%A1
1399
1408
  */
1400
1409
  get previousElementSibling(): MLElement<T, O> | null;
1401
- get raw(): string;
1402
1410
  /**
1403
1411
  * @implements `@markuplint/ml-core` API: `MLElement`
1404
1412
  */
@@ -1781,7 +1789,7 @@ export declare class MLElement<T extends RuleConfigValue, O extends PlainData =
1781
1789
  /**
1782
1790
  * Pretenders Initialization
1783
1791
  */
1784
- pretending(pretenders: readonly Pretender[]): void;
1792
+ pretending(pretenders?: readonly Pretender[]): void;
1785
1793
  /**
1786
1794
  * **IT THROWS AN ERROR WHEN CALLING THIS.**
1787
1795
  *
@@ -1925,7 +1933,7 @@ export declare class MLElement<T extends RuleConfigValue, O extends PlainData =
1925
1933
  /**
1926
1934
  * @implements `@markuplint/ml-core` API: `MLElement`
1927
1935
  */
1928
- toString(): string;
1936
+ toString(fixed?: boolean): string;
1929
1937
  /**
1930
1938
  * **IT THROWS AN ERROR WHEN CALLING THIS.**
1931
1939
  *