use fewer negative lookahead assertions in regular expressions (Schem…

…aStore#4209)
benpops89 · Nov 21, 2024 · fd1ac77 · fd1ac77
1 parent d455072
commit fd1ac77
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 31 deletions.
diff --git a/src/negative_test/stylelintrc/objectRule.json b/src/negative_test/stylelintrc/objectRule.json
@@ -0,0 +1,15 @@
+{
+  "rules": {
+    "declaration-property-unit-whitelist": [
+      {
+        "message": []
+      },
+      {
+        "/^animation/": "s",
+        "font-size": "em",
+        "line-height": [],
+        "message": []
+      }
+    ]
+  }
+}
diff --git a/src/schemas/json/package.json b/src/schemas/json/package.json
@@ -139,7 +139,7 @@
         }
       },
       "patternProperties": {
-        "^(?![\\.0-9]).": {
+        "^[^.0-9]+$": {
           "$ref": "#/definitions/packageExportsEntryOrFallback",
           "description": "The module path that is resolved when this environment matches the property name."
         }

diff --git a/src/schemas/json/stylelintrc.json b/src/schemas/json/stylelintrc.json
@@ -193,8 +193,7 @@
           "type": "null"
         },
         {
-          "type": "boolean",
-          "enum": [true, []]
+          "type": "boolean"
         },
         {
           "type": "array",
@@ -205,8 +204,7 @@
             "type": ["boolean", "object"],
             "anyOf": [
               {
-                "type": "boolean",
-                "enum": [true, {}]
+                "type": "boolean"
               },
               {
                 "$ref": "#/definitions/coreRule"
@@ -217,6 +215,7 @@
       ]
     },
     "coreRule": {
+      "type": "object",
       "properties": {
         "disableFix": {
           "type": "boolean"
@@ -427,48 +426,36 @@
       ]
     },
     "objectRule": {
-      "type": ["null", "object", "array"],
       "oneOf": [
         {
           "type": "null"
         },
         {
           "type": "object",
-          "patternProperties": {
-            ".*": {
-              "$ref": "#/definitions/simpleArrayStringRule"
-            }
+          "additionalProperties": {
+            "$ref": "#/definitions/simpleStringOrArrayStringRule"
           }
         },
         {
           "type": "array",
           "minItems": 2,
           "maxItems": 2,
-          "uniqueItems": true,
-          "items": {
-            "type": ["object"],
-            "anyOf": [
-              {
-                "type": "object",
-                "allOf": [
-                  {
-                    "$ref": "#/definitions/coreRule"
-                  }
-                ],
-                "patternProperties": {
-                  "^((?!message|severity).)*$": {
-                    "$ref": "#/definitions/simpleArrayStringRule"
-                  }
-                }
+          "items": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "$ref": "#/definitions/simpleStringOrArrayStringRule"
               }
-            ]
-          }
+            },
+            {
+              "$ref": "#/definitions/coreRule"
+            }
+          ]
         }
       ]
     },
     "simpleArrayStringRule": {
       "type": "array",
-      "minItems": 1,
       "uniqueItems": true,
       "items": {
         "type": "string"
@@ -572,8 +559,7 @@
             "type": ["string", "object"],
             "anyOf": [
               {
-                "type": "string",
-                "enum": [{}]
+                "type": "string"
               },
               {
                 "$ref": "#/definitions/coreRule"

diff --git a/src/test/stylelintrc/objectRule.json b/src/test/stylelintrc/objectRule.json
@@ -0,0 +1,15 @@
+{
+  "rules": {
+    "declaration-property-unit-whitelist": [
+      {
+        "/^animation/": "s",
+        "/message/": "blah",
+        "font-size": "em",
+        "line-height": []
+      },
+      {
+        "message": "it failed!"
+      }
+    ]
+  }
+}