@spyglassmc/mcdoc 0.3.30 → 0.3.32

package/lib/runtime/attribute/builtin.js

@@ -10,6 +10,10 @@ const idValidator = validator.alternatives(validator.map(validator.string, v =>
     empty: validator.optional(validator.options('allowed')),
     exclude: validator.optional(validator.alternatives(validator.map(validator.string, v => [v]), validator.list(validator.string))),
 }), () => ({}));
+const matchRegexValidator = validator.alternatives(validator.map(validator.string, v => ({ pattern: v })), validator.tree({
+    pattern: validator.string,
+    message: validator.optional(validator.string),
+}));
 function getResourceLocationOptions({ registry, tags, definition, path }, requireCanonical, ctx, typeDef) {
     if (!registry) {
         if (typeDef?.kind === 'enum' && typeDef.enumKind === 'string') {
@@ -225,7 +229,28 @@ export function registerBuiltinAttributes(meta) {
                     const error = message
                         .replace(/^Invalid regular expression: /, '')
                         .replace(/^\/.+\/: /, '');
-                    ctx.err.report(localize('invalid-regex-pattern', error), node, 2);
+                    ctx.err.report(localize('invalid-regex-pattern', error), node, 2 /* core.ErrorSeverity.Warning */);
+                }
+            };
+        },
+    });
+    registerAttribute(meta, 'match_regex', matchRegexValidator, {
+        checker: (config, typeDef, _) => {
+            if (typeDef.kind !== 'literal' || typeDef.value.kind !== 'string') {
+                return undefined;
+            }
+            const pattern = config.pattern;
+            const value = typeDef.value.value;
+            return (node, ctx) => {
+                try {
+                    const regex = RegExp(pattern);
+                    if (!regex.test(value)) {
+                        const message = config.message ?? localize('mismatching-regex-pattern', pattern);
+                        ctx.err.report(message, node, 2 /* core.ErrorSeverity.Warning */);
+                    }
+                }
+                catch (e) {
+                    ctx.logger.warn(`Invalid regular expression in "match_regex" mcdoc attribute: ${pattern}`);
                 }
             };
         },

package/lib/runtime/checker/index.js

@@ -753,13 +753,8 @@ function resolveIndices(parallelIndices, symbolMap, symbolQuery, context) {
 }
 function simplifyUnion(typeDef, context) {
     let dynamicData = false;
-    const filterCanonical = context.ctx.requireCanonical
-        && typeDef.members.some(m => m.attributes?.some(a => a.name === 'canonical'));
-    const validMembers = typeDef.members
+    let validMembers = typeDef.members
         .filter(member => {
-        if (filterCanonical && !member.attributes?.some(a => a.name === 'canonical')) {
-            return false;
-        }
         let keep = true;
         handleAttributes(member.attributes, context.ctx, (handler, config) => {
             if (!keep || !handler.filterElement) {
@@ -771,6 +766,11 @@ function simplifyUnion(typeDef, context) {
         });
         return keep;
     });
+    const filterCanonical = context.ctx.requireCanonical
+        && validMembers.some(m => m.attributes?.some(a => a.name === 'canonical'));
+    if (filterCanonical) {
+        validMembers = typeDef.members.filter(member => member.attributes?.some(a => a.name === 'canonical'));
+    }
     if (validMembers.length === 1) {
         return simplify(validMembers[0], context);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spyglassmc/mcdoc",
-  "version": "0.3.30",
+  "version": "0.3.32",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -25,7 +25,7 @@
     "url": "https://github.com/SpyglassMC/Spyglass/issues"
   },
   "dependencies": {
-    "@spyglassmc/core": "0.4.26",
-    "@spyglassmc/locales": "0.3.12"
+    "@spyglassmc/core": "0.4.28",
+    "@spyglassmc/locales": "0.3.14"
   }
 }