Fix(SCIMMY.Types.Attribute): allow leading '-' character in attribute…

… names again
scimmyjs · Jul 23, 2024 · 3444ac9 · 3444ac9
1 parent 679cf5b
commit 3444ac9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/lib/types/attribute.js b/src/lib/types/attribute.js
@@ -308,7 +308,7 @@ export class Attribute {
     constructor(type, name, config = {}, subAttributes = []) {
         const errorSuffix = `attribute definition '${name}'`;
         // Check for invalid characters in attribute name
-        const [, invalidNameChar, invalidNameStart] = /([^-$\w])|(^[^$\w])/g.exec(name) ?? [];
+        const [, invalidNameChar, invalidNameStart] = /([^-$\w])|(^[^-$\w])/g.exec(name) ?? [];
 
         // Make sure name and type are supplied as strings
         for (let [param, value] of [["type", type], ["name", name]]) if (typeof value !== "string")

diff --git a/test/lib/types/attribute.js b/test/lib/types/attribute.js
@@ -73,13 +73,12 @@ describe("SCIMMY.Types.Attribute", () => {
                 ["=", "invalid=name"],
                 [",", "invalid,name"],
                 ["%", "invalid%name"],
-                ["%", "%invalidName"],
-                ["-", "-invalidName"]
+                ["%", "%invalidName"]
             ];
 
             for (let [char, name] of invalidNames) {
                 assert.throws(() => new Attribute("string", name),
-                    {name: "TypeError", message: `Invalid ${name.startsWith("-") ? "leading character" : "character"} '${char}' in name of attribute definition '${name}'`},
+                    {name: "TypeError", message: `Invalid character '${char}' in name of attribute definition '${name}'`},
                     `Attribute instantiated with invalid 'name' argument '${name}'`);
             }
 
@@ -89,6 +88,7 @@ describe("SCIMMY.Types.Attribute", () => {
                 "valid$name",
                 "_validName",
                 "valid_name",
+                "-validName",
                 "valid-name",
                 "00validName",
                 "valid00name"