@markuplint/ml-core 3.0.0-rc.1 → 3.0.0-rc.2

package/lib/ml-rule/ml-rule.js

@@ -44,7 +44,7 @@ class MLRule {
                 disabled: !configSettings,
                 severity: this.defaultSeverity,
                 value: this.defaultValue,
-                option: this.defaultOptions,
+                options: this.defaultOptions,
                 reason: undefined,
             };
         }
@@ -53,8 +53,8 @@ class MLRule {
                 disabled: false,
                 severity: configSettings.severity || this.defaultSeverity,
                 value: configSettings.value !== undefined ? configSettings.value : this.defaultValue,
-                option: Array.isArray(this.defaultOptions)
-                    ? configSettings.option
+                options: Array.isArray(this.defaultOptions)
+                    ? configSettings.options
                         ? // prettier-ignore
                             // @ts-ignore for "as" casting
                             this.defaultOptions.concat(configSettings.option)
@@ -62,18 +62,17 @@ class MLRule {
                     : this.defaultOptions !== null &&
                         typeof this.defaultOptions === 'object' &&
                         // for example `configSettings.option === true`
-                        (configSettings.option == null || typeof configSettings.option === 'object')
-                        ? { ...this.defaultOptions, ...(configSettings.option || {}) }
-                        : configSettings.option || this.defaultOptions,
+                        (configSettings.options == null || typeof configSettings.options === 'object')
+                        ? { ...this.defaultOptions, ...(configSettings.options || {}) }
+                        : configSettings.options || this.defaultOptions,
                 reason: configSettings.reason,
             };
         }
         return {
             disabled: false,
             severity: this.defaultSeverity,
-            // @ts-ignore TODO: Wait for fix to bug of type guards in TypeScript
             value: configSettings == null ? this.defaultValue : configSettings,
-            option: this.defaultOptions,
+            options: this.defaultOptions,
             reason: undefined,
         };
     }

package/lib/ml-rule/types.d.ts

@@ -3,24 +3,18 @@ import type { MLRuleContext } from './ml-rule-context';
 import type { Translator } from '@markuplint/i18n';
 import type { Report, RuleConfigValue, Severity } from '@markuplint/ml-config';
 export type RuleSeed<T extends RuleConfigValue = boolean, O = null> = {
-	defaultSeverity?: Severity;
-	defaultValue?: T;
-	defaultOptions?: O;
-	verify(context: ReturnType<MLRuleContext<T, O>['provide']>): void | Promise<void>;
-	fix?(context: ReturnType<MLRuleContext<T, O>['provide']>): void | Promise<void>;
+    defaultSeverity?: Severity;
+    defaultValue?: T;
+    defaultOptions?: O;
+    verify(context: ReturnType<MLRuleContext<T, O>['provide']>): void | Promise<void>;
+    fix?(context: ReturnType<MLRuleContext<T, O>['provide']>): void | Promise<void>;
 };
-export type Checker<T extends RuleConfigValue, O = null, P extends Record<string, unknown> = {}> = (
-	params: P,
-) => CheckerReport<T, O>;
-export type ElementChecker<T extends RuleConfigValue, O = null, P extends Record<string, unknown> = {}> = (
-	params: P & {
-		el: Element<T, O>;
-	},
-) => CheckerReport<T, O>;
-export type AttrChecker<T extends RuleConfigValue, O = null, P extends Record<string, unknown> = {}> = (
-	params: P & {
-		attr: Attr<T, O>;
-	},
-) => CheckerReport<T, O>;
+export type Checker<T extends RuleConfigValue, O = null, P extends Record<string, unknown> = {}> = (params: P) => CheckerReport<T, O>;
+export type ElementChecker<T extends RuleConfigValue, O = null, P extends Record<string, unknown> = {}> = (params: P & {
+    el: Element<T, O>;
+}) => CheckerReport<T, O>;
+export type AttrChecker<T extends RuleConfigValue, O = null, P extends Record<string, unknown> = {}> = (params: P & {
+    attr: Attr<T, O>;
+}) => CheckerReport<T, O>;
 export type CheckerReport<T extends RuleConfigValue, O = null> = (t: Translator) => Report<T, O> | undefined | null;
 export type AnyRuleSeed = RuleSeed<any, any>;

package/lib/plugin/types.d.ts

@@ -1,12 +1,12 @@
 import type { AnyRuleSeed } from '../ml-rule';
 import type { Config } from '@markuplint/ml-config';
 export type Plugin = {
-	name: string;
-	rules?: Record<string, AnyRuleSeed>;
-	configs?: Record<string, Config>;
+    name: string;
+    rules?: Record<string, AnyRuleSeed>;
+    configs?: Record<string, Config>;
 };
 export type PluginCreator<S extends CreatePluginSettings> = {
-	name: string;
-	create(setting: S): Omit<Plugin, 'name'>;
+    name: string;
+    create(setting: S): Omit<Plugin, 'name'>;
 };
 export type CreatePluginSettings = Record<string, unknown>;

package/lib/ruleset/index.d.ts

@@ -1,7 +1,7 @@
 import type { ChildNodeRule, Config, NodeRule, Rules } from '@markuplint/ml-config';
 export default class Ruleset {
-	readonly childNodeRules: ReadonlyArray<ChildNodeRule>;
-	readonly nodeRules: ReadonlyArray<NodeRule>;
-	readonly rules: Readonly<Rules>;
-	constructor(config: Config);
+    readonly childNodeRules: ReadonlyArray<ChildNodeRule>;
+    readonly nodeRules: ReadonlyArray<NodeRule>;
+    readonly rules: Readonly<Rules>;
+    constructor(config: Config);
 }

