Update shorthand parser and add tests

Author: asamuzaK

lib/parsers.js

@@ -469,15 +469,50 @@ exports.parseShorthand = function parseShorthand(val, shorthandFor, preserve = f
   }
   const parts = splitValue(val);
   const shorthandArr = [...shorthandFor];
-  for (const part of parts) {
+  for (let i = 0; i < parts.length; i++) {
+    const part = parts[i];
     let partValid = false;
-    for (let i = 0; i < shorthandArr.length; i++) {
-      const [property, value] = shorthandArr[i];
-      if (value.isValid(part)) {
+    for (let j = 0; j < shorthandArr.length; j++) {
+      const [property, value] = shorthandArr[j];
+      if (property === "font-family") {
+        // font-family must be the last part.
+        if (i === parts.length - 1) {
+          if (value.isValid(part)) {
+            // Previous part should be a valid font-size or line-height.
+            const prevPart = parts[i - 1];
+            if (
+              exports.parseMeasurement(prevPart) ||
+              exports.parseNumber(prevPart) ||
+              exports.parseKeyword(prevPart, [
+                "xx-small",
+                "x-small",
+                "small",
+                "medium",
+                "large",
+                "x-large",
+                "xx-large",
+                "xxx-large",
+                "smaller",
+                "larger",
+                "normal"
+              ])
+            ) {
+              partValid = true;
+              obj[property] = value.parse(part);
+              if (!preserve) {
+                shorthandArr.splice(j, 1);
+                break;
+              }
+            }
+          }
+        } else {
+          continue;
+        }
+      } else if (value.isValid(part)) {
         partValid = true;
         obj[property] = value.parse(part);
         if (!preserve) {
-          shorthandArr.splice(i, 1);
+          shorthandArr.splice(j, 1);
           break;
         }
       }

test/parsers.test.js

@@ -983,7 +983,63 @@ describe("parseShorthand", () => {
   ]);
 
   it("should return undefined for invalid font-family", () => {
-    const input = "medium Ahem!, sans-serif";
+    const input = "normal medium Goudy Bookletter 1911, sans-serif";
+    const output = parsers.parseShorthand(input, shorthandForFont, true);
+
+    assert.deepEqual(output, undefined);
+  });
+
+  it("should return undefined for invalid font-family", () => {
+    const input = "normal medium Red/Black, sans-serif";
+    const output = parsers.parseShorthand(input, shorthandForFont, true);
+
+    assert.deepEqual(output, undefined);
+  });
+
+  it("should return undefined for invalid font-family", () => {
+    const input = "normal medium Red/Black, sans-serif";
+    const output = parsers.parseShorthand(input, shorthandForFont, true);
+
+    assert.deepEqual(output, undefined);
+  });
+
+  it("should return undefined for invalid font-family", () => {
+    const input = 'normal medium "Lucida" Grande, sans-serif';
+    const output = parsers.parseShorthand(input, shorthandForFont, true);
+
+    assert.deepEqual(output, undefined);
+  });
+
+  it("should return undefined for invalid font-family", () => {
+    const input = 'normal medium Lucida "Grande", sans-serif';
+    const output = parsers.parseShorthand(input, shorthandForFont, true);
+
+    assert.deepEqual(output, undefined);
+  });
+
+  it("should return undefined for invalid font-family", () => {
+    const input = "normal medium Ahem!, sans-serif";
+    const output = parsers.parseShorthand(input, shorthandForFont, true);
+
+    assert.deepEqual(output, undefined);
+  });
+
+  it("should return undefined for invalid font-family", () => {
+    const input = "normal medium test@foo, sans-serif";
+    const output = parsers.parseShorthand(input, shorthandForFont, true);
+
+    assert.deepEqual(output, undefined);
+  });
+
+  it("should return undefined for invalid font-family", () => {
+    const input = "normal medium #POUND, sans-serif";
+    const output = parsers.parseShorthand(input, shorthandForFont, true);
+
+    assert.deepEqual(output, undefined);
+  });
+
+  it("should return undefined for invalid font-family", () => {
+    const input = "normal medium Hawaii 5-0, sans-serif";
     const output = parsers.parseShorthand(input, shorthandForFont, true);
 
     assert.deepEqual(output, undefined);