@markuplint/ml-config 3.5.0 → 3.6.1

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,5 +1,6 @@
 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;
@@ -184,4 +185,3 @@ export type GlobalRuleInfo<T extends RuleConfigValue, O extends PlainData = unde
     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.1",
 	"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.1",
 		"deepmerge": "^4.2.2",
 		"is-plain-object": "^5.0.0",
 		"mustache": "^4.2.0",
 		"type-fest": "^3.6.1"
 	},
-	"gitHead": "0c47b2c2722f6823a17f36edbab98486275f8ab4"
+	"gitHead": "3cdf5a088b2da03773d5d4461d0e65ec32290a00"
 }