html-validate 6.1.4 → 6.1.5

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # html-validate changelog
 
+### [6.1.5](https://gitlab.com/html-validate/html-validate/compare/v6.1.4...v6.1.5) (2021-12-28)
+
+### Bug Fixes
+
+- **config:** dont process extends multiple times ([f014311](https://gitlab.com/html-validate/html-validate/commit/f01431147a74272142dd6ddcfe5d53bf68c80aa9))
+- **config:** elements from extended configs should be loaded first not last ([d19519e](https://gitlab.com/html-validate/html-validate/commit/d19519e5ee97e7b5c375bca80f01dcbaa5eb0373))
+
 ### [6.1.4](https://gitlab.com/html-validate/html-validate/compare/v6.1.3...v6.1.4) (2021-12-04)
 
 ### Bug Fixes

package/dist/cjs/core.js

@@ -2929,7 +2929,7 @@ var TRANSFORMER_API;
 /** @public */
 const name = "html-validate";
 /** @public */
-const version = "6.1.4";
+const version = "6.1.5";
 /** @public */
 const homepage = "https://html-validate.org";
 /** @public */
@@ -9790,9 +9790,11 @@ class Config {
         this.configurations = this.loadConfigurations(this.plugins);
         this.extendMeta(this.plugins);
         /* process extended configs */
-        for (const extend of (_a = this.config.extends) !== null && _a !== void 0 ? _a : []) {
-            this.config = this.extendConfig(extend);
-        }
+        this.config = this.extendConfig((_a = this.config.extends) !== null && _a !== void 0 ? _a : []);
+        /* reset extends as we already processed them, this prevents the next config
+         * from reapplying config from extended config as well as duplicate entries
+         * when merging arrays */
+        this.config.extends = [];
         /* rules explicitly set by passed options should have precedence over any
          * extended rules, not the other way around. */
         if (options && options.rules) {
@@ -9890,15 +9892,23 @@ class Config {
     merge(rhs) {
         return new Config(mergeInternal(this.config, rhs.config));
     }
-    extendConfig(entry) {
-        let base;
-        if (this.configurations.has(entry)) {
-            base = this.configurations.get(entry);
+    extendConfig(entries) {
+        if (entries.length === 0) {
+            return this.config;
         }
-        else {
-            base = Config.fromFile(entry).config;
+        let base = {};
+        for (let i = 0; i < entries.length; i++) {
+            const entry = entries[i];
+            let extended;
+            if (this.configurations.has(entry)) {
+                extended = this.configurations.get(entry);
+            }
+            else {
+                extended = Config.fromFile(entry).config;
+            }
+            base = mergeInternal(base, extended);
         }
-        return mergeInternal(this.config, base);
+        return mergeInternal(base, this.config);
     }
     /**
      * Get element metadata.
@@ -9973,6 +9983,7 @@ class Config {
                 }
             });
         }
+        delete config.extends;
         return config;
     }
     /**