@markuplint/rules 3.12.0 → 4.0.0-alpha.1

package/lib/permitted-contents/matches-selector.js

@@ -1,13 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.matchesSelector = void 0;
-const ml_spec_1 = require("@markuplint/ml-spec");
-const debug_1 = require("./debug");
-const utils_1 = require("./utils");
-function matchesSelector(query, 
+import { contentModelCategoryToTagNames } from '@markuplint/ml-spec';
+import { cmLog } from './debug.js';
+import { cleanObject, matches } from './utils.js';
+export function matchesSelector(query, 
 // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
 node, specs, depth) {
-    const nodeLog = debug_1.cmLog.extend(`node#${depth}`);
+    const nodeLog = cmLog.extend(`node#${depth}`);
     const { selector, hasText, hasCustom } = optCondition(query, specs);
     if (node == null) {
         if (hasText) {
@@ -86,7 +83,7 @@ node, specs, depth) {
                 hint: {},
             };
         }
-        const result = (0, utils_1.matches)(selector, node, specs);
+        const result = matches(selector, node, specs);
         nodeLog('%s.matches(%s) => %s', node.raw, query, result.matched);
         if (result.matched) {
             return {
@@ -105,7 +102,7 @@ node, specs, depth) {
                 unmatched: [node],
                 zeroMatch: true,
                 query,
-                hint: (0, utils_1.cleanObject)({
+                hint: cleanObject({
                     not: result.not,
                 }),
             };
@@ -116,7 +113,7 @@ node, specs, depth) {
             unmatched: [node],
             zeroMatch: false,
             query,
-            hint: (0, utils_1.cleanObject)({
+            hint: cleanObject({
                 not: result.not,
             }),
         };
@@ -130,7 +127,6 @@ node, specs, depth) {
         hint: {},
     };
 }
-exports.matchesSelector = matchesSelector;
 const conditionWithoutSpecs = {
     '#custom': {
         selector: '#custom',
@@ -145,12 +141,11 @@ const conditionWithoutSpecs = {
 };
 const optConditionSpecsBaseCaches = new Map();
 function optCondition(query, specs) {
-    var _a;
     const condWithoutSpecs = conditionWithoutSpecs[query];
     if (condWithoutSpecs) {
         return condWithoutSpecs;
     }
-    const queryCaches = (_a = optConditionSpecsBaseCaches.get(specs)) !== null && _a !== void 0 ? _a : new Map();
+    const queryCaches = optConditionSpecsBaseCaches.get(specs) ?? new Map();
     const cached = queryCaches.get(query);
     if (cached) {
         return cached;
@@ -158,9 +153,9 @@ function optCondition(query, specs) {
     let hasCustom = false;
     let hasText = false;
     const selector = query.replace(/^(?::model\(([^)]+)\)|#([a-z-]+))(.*)$/, (_, $model, _model, $last) => {
-        const _selectors = (0, ml_spec_1.contentModelCategoryToTagNames)(`#${$model !== null && $model !== void 0 ? $model : _model}`, specs.def);
+        const _selectors = contentModelCategoryToTagNames(`#${$model ?? _model}`, specs.def);
         if (_selectors.length === 0) {
-            throw new Error(`${$model !== null && $model !== void 0 ? $model : _model} is empty`);
+            throw new Error(`${$model ?? _model} is empty`);
         }
         const selectors = [];
         for (const selector of _selectors) {
@@ -174,7 +169,7 @@ function optCondition(query, specs) {
             }
             selectors.push(selector);
         }
-        return `:is(${selectors.join(',')})${$last !== null && $last !== void 0 ? $last : ''}`;
+        return `:is(${selectors.join(',')})${$last ?? ''}`;
     });
     const result = {
         selector,

package/lib/permitted-contents/order.d.ts

@@ -1,4 +1,4 @@
-import type { ChildNode, Options, Result, Specs } from './types';
+import type { ChildNode, Options, Result, Specs } from './types.js';
 import type { PermittedContentPattern } from '@markuplint/ml-spec';
 import type { ReadonlyDeep } from 'type-fest';
 /**

package/lib/permitted-contents/order.js

@@ -1,10 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.order = void 0;
-const helpers_1 = require("../helpers");
-const complex_branch_1 = require("./complex-branch");
-const debug_1 = require("./debug");
-const utils_1 = require("./utils");
+import { deepCopy } from '../helpers.js';
+import { complexBranch } from './complex-branch.js';
+import { cmLog } from './debug.js';
+import { Collection, mergeHints, modelLog } from './utils.js';
 /**
  * Check ordered array
  *
@@ -15,22 +12,21 @@ const utils_1 = require("./utils");
  * @param depth
  * @returns
  */
-function order(contents, 
+export function order(contents, 
 // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
 nodes, specs, options, depth) {
-    var _a, _b, _c, _d, _e;
-    const orderLog = debug_1.cmLog.extend(`order#${depth}`);
-    const btLog = debug_1.cmLog.extend(`backtrack#${depth}`);
-    const patterns = (0, helpers_1.deepCopy)(contents);
-    const collection = new utils_1.Collection(nodes);
-    orderLog('Model:\n  RegEx: %s\n  Schema: %o', (0, utils_1.modelLog)(patterns, ''), patterns);
+    const orderLog = cmLog.extend(`order#${depth}`);
+    const btLog = cmLog.extend(`backtrack#${depth}`);
+    const patterns = deepCopy(contents);
+    const collection = new Collection(nodes);
+    orderLog('Model:\n  RegEx: %s\n  Schema: %o', modelLog(patterns, ''), patterns);
     orderLog('Starts: %s', collection);
     let result = undefined;
     let backtrackMode = false;
     let afterBacktrack = false;
     const unmatchedResults = [];
     while (patterns.length > 0 && patterns[0]) {
-        result = (0, complex_branch_1.complexBranch)(patterns[0], collection.unmatched, specs, options, depth);
+        result = complexBranch(patterns[0], collection.unmatched, specs, options, depth);
         collection.addMatched(result.matched);
         if (result.type !== 'UNEXPECTED_EXTRA_NODE' && result.type !== 'MATCHED' && result.type !== 'MATCHED_ZERO') {
             unmatchedResults.push(result);
@@ -45,7 +41,7 @@ nodes, specs, options, depth) {
             if (!barelyMatchedResult) {
                 throw new Error('Unreachable code');
             }
-            orderLog('Result (%s): %s%s', result.type, collection.toString(true), ((_a = barelyMatchedResult.hint.missing) === null || _a === void 0 ? void 0 : _a.barelyMatchedElements) != null
+            orderLog('Result (%s): %s%s', result.type, collection.toString(true), barelyMatchedResult.hint.missing?.barelyMatchedElements != null
                 ? `; But ${barelyMatchedResult.hint.missing.barelyMatchedElements} elements hit out of pattern`
                 : '');
             return {
@@ -54,7 +50,7 @@ nodes, specs, options, depth) {
                 unmatched: collection.unmatched,
                 zeroMatch: barelyMatchedResult.zeroMatch,
                 query: barelyMatchedResult.query,
-                hint: (0, utils_1.mergeHints)(barelyMatchedResult.hint, {
+                hint: mergeHints(barelyMatchedResult.hint, {
                     missing: {
                         barelyMatchedElements: collection.matched.length,
                         need: barelyMatchedResult.query,
@@ -81,8 +77,8 @@ nodes, specs, options, depth) {
             matched: collection.matched,
             unmatched: collection.unmatched,
             zeroMatch: false,
-            query: (_b = result === null || result === void 0 ? void 0 : result.query) !== null && _b !== void 0 ? _b : 'N/A',
-            hint: (_c = result === null || result === void 0 ? void 0 : result.hint) !== null && _c !== void 0 ? _c : {},
+            query: result?.query ?? 'N/A',
+            hint: result?.hint ?? {},
         };
     }
     const resultType = collection.matched.length > 0 ? 'MATCHED' : 'MATCHED_ZERO';
@@ -92,8 +88,7 @@ nodes, specs, options, depth) {
         matched: collection.matched,
         unmatched: collection.unmatched,
         zeroMatch: false,
-        query: (_d = result === null || result === void 0 ? void 0 : result.query) !== null && _d !== void 0 ? _d : 'N/A',
-        hint: (_e = result === null || result === void 0 ? void 0 : result.hint) !== null && _e !== void 0 ? _e : {},
+        query: result?.query ?? 'N/A',
+        hint: result?.hint ?? {},
     };
 }
-exports.order = order;

package/lib/permitted-contents/recursive-branch.d.ts

@@ -1,5 +1,5 @@
-import type { SelectorResult } from './matches-selector';
-import type { ChildNode, Options, Specs } from './types';
+import type { SelectorResult } from './matches-selector.js';
+import type { ChildNode, Options, Specs } from './types.js';
 import type { PermittedContentPattern, Model } from '@markuplint/ml-spec';
 import type { ReadonlyDeep } from 'type-fest';
 export declare function recursiveBranch(model: ReadonlyDeep<Model | PermittedContentPattern[]>, nodes: readonly ChildNode[], specs: Specs, options: Options, depth: number): SelectorResult;

package/lib/permitted-contents/recursive-branch.js

@@ -1,22 +1,19 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.recursiveBranch = void 0;
-const matches_selector_1 = require("./matches-selector");
-const order_1 = require("./order");
-const utils_1 = require("./utils");
-function recursiveBranch(model, 
+import { matchesSelector } from './matches-selector.js';
+import { order } from './order.js';
+import { Collection, isModel } from './utils.js';
+export function recursiveBranch(model, 
 // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
 nodes, specs, options, depth) {
-    if (!(0, utils_1.isModel)(model)) {
-        return (0, order_1.order)(model, nodes, specs, options, depth + 1);
+    if (!isModel(model)) {
+        return order(model, nodes, specs, options, depth + 1);
     }
     if (typeof model === 'string') {
-        return (0, matches_selector_1.matchesSelector)(model, nodes[0], specs, depth);
+        return matchesSelector(model, nodes[0], specs, depth);
     }
-    const collection = new utils_1.Collection(nodes);
+    const collection = new Collection(nodes);
     let lastUnmatched = null;
     for (const query of model) {
-        const result = (0, matches_selector_1.matchesSelector)(query, collection.unmatched[0], specs, depth);
+        const result = matchesSelector(query, collection.unmatched[0], specs, depth);
         collection.addMatched(result.matched);
         if (result.type === 'MATCHED' || result.type === 'MATCHED_ZERO') {
             return {
@@ -42,4 +39,3 @@ nodes, specs, options, depth) {
     }
     return lastUnmatched;
 }
-exports.recursiveBranch = recursiveBranch;

package/lib/permitted-contents/represent-transparent-nodes.d.ts

@@ -1,4 +1,4 @@
-import type { ChildNode, Options, Result, Specs } from './types';
+import type { ChildNode, Options, Result, Specs } from './types.js';
 export declare const transparentMode: Map<ChildNode, true>;
 export declare function representTransparentNodes(nodes: ChildNode[], specs: Specs, options: Options): {
     nodes: ChildNode[];

package/lib/permitted-contents/represent-transparent-nodes.js

@@ -1,17 +1,13 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.representTransparentNodes = exports.transparentMode = void 0;
-const ml_spec_1 = require("@markuplint/ml-spec");
-const order_1 = require("./order");
-const utils_1 = require("./utils");
-exports.transparentMode = new Map();
-function representTransparentNodes(
+import { getContentModel } from '@markuplint/ml-spec';
+import { order } from './order.js';
+import { Collection, getChildNodesWithoutWhitespaces, isTransparent, matches } from './utils.js';
+export const transparentMode = new Map();
+export function representTransparentNodes(
 // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
 nodes, specs, options) {
-    var _a;
     const result = [];
     const errors = [];
-    const parent = (_a = nodes[0]) === null || _a === void 0 ? void 0 : _a.parentElement;
+    const parent = nodes[0]?.parentElement;
     if (parent) {
         const { errors: parentErrors } = representTransparentNodes([parent], specs, options);
         errors.push(...parentErrors);
@@ -21,37 +17,37 @@ nodes, specs, options) {
             result.push(node);
             continue;
         }
-        const models = (0, ml_spec_1.getContentModel)(node, specs.specs);
+        const models = getContentModel(node, specs.specs);
         if (models == null || typeof models === 'boolean') {
             result.push(node);
             continue;
         }
-        const noTransparentModels = models.filter(m => !(0, utils_1.isTransparent)(m));
+        const noTransparentModels = models.filter(m => !isTransparent(m));
         if (noTransparentModels.length === models.length) {
             result.push(node);
             continue;
         }
-        const collection = new utils_1.Collection((0, utils_1.getChildNodesWithoutWhitespaces)(node));
+        const collection = new Collection(getChildNodesWithoutWhitespaces(node));
         let unmatched;
         if (noTransparentModels.length > 0) {
-            const result = (0, order_1.order)(noTransparentModels, collection.unmatched, specs, options, Infinity);
+            const result = order(noTransparentModels, collection.unmatched, specs, options, Infinity);
             unmatched = result.unmatched;
         }
         else {
             unmatched = collection.unmatched;
         }
-        const transparent = models.find(m => (0, utils_1.isTransparent)(m));
-        if (!transparent || !(0, utils_1.isTransparent)(transparent)) {
+        const transparent = models.find(m => isTransparent(m));
+        if (!transparent || !isTransparent(transparent)) {
             throw new Error('Unreachable code');
         }
         for (const _child of unmatched) {
             const child = _child;
-            if (exports.transparentMode.has(child)) {
+            if (transparentMode.has(child)) {
                 continue;
             }
-            exports.transparentMode.set(child, true);
+            transparentMode.set(child, true);
             if (child.is(child.ELEMENT_NODE)) {
-                const transparentCondMatched = (0, utils_1.matches)(transparent.transparent, child, specs);
+                const transparentCondMatched = matches(transparent.transparent, child, specs);
                 if (!transparentCondMatched.matched) {
                     errors.push({
                         type: 'TRANSPARENT_MODEL_DISALLOWS',
@@ -75,4 +71,3 @@ nodes, specs, options) {
         errors,
     };
 }
-exports.representTransparentNodes = representTransparentNodes;

package/lib/permitted-contents/start.d.ts

@@ -1,4 +1,4 @@
-import type { ContentModelResult, Element, Options, Specs } from './types';
+import type { ContentModelResult, Element, Options, Specs } from './types.js';
 import type { ContentModel } from '@markuplint/ml-spec';
 import type { ReadonlyDeep } from 'type-fest';
 /**

package/lib/permitted-contents/start.js

@@ -1,9 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.start = void 0;
-const order_1 = require("./order");
-const represent_transparent_nodes_1 = require("./represent-transparent-nodes");
-const utils_1 = require("./utils");
+import { order } from './order.js';
+import { representTransparentNodes } from './represent-transparent-nodes.js';
+import { getChildNodesWithoutWhitespaces } from './utils.js';
 /**
  * Check start
  *
@@ -13,10 +10,9 @@ const utils_1 = require("./utils");
  * @param options
  * @returns
  */
-function start(contents, 
+export function start(contents, 
 // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
 el, specs, options) {
-    var _a;
     if (contents === false) {
         if (el.childNodes.length > 0) {
             return [
@@ -48,26 +44,22 @@ el, specs, options) {
             },
         ];
     }
-    const { nodes, errors } = (0, represent_transparent_nodes_1.representTransparentNodes)((0, utils_1.getChildNodesWithoutWhitespaces)(el), specs, options);
-    const result = (0, order_1.order)(contents, nodes, specs, options, 0);
+    const { nodes, errors } = representTransparentNodes(getChildNodesWithoutWhitespaces(el), specs, options);
+    const result = order(contents, nodes, specs, options, 0);
     return [
         {
             type: result.type,
             scope: result.type === 'MISSING_NODE_REQUIRED' || result.type === 'MISSING_NODE_ONE_OR_MORE'
                 ? el
-                : (_a = result.unmatched[0]) !== null && _a !== void 0 ? _a : el,
+                : result.unmatched[0] ?? el,
             query: result.query,
             hint: result.hint,
         },
-        ...errors.map(error => {
-            var _a;
-            return ({
-                type: error.type,
-                scope: (_a = error.unmatched[0]) !== null && _a !== void 0 ? _a : el,
-                query: error.query,
-                hint: error.hint,
-            });
-        }),
+        ...errors.map(error => ({
+            type: error.type,
+            scope: error.unmatched[0] ?? el,
+            query: error.query,
+            hint: error.hint,
+        })),
     ];
 }
-exports.start = start;

package/lib/permitted-contents/transparent.d.ts

@@ -1,2 +1,2 @@
-import type { ChildNode, Result } from './types';
+import type { ChildNode, Result } from './types.js';
 export declare function transparent(nodes: readonly ChildNode[]): Result;

package/lib/permitted-contents/transparent.js

@@ -1,13 +1,9 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.transparent = void 0;
-const debug_1 = require("./debug");
-const transparentLog = debug_1.cmLog.extend('transparent');
-function transparent(
+import { cmLog } from './debug.js';
+const transparentLog = cmLog.extend('transparent');
+export function transparent(
 // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
 nodes) {
-    var _a, _b;
-    if (nodes.length === 0 || ((_b = (_a = nodes[0]) === null || _a === void 0 ? void 0 : _a.parentElement) === null || _b === void 0 ? void 0 : _b.parentElement)) {
+    if (nodes.length === 0 || nodes[0]?.parentElement?.parentElement) {
         transparentLog('Skipped');
         return {
             type: nodes.length === 0 ? 'MATCHED_ZERO' : 'MATCHED',
@@ -28,4 +24,3 @@ nodes) {
         hint: {},
     };
 }
-exports.transparent = transparent;

package/lib/permitted-contents/types.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/lib/permitted-contents/utils.d.ts

@@ -1,4 +1,4 @@
-import type { ChildNode, Element, Hints, MissingNodeReason, RepeatSign, Specs } from './types';
+import type { ChildNode, Element, Hints, MissingNodeReason, RepeatSign, Specs } from './types.js';
 import type { PermittedContentPattern, PermittedContentChoice, PermittedContentOneOrMore, PermittedContentOptional, PermittedContentRequire, PermittedContentTransparent, PermittedContentZeroOrMore, Model } from '@markuplint/ml-spec';
 import type { ReadonlyDeep } from 'type-fest';
 export declare function getChildNodesWithoutWhitespaces(el: Element): ChildNode[];