html-validate 9.0.0-rc.7 → 9.0.0

package/dist/es/core.js

@@ -645,7 +645,7 @@ const patternProperties = {
 						type: "boolean"
 					},
 					{
-						$ref: "#/definitions/expression"
+						"function": true
 					}
 				]
 			},
@@ -746,59 +746,11 @@ const definitions = {
 			{
 				type: "boolean"
 			},
-			{
-				$ref: "#/definitions/expression"
-			},
 			{
 				"function": true
 			}
 		]
 	},
-	expression: {
-		type: "array",
-		minItems: 2,
-		maxItems: 2,
-		items: [
-			{
-				type: "string",
-				"enum": [
-					"isDescendant",
-					"hasAttribute",
-					"matchAttribute"
-				]
-			},
-			{
-				anyOf: [
-					{
-						type: "string"
-					},
-					{
-						$ref: "#/definitions/operation"
-					}
-				]
-			}
-		]
-	},
-	operation: {
-		type: "array",
-		minItems: 3,
-		maxItems: 3,
-		items: [
-			{
-				type: "string"
-			},
-			{
-				type: "string",
-				"enum": [
-					"!=",
-					"="
-				]
-			},
-			{
-				type: "string"
-			}
-		]
-	},
 	deprecatedElement: {
 		type: "object",
 		additionalProperties: false,
@@ -1158,31 +1110,6 @@ function migrateElement(src) {
   return result;
 }
 
-function isDescendant(node, tagName) {
-  let cur = node.parent;
-  while (cur && !cur.isRootElement()) {
-    if (cur.is(tagName)) {
-      return true;
-    }
-    cur = cur.parent;
-  }
-  return false;
-}
-
-function hasAttribute(node, attr) {
-  return node.hasAttribute(attr);
-}
-
-function matchAttribute(node, key, op, value) {
-  const nodeValue = (node.getAttributeValue(key) ?? "").toLowerCase();
-  switch (op) {
-    case "!=":
-      return nodeValue !== value;
-    case "=":
-      return nodeValue === value;
-  }
-}
-
 const dynamicKeys = [
   "metadata",
   "flow",
@@ -1193,16 +1120,11 @@ const dynamicKeys = [
   "interactive",
   "labelable"
 ];
-const functionTable = {
-  isDescendant: isDescendantFacade,
-  hasAttribute: hasAttributeFacade,
-  matchAttribute: matchAttributeFacade
-};
 const schemaCache = /* @__PURE__ */ new Map();
 function clone(src) {
   return JSON.parse(JSON.stringify(src));
 }
-function overwriteMerge$1(a, b) {
+function overwriteMerge$1(_a, b) {
   return b;
 }
 class MetaTable {
@@ -1396,13 +1318,8 @@ class MetaTable {
 function expandProperties(node, entry) {
   for (const key of dynamicKeys) {
     const property = entry[key];
-    if (!property) {
-      continue;
-    }
     if (typeof property === "function") {
       setMetaProperty(entry, key, property(node._adapter));
-    } else if (typeof property !== "boolean") {
-      setMetaProperty(entry, key, evaluateProperty(node, property));
     }
   }
   if (typeof entry.focusable === "function") {
@@ -1432,55 +1349,6 @@ function expandRegex(entry) {
     }
   }
 }
-function evaluateProperty(node, expr) {
-  const [func, options] = parseExpression(expr);
-  return func(node, options);
-}
-function parseExpression(expr) {
-  if (typeof expr === "string") {
-    return parseExpression([expr, {}]);
-  } else {
-    const [funcName, options] = expr;
-    const func = functionTable[funcName];
-    if (!func) {
-      throw new Error(`Failed to find function "${funcName}" when evaluating property expression`);
-    }
-    return [func, options];
-  }
-}
-function isDescendantFacade(node, tagName) {
-  if (typeof tagName !== "string") {
-    throw new Error(
-      `Property expression "isDescendant" must take string argument when evaluating metadata for <${node.tagName}>`
-    );
-  }
-  return isDescendant(node, tagName);
-}
-function hasAttributeFacade(node, attr) {
-  if (typeof attr !== "string") {
-    throw new Error(
-      `Property expression "hasAttribute" must take string argument when evaluating metadata for <${node.tagName}>`
-    );
-  }
-  return hasAttribute(node, attr);
-}
-function matchAttributeFacade(node, match) {
-  if (!Array.isArray(match) || match.length !== 3) {
-    throw new Error(
-      `Property expression "matchAttribute" must take [key, op, value] array as argument when evaluating metadata for <${node.tagName}>`
-    );
-  }
-  const [key, op, value] = match.map((x) => x.toLowerCase());
-  switch (op) {
-    case "!=":
-    case "=":
-      return matchAttribute(node, key, op, value);
-    default:
-      throw new Error(
-        `Property expression "matchAttribute" has invalid operator "${op}" when evaluating metadata for <${node.tagName}>`
-      );
-  }
-}
 
 class DynamicValue {
   expr;
@@ -3416,10 +3284,17 @@ const properties = {
 	transform: {
 		type: "object",
 		additionalProperties: {
-			type: "string"
+			anyOf: [
+				{
+					type: "string"
+				},
+				{
+					"function": true
+				}
+			]
 		},
 		title: "File transformations to use.",
-		description: "Object where key is regular expression to match filename and value is name of transformer.",
+		description: "Object where key is regular expression to match filename and value is name of transformer or a function.",
 		examples: [
 			{
 				"^.*\\.foo$": "my-transformer",
@@ -3853,10 +3728,6 @@ function partition(values, predicate) {
   }, initial);
 }
 
-const remapEvents = {
-  "tag:open": "tag:start",
-  "tag:close": "tag:end"
-};
 const ajv$1 = new Ajv({ strict: true, strictTuples: true, strictTypes: true });
 ajv$1.addMetaSchema(ajvSchemaDraft);
 function getSchemaValidator(ruleId, properties) {
@@ -4076,10 +3947,6 @@ class Rule {
     return {};
   }
   on(event, ...args) {
-    const remap = remapEvents[event];
-    if (remap) {
-      event = remap;
-    }
     const callback = args.pop();
     const filter = args.pop() ?? (() => true);
     return this.parser.on(event, (_event, data) => {
@@ -11157,18 +11024,14 @@ class ResolvedConfig {
     if (!transformer) {
       return Promise.resolve([source]);
     }
-    const fn = await getCachedTransformerFunction(
-      this.cache,
-      resolvers,
-      transformer.name,
-      this.plugins
-    );
+    const fn = transformer.kind === "import" ? await getCachedTransformerFunction(this.cache, resolvers, transformer.name, this.plugins) : transformer.function;
+    const name = transformer.kind === "import" ? transformer.name : transformer.function.name;
     try {
       const result = await fn.call(context, source);
       const transformedSources = await Promise.all(toArray$1(result));
       for (const source2 of transformedSources) {
         source2.transformedBy ??= [];
-        source2.transformedBy.push(transformer.name);
+        source2.transformedBy.push(name);
       }
       return transformedSources;
     } catch (err) {
@@ -11187,6 +11050,9 @@ class ResolvedConfig {
    * transformer. Default is to use filename from source.
    * @returns A list of transformed sources ready for validation.
    */
+  /* eslint-disable-next-line complexity -- there is many ifs'n buts here but
+   * hard to break this down without loosing the little clarity that is still
+   * left */
   transformSourceSync(resolvers, source, filename) {
     const transformer = this.findTransformer(filename ?? source.filename);
     const context = {
@@ -11200,7 +11066,8 @@ class ResolvedConfig {
     if (!transformer) {
       return [source];
     }
-    const fn = getCachedTransformerFunction(this.cache, resolvers, transformer.name, this.plugins);
+    const fn = transformer.kind === "import" ? getCachedTransformerFunction(this.cache, resolvers, transformer.name, this.plugins) : transformer.function;
+    const name = transformer.kind === "import" ? transformer.name : transformer.function.name;
     if (isThenable(fn)) {
       throw new UserError(asyncInSyncTransformError);
     }
@@ -11215,7 +11082,7 @@ class ResolvedConfig {
       }
       for (const source2 of transformedSources) {
         source2.transformedBy ??= [];
-        source2.transformedBy.push(transformer.name);
+        source2.transformedBy.push(name);
       }
       return transformedSources;
     } catch (err) {
@@ -11286,8 +11153,9 @@ class ResolvedConfig {
 
 const ajv = new Ajv({ strict: true, strictTuples: true, strictTypes: true });
 ajv.addMetaSchema(ajvSchemaDraft);
+ajv.addKeyword(ajvFunctionKeyword);
 const validator = ajv.compile(configurationSchema);
-function overwriteMerge(a, b) {
+function overwriteMerge(_a, b) {
   return b;
 }
 function mergeInternal(base, rhs) {
@@ -11309,9 +11177,13 @@ function toArray(value) {
   }
 }
 function transformerEntries(transform) {
-  return Object.entries(transform).map(([pattern, name]) => {
+  return Object.entries(transform).map(([pattern, value]) => {
     const regex = new RegExp(pattern);
-    return { pattern: regex, name };
+    if (typeof value === "string") {
+      return { kind: "import", pattern: regex, name: value };
+    } else {
+      return { kind: "function", pattern: regex, function: value };
+    }
   });
 }
 class Config {
@@ -11491,9 +11363,6 @@ class Config {
     return mergeInternal(base, this.config);
   }
   async extendConfigAsync(entries) {
-    if (entries.length === 0) {
-      return this.config;
-    }
     let base = {};
     for (const entry of entries) {
       let extended;
@@ -11795,32 +11664,15 @@ class ConfigLoader {
     if (this._globalConfig) {
       return this._globalConfig;
     }
-    const defaults = Config.empty();
     const config = this._configData ? this.loadFromObject(this._configData) : this.defaultConfig();
     if (isThenable(config)) {
       return config.then((config2) => {
-        const merged = defaults.merge(this.resolvers, config2);
-        if (isThenable(merged)) {
-          return merged.then((merged2) => {
-            this._globalConfig = merged2;
-            return this._globalConfig;
-          });
-        } else {
-          this._globalConfig = merged;
-          return this._globalConfig;
-        }
+        this._globalConfig = config2;
+        return this._globalConfig;
       });
     } else {
-      const merged = defaults.merge(this.resolvers, config);
-      if (isThenable(merged)) {
-        return merged.then((merged2) => {
-          this._globalConfig = merged2;
-          return this._globalConfig;
-        });
-      } else {
-        this._globalConfig = merged;
-        return this._globalConfig;
-      }
+      this._globalConfig = config;
+      return this._globalConfig;
     }
   }
   /**
@@ -11834,16 +11686,11 @@ class ConfigLoader {
     if (this._globalConfig) {
       return this._globalConfig;
     }
-    const defaults = Config.empty();
     const config = this._configData ? this.loadFromObject(this._configData) : this.defaultConfig();
     if (isThenable(config)) {
       throw new UserError("Cannot load async config from sync function");
     }
-    const merged = defaults.merge(this.resolvers, config);
-    if (isThenable(merged)) {
-      throw new UserError("Cannot load async config from sync function");
-    }
-    this._globalConfig = merged;
+    this._globalConfig = config;
     return this._globalConfig;
   }
   /**
@@ -13501,7 +13348,7 @@ class HtmlValidate {
 }
 
 const name = "html-validate";
-const version = "9.0.0-rc.7";
+const version = "9.0.0";
 const bugs = "https://gitlab.com/html-validate/html-validate/issues/new";
 
 function definePlugin(plugin) {
@@ -14465,8 +14312,12 @@ function requireIgnore () {
 var ignoreExports = /*@__PURE__*/ requireIgnore();
 var ignore = /*@__PURE__*/getDefaultExportFromCjs(ignoreExports);
 
+function importFunction(id) {
+  return import(id);
+}
+
 async function internalImport(id) {
-  const { default: defaultImport } = await import(id);
+  const { default: defaultImport } = await importFunction(id);
   if (!defaultImport) {
     throw new UserError(`"${id}" does not have a default export`);
   }