package/lib/test/index.d.ts

@@ -3,26 +3,14 @@ import type { Config, RuleConfigValue } from '@markuplint/ml-config';
 import type { ExtendedSpec, MLMLSpec } from '@markuplint/ml-spec';
 import { Document } from '../ml-dom';
 export type CreateTestOptions = {
-	config?: Config;
-	parser?: MLMarkupLanguageParser;
-	specs?: MLMLSpec;
+    config?: Config;
+    parser?: MLMarkupLanguageParser;
+    specs?: MLMLSpec;
 };
-export declare function createTestDocument<T extends RuleConfigValue = any, O = any>(
-	sourceCode: string,
-	options?: CreateTestOptions,
-): Document<T, O>;
-export declare function createTestNodeList(
-	sourceCode: string,
-	options?: CreateTestOptions,
-): readonly import('../ml-dom/node/node').MLNode<any, any, import('@markuplint/ml-ast').MLASTAbstractNode>[];
-export declare function createTestTokenList(
-	sourceCode: string,
-	options?: CreateTestOptions,
-): readonly import('../ml-dom/token/token').MLToken<import('@markuplint/ml-ast').MLToken>[];
-export declare function createTestElement(
-	sourceCode: string,
-	options?: CreateTestOptions,
-): import('../ml-dom').Element<any, any>;
+export declare function createTestDocument<T extends RuleConfigValue = any, O = any>(sourceCode: string, options?: CreateTestOptions): Document<T, O>;
+export declare function createTestNodeList(sourceCode: string, options?: CreateTestOptions): readonly import("../ml-dom/node/node").MLNode<any, any, import("@markuplint/ml-ast").MLASTAbstractNode>[];
+export declare function createTestTokenList(sourceCode: string, options?: CreateTestOptions): readonly import("../ml-dom/token/token").MLToken<import("@markuplint/ml-ast").MLToken>[];
+export declare function createTestElement(sourceCode: string, options?: CreateTestOptions): import("../ml-dom").Element<any, any>;
 /**
  * for test suite
  */

package/lib/types.d.ts

@@ -6,11 +6,11 @@ import type { Pretender } from '@markuplint/ml-config';
 import type { ExtendedSpec, MLMLSpec } from '@markuplint/ml-spec';
 export type MLSchema = Readonly<[MLMLSpec, ...ExtendedSpec[]]>;
 export type MLFabric = {
-	parser: MLMarkupLanguageParser;
-	ruleset: Partial<Ruleset>;
-	rules: AnyMLRule[];
-	locale: LocaleSet;
-	schemas: MLSchema;
-	parserOptions: ParserOptions;
-	pretenders: Pretender[];
+    parser: MLMarkupLanguageParser;
+    ruleset: Partial<Ruleset>;
+    rules: AnyMLRule[];
+    locale: LocaleSet;
+    schemas: MLSchema;
+    parserOptions: ParserOptions;
+    pretenders: Pretender[];
 };

package/lib/utils/get-location-from-chars.d.ts

@@ -1,12 +1,7 @@
 interface Location {
-	line: number;
-	col: number;
-	raw: string;
+    line: number;
+    col: number;
+    raw: string;
 }
-export declare function getLocationFromChars(
-	searches: string[],
-	text: string,
-	currentLine: number,
-	currentCol: number,
-): Location[];
+export declare function getLocationFromChars(searches: string[], text: string, currentLine: number, currentCol: number): Location[];
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/ml-core",
-	"version": "3.0.0-rc.1",
+	"version": "3.0.0-rc.2",
 	"description": "The core module of markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -17,19 +17,19 @@
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@markuplint/config-presets": "3.0.0-rc.1",
-		"@markuplint/i18n": "3.0.0-rc.1",
-		"@markuplint/ml-ast": "3.0.0-rc.1",
-		"@markuplint/ml-config": "3.0.0-rc.1",
-		"@markuplint/ml-spec": "3.0.0-rc.1",
-		"@markuplint/parser-utils": "3.0.0-rc.1",
-		"@markuplint/selector": "3.0.0-rc.1",
+		"@markuplint/config-presets": "3.0.0-rc.2",
+		"@markuplint/i18n": "3.0.0-rc.2",
+		"@markuplint/ml-ast": "3.0.0-rc.2",
+		"@markuplint/ml-config": "3.0.0-rc.2",
+		"@markuplint/ml-spec": "3.0.0-rc.2",
+		"@markuplint/parser-utils": "3.0.0-rc.2",
+		"@markuplint/selector": "3.0.0-rc.2",
 		"debug": "^4.3.4",
 		"tslib": "^2.4.1"
 	},
 	"devDependencies": {
-		"@markuplint/html-parser": "3.0.0-rc.1",
+		"@markuplint/html-parser": "3.0.0-rc.2",
 		"@types/debug": "^4.1.7"
 	},
-	"gitHead": "f0d1cd3216c171949c6e6be0d4388a760bd5d37b"
+	"gitHead": "27a5c8d136f4b0cf8452552cff529dd0a4db6bba"
 }