@markuplint/ml-config - npm Package Compare versions

Comparing version 2.0.0-dev.20211115.0 to 2.0.0-dev.20220110.0

lib/merge-config.d.ts

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

lib/merge-config.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergeConfig = void 0;
+exports.mergeRule = exports.mergeConfig = void 0;
 const tslib_1 = require("tslib");
@@ -32,2 +32,42 @@ const deepmerge_1 = (0, tslib_1.__importDefault)(require("deepmerge"));
 exports.mergeConfig = mergeConfig;
+function mergeRule(a, b) {
+    // Particular behavior:
+    //
+    // If the right-side value is false, return false.
+    // In short; The `false` makes the rule to be disabled absolutely.
+    if (b === false || (!isRuleConfigValue(b) && b.value === false)) {
+        return false;
+    }
+    if (a === undefined) {
+        return b;
+    }
+    if (isRuleConfigValue(b)) {
+        if (isRuleConfigValue(a)) {
+            if (Array.isArray(a) && Array.isArray(b)) {
+                return [...a, ...b];
+            }
+            return b;
+        }
+        const value = Array.isArray(a.value) && Array.isArray(b) ? [...a.value, b] : b;
+        const res = {
+            ...a,
+            value,
+        };
+        deleteUndefProp(res);
+        return res;
+    }
+    const severity = b.severity || (!isRuleConfigValue(a) ? a.severity : undefined);
+    const value = b.value || (isRuleConfigValue(a) ? a : a.value);
+    const option = mergeObject(!isRuleConfigValue(a) ? a.option : undefined, b.option);
+    const reason = b.reason || (!isRuleConfigValue(a) ? a.reason : undefined);
+    const res = {
+        severity,
+        value,
+        option,
+        reason,
+    };
+    deleteUndefProp(res);
+    return res;
+}
+exports.mergeRule = mergeRule;
 function mergeObject(a, b) {
@@ -112,32 +152,2 @@ if (a == null) {
 }
-function mergeRule(a, b) {
-    if (a === undefined) {
-        return b;
-    }
-    if (isRuleConfigValue(b)) {
-        if (isRuleConfigValue(a)) {
-            if (Array.isArray(a) && Array.isArray(b)) {
-                return [...a, ...b];
-            }
-            return b;
-        }
-        const value = Array.isArray(a.value) && Array.isArray(b) ? [...a.value, b] : b;
-        const res = {
-            ...a,
-            value,
-        };
-        deleteUndefProp(res);
-        return res;
-    }
-    const severity = b.severity || (!isRuleConfigValue(a) ? a.severity : undefined);
-    const value = b.value || (isRuleConfigValue(a) ? a : a.value);
-    const option = mergeObject(!isRuleConfigValue(a) ? a.option : undefined, b.option);
-    const res = {
-        severity,
-        value,
-        option,
-    };
-    deleteUndefProp(res);
-    return res;
-}
 function isRuleConfigValue(v) {
@@ -144,0 +154,0 @@ switch (typeof v) {

lib/types.d.ts

@@ -44,2 +44,5 @@ export interface Config {
 export interface NodeRule {
+    /**
+     * @deprecated
+     */
     tagName?: string;
@@ -54,2 +57,5 @@ selector?: string;
 export interface ChildNodeRule {
+    /**
+     * @deprecated
+     */
     tagName?: string;
@@ -105,2 +111,6 @@ selector?: string;
 }
+export declare type GlobalRuleInfo<T extends RuleConfigValue, O = null> = RuleInfo<T, O> & {
+    nodeRules: RuleInfo<T, O>[];
+    childNodeRules: RuleInfo<T, O>[];
+};
 export declare type Nullable<T> = T | null | undefined;

lib/utils.js

@@ -65,2 +65,9 @@ "use strict";
         }
+        if (rule.reason != null) {
+            const exchangedValue = exchangeValue(rule.reason, data);
+            rule = {
+                ...rule,
+                reason: exchangedValue ? `${exchangedValue}` : undefined,
+            };
+        }
         return rule;
@@ -67,0 +74,0 @@ }

package.json

 {
 	"name": "@markuplint/ml-config",
-	"version": "2.0.0-dev.20211115.0",
+	"version": "2.0.0-dev.20220110.0",
 	"description": "JSON Schema and TypeScript types of markuplint configure JSON",
@@ -26,3 +26,3 @@ "repository": "[e-mail]:markuplint/markuplint.git",
 	},
-	"gitHead": "11bcb81138ae11362add9b502124011735cc784a"
+	"gitHead": "162fd80f8430d92941ea7afb87607bc4d32da22e"
 }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

56605

increased by7.47%

Lines of code

490

increased by6.06%

Worsened metrics

Number of downloads

29124

decreased by-19.1%

Published versions last two months

3

decreased by-40%

No dependency changes