@markuplint/ml-config 3.5.0 → 3.6.0

package/lib/merge-config.d.ts

@@ -1,3 +1,4 @@
-import type { Config, Nullable, AnyRule, AnyRuleV2 } from './types';
+import type { Config, AnyRule, AnyRuleV2 } from './types';
+import type { Nullable } from '@markuplint/shared';
 export declare function mergeConfig(a: Config, b: Config): Config;
 export declare function mergeRule(a: Nullable<AnyRule | AnyRuleV2>, b: AnyRule | AnyRuleV2): AnyRule;

package/lib/merge-config.js

@@ -70,10 +70,10 @@ function mergeRule(a, b) {
 exports.mergeRule = mergeRule;
 function mergeObject(a, b) {
     if (a == null) {
-        return b || undefined;
+        return b !== null && b !== void 0 ? b : undefined;
     }
     if (b == null) {
-        return a || undefined;
+        return a !== null && a !== void 0 ? a : undefined;
     }
     const res = (0, deepmerge_1.default)(a, b);
     (0, utils_1.deleteUndefProp)(res);
@@ -135,7 +135,7 @@ function mergeRules(a, b) {
         return b && optimizeRules(b);
     }
     if (b == null) {
-        return a && optimizeRules(a);
+        return optimizeRules(a);
     }
     const res = optimizeRules(a);
     for (const [key, rule] of Object.entries(b)) {

package/lib/types.d.ts

@@ -1,187 +1,203 @@
 import type { ParserOptions } from '@markuplint/ml-ast';
 import type { RegexSelector } from '@markuplint/selector';
+import type { Nullable } from '@markuplint/shared';
 export type { RegexSelector } from '@markuplint/selector';
 export type Config = {
-    readonly $schema?: string;
-    readonly extends?: string | readonly string[];
-    readonly plugins?: readonly (PluginConfig | string)[];
-    readonly parser?: ParserConfig;
-    readonly parserOptions?: ParserOptions;
-    readonly specs?: SpecConfig;
-    readonly excludeFiles?: readonly string[];
-    readonly pretenders?: readonly Pretender[];
-    readonly rules?: Rules;
-    readonly nodeRules?: readonly NodeRule[];
-    readonly childNodeRules?: readonly ChildNodeRule[];
-    readonly overrides?: Readonly<Record<string, OverrideConfig>>;
+	readonly $schema?: string;
+	readonly extends?: string | readonly string[];
+	readonly plugins?: readonly (PluginConfig | string)[];
+	readonly parser?: ParserConfig;
+	readonly parserOptions?: ParserOptions;
+	readonly specs?: SpecConfig;
+	readonly excludeFiles?: readonly string[];
+	readonly pretenders?: readonly Pretender[];
+	readonly rules?: Rules;
+	readonly nodeRules?: readonly NodeRule[];
+	readonly childNodeRules?: readonly ChildNodeRule[];
+	readonly overrides?: Readonly<Record<string, OverrideConfig>>;
 };
 export type PrimitiveScalar = string | number | boolean;
-export type PlainData = Nullable<PrimitiveScalar> | readonly PlainData[] | {
-    readonly [key: string]: PlainData | any;
-};
-export type NonNullablePlainData = PrimitiveScalar | readonly NonNullablePlainData[] | {
-    readonly [key: string]: NonNullablePlainData;
-};
+export type PlainData =
+	| Nullable<PrimitiveScalar>
+	| readonly PlainData[]
+	| {
+			readonly [key: string]: PlainData | any;
+	  };
+export type NonNullablePlainData =
+	| PrimitiveScalar
+	| readonly NonNullablePlainData[]
+	| {
+			readonly [key: string]: NonNullablePlainData;
+	  };
 export type OverrideConfig = Omit<Config, '$schema' | 'extends' | 'overrides'>;
 export type PluginConfig = {
-    readonly name: string;
-    readonly settings: Readonly<Record<string, NonNullablePlainData>>;
+	readonly name: string;
+	readonly settings: Readonly<Record<string, NonNullablePlainData>>;
 };
 export type ParserConfig = {
-    readonly [extensionPattern: string]: string;
+	readonly [extensionPattern: string]: string;
 };
 export type SpecConfig = {
-    readonly [extensionPattern: string]: string;
+	readonly [extensionPattern: string]: string;
 };
 export type Pretender = {
-    /**
-     * Target node selectors
-     */
-    readonly selector: string;
-    /**
-     * If it is a string, it is resolved as an element name.
-     * An element has the same attributes as the pretended custom element
-     * because attributes are just inherited.
-     *
-     * If it is an Object, It creates the element by that.
-     */
-    readonly as: string | OriginalNode;
+	/**
+	 * Target node selectors
+	 */
+	readonly selector: string;
+	/**
+	 * If it is a string, it is resolved as an element name.
+	 * An element has the same attributes as the pretended custom element
+	 * because attributes are just inherited.
+	 *
+	 * If it is an Object, It creates the element by that.
+	 */
+	readonly as: string | OriginalNode;
 };
 export type OriginalNode = {
-    /**
-     * Element name
-     */
-    readonly element: string;
-    /**
-     * Namespace
-     *
-     * Supports `"svg"` and `undefined` only.
-     * If it is `undefined`, the namespace is HTML.
-     */
-    readonly namespace?: 'svg';
-    /**
-     * Attributes
-     */
-    readonly attrs?: readonly {
-        /**
-         * Attribute name
-         */
-        readonly name: string;
-        /**
-         * If it omits this property, the attribute is resolved as a boolean.
-         */
-        readonly value?: string | {
-            readonly fromAttr: string;
-        };
-    }[];
-    /**
-     * To have attributes the defined element has.
-     */
-    readonly inheritAttrs?: boolean;
-    /**
-     * ARIA properties
-     */
-    readonly aria?: PretenderARIA;
+	/**
+	 * Element name
+	 */
+	readonly element: string;
+	/**
+	 * Namespace
+	 *
+	 * Supports `"svg"` and `undefined` only.
+	 * If it is `undefined`, the namespace is HTML.
+	 */
+	readonly namespace?: 'svg';
+	/**
+	 * Attributes
+	 */
+	readonly attrs?: readonly {
+		/**
+		 * Attribute name
+		 */
+		readonly name: string;
+		/**
+		 * If it omits this property, the attribute is resolved as a boolean.
+		 */
+		readonly value?:
+			| string
+			| {
+					readonly fromAttr: string;
+			  };
+	}[];
+	/**
+	 * To have attributes the defined element has.
+	 */
+	readonly inheritAttrs?: boolean;
+	/**
+	 * ARIA properties
+	 */
+	readonly aria?: PretenderARIA;
 };
 /**
  * Pretender Node ARIA properties
  */
 export type PretenderARIA = {
-    /**
-     * Accessible name
-     *
-     * - If it is `true`, it assumes the element has any text on its accessible name.
-     * - If it specifies `fromAttr` property, it assumes the accessible name refers to the value of the attribute.
-     */
-    readonly name?: boolean | {
-        readonly fromAttr: string;
-    };
+	/**
+	 * Accessible name
+	 *
+	 * - If it is `true`, it assumes the element has any text on its accessible name.
+	 * - If it specifies `fromAttr` property, it assumes the accessible name refers to the value of the attribute.
+	 */
+	readonly name?:
+		| boolean
+		| {
+				readonly fromAttr: string;
+		  };
 };
 export type Rule<T extends RuleConfigValue, O extends PlainData = undefined> = RuleConfig<T, O> | Readonly<T> | boolean;
 /**
  * @deprecated
  */
-export type RuleV2<T extends RuleConfigValue, O extends PlainData = undefined> = RuleConfigV2<T, O> | Readonly<T> | boolean;
+export type RuleV2<T extends RuleConfigValue, O extends PlainData = undefined> =
+	| RuleConfigV2<T, O>
+	| Readonly<T>
+	| boolean;
 export type AnyRule = Rule<RuleConfigValue, PlainData>;
 /**
  * @deprecated
  */
 export type AnyRuleV2 = RuleV2<RuleConfigValue, PlainData>;
 export type Rules = {
-    readonly [ruleName: string]: AnyRule;
+	readonly [ruleName: string]: AnyRule;
 };
 export type RuleConfig<T extends RuleConfigValue, O extends PlainData = undefined> = {
-    readonly severity?: Severity;
-    readonly value?: Readonly<T>;
-    readonly options?: Readonly<O>;
-    readonly reason?: string;
+	readonly severity?: Severity;
+	readonly value?: Readonly<T>;
+	readonly options?: Readonly<O>;
+	readonly reason?: string;
 };
 /**
  * @deprecated
  */
 export type RuleConfigV2<T extends RuleConfigValue, O extends PlainData = undefined> = {
-    readonly severity?: Severity;
-    readonly value?: Readonly<T>;
-    readonly reason?: string;
-    /**
-     * Old property
-     *
-     * @deprecated
-     * @see {this.options}
-     */
-    readonly option?: Readonly<O>;
+	readonly severity?: Severity;
+	readonly value?: Readonly<T>;
+	readonly reason?: string;
+	/**
+	 * Old property
+	 *
+	 * @deprecated
+	 * @see {this.options}
+	 */
+	readonly option?: Readonly<O>;
 };
 export type Severity = 'error' | 'warning' | 'info';
 export type RuleConfigValue = PrimitiveScalar | readonly (PrimitiveScalar | Readonly<Record<string, any>>)[] | null;
 export type NodeRule = {
-    readonly selector?: string;
-    readonly regexSelector?: RegexSelector;
-    readonly categories?: readonly string[];
-    readonly roles?: readonly string[];
-    readonly obsolete?: boolean;
-    readonly rules?: Rules;
+	readonly selector?: string;
+	readonly regexSelector?: RegexSelector;
+	readonly categories?: readonly string[];
+	readonly roles?: readonly string[];
+	readonly obsolete?: boolean;
+	readonly rules?: Rules;
 };
 export type ChildNodeRule = {
-    readonly selector?: string;
-    readonly regexSelector?: RegexSelector;
-    readonly inheritance?: boolean;
-    readonly rules?: Rules;
-};
-export type Report<T extends RuleConfigValue, O extends PlainData = undefined> = Report1<T, O> | Report2 | (Report1<T, O> & Report2);
+	readonly selector?: string;
+	readonly regexSelector?: RegexSelector;
+	readonly inheritance?: boolean;
+	readonly rules?: Rules;
+};
+export type Report<T extends RuleConfigValue, O extends PlainData = undefined> =
+	| Report1<T, O>
+	| Report2
+	| (Report1<T, O> & Report2);
 export type Report1<T extends RuleConfigValue, O extends PlainData = undefined> = {
-    readonly message: string;
-    readonly scope: Scope<T, O>;
+	readonly message: string;
+	readonly scope: Scope<T, O>;
 };
 export type Report2 = {
-    readonly message: string;
-    readonly line: number;
-    readonly col: number;
-    readonly raw: string;
+	readonly message: string;
+	readonly line: number;
+	readonly col: number;
+	readonly raw: string;
 };
 export type Scope<T extends RuleConfigValue, O extends PlainData = undefined> = {
-    readonly rule: RuleInfo<T, O>;
-    readonly startLine: number;
-    readonly startCol: number;
-    readonly raw: string;
+	readonly rule: RuleInfo<T, O>;
+	readonly startLine: number;
+	readonly startCol: number;
+	readonly raw: string;
 };
 export type Violation = {
-    readonly ruleId: string;
-    readonly severity: Severity;
-    readonly message: string;
-    readonly reason?: string;
-    readonly line: number;
-    readonly col: number;
-    readonly raw: string;
+	readonly ruleId: string;
+	readonly severity: Severity;
+	readonly message: string;
+	readonly reason?: string;
+	readonly line: number;
+	readonly col: number;
+	readonly raw: string;
 };
 export type RuleInfo<T extends RuleConfigValue, O extends PlainData = undefined> = {
-    readonly disabled: boolean;
-    readonly severity: Severity;
-    readonly value: Readonly<T>;
-    readonly options: Readonly<O>;
-    readonly reason?: string;
+	readonly disabled: boolean;
+	readonly severity: Severity;
+	readonly value: Readonly<T>;
+	readonly options: Readonly<O>;
+	readonly reason?: string;
 };
 export type GlobalRuleInfo<T extends RuleConfigValue, O extends PlainData = undefined> = RuleInfo<T, O> & {
-    nodeRules: RuleInfo<T, O>[];
-    childNodeRules: RuleInfo<T, O>[];
+	nodeRules: RuleInfo<T, O>[];
+	childNodeRules: RuleInfo<T, O>[];
 };
-export type Nullable<T> = T | null | undefined;

package/lib/utils.d.ts

@@ -7,8 +7,13 @@ import type { AnyRule, AnyRuleV2, PlainData, RuleConfig, RuleConfigV2, RuleConfi
  * @param data Captured string for replacement
  */
 export declare function provideValue(template: string, data: Readonly<Record<string, string>>): string | undefined;
-export declare function exchangeValueOnRule(rule: AnyRule | AnyRuleV2, data: Readonly<Record<string, string>>): AnyRule | undefined;
-export declare function cleanOptions(rule: RuleConfig<RuleConfigValue, PlainData> | RuleConfigV2<RuleConfigValue, PlainData>): RuleConfig<RuleConfigValue, PlainData>;
+export declare function exchangeValueOnRule(
+	rule: AnyRule | AnyRuleV2,
+	data: Readonly<Record<string, string>>,
+): AnyRule | undefined;
+export declare function cleanOptions(
+	rule: RuleConfig<RuleConfigValue, PlainData> | RuleConfigV2<RuleConfigValue, PlainData>,
+): RuleConfig<RuleConfigValue, PlainData>;
 export declare function isRuleConfigValue(v: any): v is RuleConfigValue;
 /**
  *

package/lib/utils.js

@@ -39,7 +39,7 @@ function exchangeValueOnRule(rule, data) {
         };
     }
     const options = extractOptions(result);
-    if (options) {
+    if (options != null && options !== '' && options !== 0) {
         const newOptions = exchangeOption(options, data);
         result = {
             ...result,
@@ -54,7 +54,7 @@ function exchangeValueOnRule(rule, data) {
         const exchangedValue = exchangeValue(result.reason, data);
         result = {
             ...result,
-            reason: exchangedValue ? `${exchangedValue}` : undefined,
+            reason: exchangedValue != null ? `${exchangedValue}` : undefined,
         };
     }
     deleteUndefProp(result);
@@ -109,10 +109,10 @@ exports.deleteUndefProp = deleteUndefProp;
  * @returns
  */
 function extractOptions(rule) {
-    if ('options' in rule && rule.options) {
+    if ('options' in rule && rule.options != null) {
         return rule.options;
     }
-    if ('option' in rule && rule.option) {
+    if ('option' in rule && rule.option != null) {
         return rule.option;
     }
 }
@@ -132,7 +132,7 @@ function exchangeValue(rule, data) {
             return val;
         })
             .filter((item) => item !== undefined);
-        return ruleArray.length ? ruleArray : undefined;
+        return ruleArray.length > 0 ? ruleArray : undefined;
     }
     return rule;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/ml-config",
-	"version": "3.5.0",
+	"version": "3.6.0",
 	"description": "JSON Schema and TypeScript types of markuplint configure JSON",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -20,14 +20,15 @@
 	},
 	"devDependencies": {
 		"@markuplint/ml-ast": "3.1.0",
+		"@markuplint/shared": "3.5.0",
 		"@types/mustache": "^4.2.2"
 	},
 	"dependencies": {
-		"@markuplint/selector": "3.5.0",
+		"@markuplint/selector": "3.6.0",
 		"deepmerge": "^4.2.2",
 		"is-plain-object": "^5.0.0",
 		"mustache": "^4.2.0",
 		"type-fest": "^3.6.1"
 	},
-	"gitHead": "0c47b2c2722f6823a17f36edbab98486275f8ab4"
+	"gitHead": "715dd53d3b1064a9bcf616c1533921cad9e3b187"
 }