@formique/semantq 1.0.9 → 1.0.11

package/LowCodeParser.js

@@ -172,20 +172,21 @@ function peg$parse(input, options) {
   const peg$c5 = "-";
   const peg$c6 = ",";
 
-  const peg$r0 = /^[^s:\r\n]/;
+  const peg$r0 = /^[^,\r\n]/;
   const peg$r1 = /^[^"]/;
   const peg$r2 = /^[0-9]/;
   const peg$r3 = /^[a-zA-Z0-9_\-]/;
   const peg$r4 = /^[!*]/;
   const peg$r5 = /^[a-zA-Z]/;
-  const peg$r6 = /^[^,\r\n]/;
+  const peg$r6 = /^[a-zA-Z0-9_ \-]/;
   const peg$r7 = /^[ \t\n\r]/;
   const peg$r8 = /^[a-zA-Z_]/;
+  const peg$r9 = /^[a-zA-Z0-9_.\/:\-?&=()@#%+![\] ]/;
 
   const peg$e0 = peg$otherExpectation("form directive must be in this format: @form: form-name");
   const peg$e1 = peg$literalExpectation("@form:", false);
   const peg$e2 = peg$literalExpectation(":", false);
-  const peg$e3 = peg$classExpectation(["s", ":", "\r", "\n"], true, false, false);
+  const peg$e3 = peg$classExpectation([",", "\r", "\n"], true, false, false);
   const peg$e4 = peg$literalExpectation("\"", false);
   const peg$e5 = peg$classExpectation(["\""], true, false, false);
   const peg$e6 = peg$literalExpectation("true", false);
@@ -194,115 +195,135 @@ function peg$parse(input, options) {
   const peg$e9 = peg$literalExpectation("-", false);
   const peg$e10 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"], "_", "-"], false, false, false);
   const peg$e11 = peg$classExpectation(["!", "*"], false, false, false);
-  const peg$e12 = peg$classExpectation([["a", "z"], ["A", "Z"]], false, false, false);
-  const peg$e13 = peg$literalExpectation(",", false);
-  const peg$e14 = peg$classExpectation([",", "\r", "\n"], true, false, false);
+  const peg$e12 = peg$literalExpectation(",", false);
+  const peg$e13 = peg$classExpectation([["a", "z"], ["A", "Z"]], false, false, false);
+  const peg$e14 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"], "_", " ", "-"], false, false, false);
   const peg$e15 = peg$classExpectation([" ", "\t", "\n", "\r"], false, false, false);
   const peg$e16 = peg$classExpectation([["a", "z"], ["A", "Z"], "_"], false, false, false);
+  const peg$e17 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"], "_", ".", "/", ":", "-", "?", "&", "=", "(", ")", "@", "#", "%", "+", "!", "[", "]", " "], false, false, false);
 
-  function peg$f0(name, properties) {
-    return createNode('FormDirective', location().start, location().end, {
-      name: name,
-      properties: properties
-    })
+  function peg$f0(definition) {
+    // definition is already a filtered array from the rule below.
+    return definition;
+  }
+  function peg$f1(directive, fields) {
+// 1. Start with the mandatory FormDirective node.
+const result = [directive];
+
+// 2. Conditionally add the optional FormFields node.
+if (fields) {
+ result.push(fields);
+}
+
+// 3. Return only the array of meaningful nodes, filtering out the '_' match.
+return result;
   }
-  function peg$f1(props) {    
-         const properties = [];
-         for (const prop of props) {
-           if (prop[0] && prop[0].type) properties.push(prop[0]);
-         }
-         return createNode('FormProperties', location().start, location().end, {
-           properties: properties
-         })
+  function peg$f2(name, properties) {
+// No change needed here, as it returns a single, well-formed object.
+return createNode('FormDirective', location().start, location().end, {
+ name: name,
+ properties: properties
+})
   }
-  function peg$f2(key, value) {
+  function peg$f3(props) {
+    const properties = [];
+    for (const prop of props) {
+     if (prop[0] && prop[0].type) properties.push(prop[0]);
+    }
+    return createNode('FormProperties', location().start, location().end, {
+     properties: properties
+    })
+  }
+  function peg$f4(key, value) {
     return createNode('FormProperty', location().start, location().end, {
-      key: key,
-      value: value
+    key: key,
+    value: value
     })
   }
-  function peg$f3() {    // Now allows @ symbols
-        return createNode('StringLiteral', location().start, location().end, {
-          value: text()
-        })
+  function peg$f5() {    // 💡 FIX: Match one or more characters until a comma or newline is found.
+    // We also trim to ensure leading/trailing spaces aren't included in the value
+    return createNode('StringLiteral', location().start, location().end, {
+     value: text().trim()
+    })
   }
-  function peg$f4() {
+  function peg$f6() {
     return createNode('StringLiteral', location().start, location().end, {
-      value: text().slice(1, -1)
+    value: text().slice(1, -1)
     })
   }
-  function peg$f5() {
+  function peg$f7() {
     return createNode('BooleanLiteral', location().start, location().end, {
-      value: text() === "true"
+    value: text() === "true"
     })
   }
-  function peg$f6() {
+  function peg$f8() {
     return createNode('NumberLiteral', location().start, location().end, {
-      value: parseInt(text(), 10)
+    value: parseInt(text(), 10)
     })
   }
-  function peg$f7(fields) {
+  function peg$f9(fields) {
     return createNode('FormFields', location().start, location().end, {
-      fields: fields
+    fields: fields
     })
   }
-  function peg$f8(name, attributes) {
+  function peg$f10(name, attributes) {
     return createNode('FormField', location().start, location().end, {
-      name: name,
-      attributes: attributes || []
+    name: name,
+    attributes: attributes || []
     })
   }
-  function peg$f9(markers, name, markers2) {
+  function peg$f11(markers, name, markers2) {
     return (markers || '') + name + (markers2 || '')
   }
-  function peg$f10(name, namePart, name2, type) {
+  function peg$f12(name, namePart, name2, type) {
     return (name || '') + namePart.join('') + ':' + type.join('')
   }
-  function peg$f11() {    return text()  }
-  function peg$f12() {    return text()  }
-  function peg$f13(attrs) {
-    return attrs.map(attr => attr[1])
+  function peg$f13() {    return text()  }
+  function peg$f14() {    return text()  }
+  function peg$f15(attrs) {
+return attrs.map(attr => attr[1])
   }
-  function peg$f14(key, value) {
+  function peg$f16(key, value) {    // Consumes trailing spaces/newlines
     return createNode('FieldAttribute', location().start, location().end, {
-      key: key,
-      value: value
+    key: key, // 💡 FIX: Removed .value, since AttributeKey returns a string
+    value: value
     })
   }
-  function peg$f15(flag) {
+  function peg$f17(flag) {
     return createNode('FieldAttribute', location().start, location().end, {
-      key: flag,
-      value: true
+    key: flag,
+    value: createNode('BooleanLiteral', location().start, location().end, { value: true })
     })
   }
-  function peg$f16() {    return text()  }
-  function peg$f17() {    return text()  }
   function peg$f18(key, values) {
     return createNode('OptionsAttribute', location().start, location().end, {
-      values: values
+    key: key, // 💡 FIX: Removed .value, since AttributeKey returns a string
+    values: values
     })
   }
   function peg$f19(head, tail) {
-    const options = [head];
-    for (const item of tail) {
-      options.push(item[3]); // Get the Option from the tail items
-    }
-    return options;
+const options = [head];
+// The tail is an array of [whitespace, comma, whitespace, Option] tuples.
+for (const item of tail) {
+ options.push(item[3]); // item[3] is the Option node
+}
+return options;
   }
   function peg$f20(value) {
     return createNode('Option', location().start, location().end, {
-      value: value.join(''),
-      quoted: true
+     value: value.value, // Extract the value from the AttributeValue node
+     quoted: value.type === 'StringLiteral' // Check if it was a quoted string
     })
   }
-  function peg$f21(value) {
-    return createNode('Option', location().start, location().end, {
-      value: text().trim(),
-      quoted: false
-    })
+  function peg$f21() {    return text()  }
+  function peg$f22() {    return text()  }
+  function peg$f23() {
+return createNode('Identifier', location().start, location().end, { value: text() })
   }
-  function peg$f22() {
-    return createNode('Identifier', location().start, location().end, { value: text() }) 
+  function peg$f24(head, tail) {    // 💡 FIX: Added space ' '
+       return createNode('StringLiteral', location().start, location().end, { 
+         value: text() // Returns the entire matched text
+       })
   }
   let peg$currPos = options.peg$currPos | 0;
   let peg$savedPos = peg$currPos;
@@ -475,9 +496,18 @@ function peg$parse(input, options) {
   }
 
   function peg$parsestart() {
-    let s0;
+    let s0, s1, s2;
 
-    s0 = peg$parseformDefinition();
+    s0 = peg$currPos;
+    s1 = peg$parse_();
+    s2 = peg$parseformDefinition();
+    if (s2 !== peg$FAILED) {
+      peg$savedPos = s0;
+      s0 = peg$f0(s2);
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
 
     return s0;
   }
@@ -493,8 +523,8 @@ function peg$parse(input, options) {
       if (s3 === peg$FAILED) {
         s3 = null;
       }
-      s1 = [s1, s2, s3];
-      s0 = s1;
+      peg$savedPos = s0;
+      s0 = peg$f1(s1, s3);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -522,7 +552,7 @@ function peg$parse(input, options) {
         s4 = peg$parse_();
         s5 = peg$parseformProperties();
         peg$savedPos = s0;
-        s0 = peg$f0(s3, s5);
+        s0 = peg$f2(s3, s5);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -569,7 +599,7 @@ function peg$parse(input, options) {
       }
     }
     peg$savedPos = s0;
-    s1 = peg$f1(s1);
+    s1 = peg$f3(s1);
     s0 = s1;
 
     return s0;
@@ -593,7 +623,7 @@ function peg$parse(input, options) {
         s4 = peg$parsePropertyValue();
         if (s4 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f2(s1, s4);
+          s0 = peg$f4(s1, s4);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -613,7 +643,7 @@ function peg$parse(input, options) {
   function peg$parsePropertyValue() {
     let s0;
 
-    s0 = peg$parseUnquotedString();
+    s0 = peg$parseUnquotedAttributeString();
     if (s0 === peg$FAILED) {
       s0 = peg$parseStringLiteral();
       if (s0 === peg$FAILED) {
@@ -630,7 +660,7 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parseUnquotedString() {
+  function peg$parseUnquotedAttributeString() {
     let s0, s1, s2;
 
     s0 = peg$currPos;
@@ -658,7 +688,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f3();
+      s1 = peg$f5();
     }
     s0 = s1;
 
@@ -704,7 +734,7 @@ function peg$parse(input, options) {
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f4();
+        s0 = peg$f6();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -739,7 +769,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f5();
+      s1 = peg$f7();
     }
     s0 = s1;
 
@@ -774,7 +804,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f6();
+      s1 = peg$f8();
     }
     s0 = s1;
 
@@ -798,7 +828,7 @@ function peg$parse(input, options) {
     }
     if (s2 !== peg$FAILED) {
       peg$savedPos = s0;
-      s0 = peg$f7(s2);
+      s0 = peg$f9(s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -825,7 +855,7 @@ function peg$parse(input, options) {
         s4 = peg$parseFieldAttributes();
         s5 = peg$parse_();
         peg$savedPos = s0;
-        s0 = peg$f8(s3, s4);
+        s0 = peg$f10(s3, s4);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -857,7 +887,7 @@ function peg$parse(input, options) {
       }
       s7 = peg$parse_();
       peg$savedPos = s0;
-      s0 = peg$f9(s2, s4, s6);
+      s0 = peg$f11(s2, s4, s6);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -878,7 +908,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseNameWithType() {
-    let s0, s1, s2, s3, s4, s5, s6, s7;
+    let s0, s1, s2, s3, s4, s5, s6;
 
     s0 = peg$currPos;
     s1 = peg$parseFieldMarkers();
@@ -920,32 +950,31 @@ function peg$parse(input, options) {
         if (peg$silentFails === 0) { peg$fail(peg$e2); }
       }
       if (s4 !== peg$FAILED) {
-        s5 = peg$parse_();
-        s6 = [];
-        s7 = input.charAt(peg$currPos);
-        if (peg$r3.test(s7)) {
+        s5 = [];
+        s6 = input.charAt(peg$currPos);
+        if (peg$r3.test(s6)) {
           peg$currPos++;
         } else {
-          s7 = peg$FAILED;
+          s6 = peg$FAILED;
           if (peg$silentFails === 0) { peg$fail(peg$e10); }
         }
-        if (s7 !== peg$FAILED) {
-          while (s7 !== peg$FAILED) {
-            s6.push(s7);
-            s7 = input.charAt(peg$currPos);
-            if (peg$r3.test(s7)) {
+        if (s6 !== peg$FAILED) {
+          while (s6 !== peg$FAILED) {
+            s5.push(s6);
+            s6 = input.charAt(peg$currPos);
+            if (peg$r3.test(s6)) {
               peg$currPos++;
             } else {
-              s7 = peg$FAILED;
+              s6 = peg$FAILED;
               if (peg$silentFails === 0) { peg$fail(peg$e10); }
             }
           }
         } else {
-          s6 = peg$FAILED;
+          s5 = peg$FAILED;
         }
-        if (s6 !== peg$FAILED) {
+        if (s5 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f10(s1, s2, s3, s6);
+          s0 = peg$f12(s1, s2, s3, s5);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -990,7 +1019,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f11();
+      s1 = peg$f13();
     }
     s0 = s1;
 
@@ -1025,7 +1054,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f12();
+      s1 = peg$f14();
     }
     s0 = s1;
 
@@ -1061,7 +1090,7 @@ function peg$parse(input, options) {
       }
     }
     peg$savedPos = s0;
-    s1 = peg$f13(s1);
+    s1 = peg$f15(s1);
     s0 = s1;
 
     return s0;
@@ -1079,7 +1108,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseRegularAttribute() {
-    let s0, s1, s2, s3, s4;
+    let s0, s1, s2, s3, s4, s5;
 
     s0 = peg$currPos;
     s1 = peg$parseAttributeKey();
@@ -1095,8 +1124,9 @@ function peg$parse(input, options) {
         s3 = peg$parse_();
         s4 = peg$parseAttributeValue();
         if (s4 !== peg$FAILED) {
+          s5 = peg$parse_();
           peg$savedPos = s0;
-          s0 = peg$f14(s1, s4);
+          s0 = peg$f16(s1, s4);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -1113,110 +1143,13 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = peg$parseAttributeFlag();
       if (s1 !== peg$FAILED) {
+        s2 = peg$parse_();
         peg$savedPos = s0;
-        s1 = peg$f15(s1);
-      }
-      s0 = s1;
-    }
-
-    return s0;
-  }
-
-  function peg$parseAttributeKey() {
-    let s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.charAt(peg$currPos);
-    if (peg$r5.test(s1)) {
-      peg$currPos++;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e12); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = [];
-      s3 = input.charAt(peg$currPos);
-      if (peg$r3.test(s3)) {
-        peg$currPos++;
+        s0 = peg$f17(s1);
       } else {
-        s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e10); }
-      }
-      while (s3 !== peg$FAILED) {
-        s2.push(s3);
-        s3 = input.charAt(peg$currPos);
-        if (peg$r3.test(s3)) {
-          peg$currPos++;
-        } else {
-          s3 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e10); }
-        }
-      }
-      peg$savedPos = s0;
-      s0 = peg$f16();
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parseAttributeValue() {
-    let s0;
-
-    s0 = peg$parseStringLiteral();
-    if (s0 === peg$FAILED) {
-      s0 = peg$parseBooleanLiteral();
-      if (s0 === peg$FAILED) {
-        s0 = peg$parseNumberLiteral();
-        if (s0 === peg$FAILED) {
-          s0 = peg$parseIdentifier();
-          if (s0 === peg$FAILED) {
-            s0 = peg$parseUnquotedString();
-          }
-        }
-      }
-    }
-
-    return s0;
-  }
-
-  function peg$parseAttributeFlag() {
-    let s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.charAt(peg$currPos);
-    if (peg$r5.test(s1)) {
-      peg$currPos++;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e12); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = [];
-      s3 = input.charAt(peg$currPos);
-      if (peg$r3.test(s3)) {
-        peg$currPos++;
-      } else {
-        s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e10); }
-      }
-      while (s3 !== peg$FAILED) {
-        s2.push(s3);
-        s3 = input.charAt(peg$currPos);
-        if (peg$r3.test(s3)) {
-          peg$currPos++;
-        } else {
-          s3 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e10); }
-        }
+        peg$currPos = s0;
+        s0 = peg$FAILED;
       }
-      peg$savedPos = s0;
-      s0 = peg$f17();
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
     }
 
     return s0;
@@ -1226,7 +1159,7 @@ function peg$parse(input, options) {
     let s0, s1, s2, s3, s4;
 
     s0 = peg$currPos;
-    s1 = peg$parseIdentifier();
+    s1 = peg$parseAttributeKey();
     if (s1 !== peg$FAILED) {
       if (input.charCodeAt(peg$currPos) === 58) {
         s2 = peg$c1;
@@ -1271,7 +1204,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s5 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e13); }
+        if (peg$silentFails === 0) { peg$fail(peg$e12); }
       }
       if (s5 !== peg$FAILED) {
         s6 = peg$parse_();
@@ -1287,34 +1220,43 @@ function peg$parse(input, options) {
         peg$currPos = s3;
         s3 = peg$FAILED;
       }
-      while (s3 !== peg$FAILED) {
-        s2.push(s3);
-        s3 = peg$currPos;
-        s4 = peg$parse_();
-        if (input.charCodeAt(peg$currPos) === 44) {
-          s5 = peg$c6;
-          peg$currPos++;
-        } else {
-          s5 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e13); }
-        }
-        if (s5 !== peg$FAILED) {
-          s6 = peg$parse_();
-          s7 = peg$parseOption();
-          if (s7 !== peg$FAILED) {
-            s4 = [s4, s5, s6, s7];
-            s3 = s4;
+      if (s3 !== peg$FAILED) {
+        while (s3 !== peg$FAILED) {
+          s2.push(s3);
+          s3 = peg$currPos;
+          s4 = peg$parse_();
+          if (input.charCodeAt(peg$currPos) === 44) {
+            s5 = peg$c6;
+            peg$currPos++;
+          } else {
+            s5 = peg$FAILED;
+            if (peg$silentFails === 0) { peg$fail(peg$e12); }
+          }
+          if (s5 !== peg$FAILED) {
+            s6 = peg$parse_();
+            s7 = peg$parseOption();
+            if (s7 !== peg$FAILED) {
+              s4 = [s4, s5, s6, s7];
+              s3 = s4;
+            } else {
+              peg$currPos = s3;
+              s3 = peg$FAILED;
+            }
           } else {
             peg$currPos = s3;
             s3 = peg$FAILED;
           }
-        } else {
-          peg$currPos = s3;
-          s3 = peg$FAILED;
         }
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f19(s1, s2);
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
       }
-      peg$savedPos = s0;
-      s0 = peg$f19(s1, s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -1323,70 +1265,66 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parseOption() {
+  function peg$parseAttributeValue() {
     let s0;
 
-    s0 = peg$parseQuotedOption();
+    s0 = peg$parseExtendedIdentifier();
     if (s0 === peg$FAILED) {
-      s0 = peg$parseUnquotedOption();
+      s0 = peg$parseStringLiteral();
+      if (s0 === peg$FAILED) {
+        s0 = peg$parseUnquotedAttributeString();
+      }
+    }
+
+    return s0;
+  }
+
+  function peg$parseOption() {
+    let s0, s1;
+
+    s0 = peg$currPos;
+    s1 = peg$parseAttributeValue();
+    if (s1 !== peg$FAILED) {
+      peg$savedPos = s0;
+      s1 = peg$f20(s1);
     }
+    s0 = s1;
 
     return s0;
   }
 
-  function peg$parseQuotedOption() {
+  function peg$parseAttributeKey() {
     let s0, s1, s2, s3;
 
     s0 = peg$currPos;
-    if (input.charCodeAt(peg$currPos) === 34) {
-      s1 = peg$c2;
+    s1 = input.charAt(peg$currPos);
+    if (peg$r5.test(s1)) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e4); }
+      if (peg$silentFails === 0) { peg$fail(peg$e13); }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
       s3 = input.charAt(peg$currPos);
-      if (peg$r1.test(s3)) {
+      if (peg$r6.test(s3)) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e5); }
-      }
-      if (s3 !== peg$FAILED) {
-        while (s3 !== peg$FAILED) {
-          s2.push(s3);
-          s3 = input.charAt(peg$currPos);
-          if (peg$r1.test(s3)) {
-            peg$currPos++;
-          } else {
-            s3 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e5); }
-          }
-        }
-      } else {
-        s2 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e14); }
       }
-      if (s2 !== peg$FAILED) {
-        if (input.charCodeAt(peg$currPos) === 34) {
-          s3 = peg$c2;
+      while (s3 !== peg$FAILED) {
+        s2.push(s3);
+        s3 = input.charAt(peg$currPos);
+        if (peg$r6.test(s3)) {
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e4); }
-        }
-        if (s3 !== peg$FAILED) {
-          peg$savedPos = s0;
-          s0 = peg$f20(s2);
-        } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$e14); }
         }
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
       }
+      peg$savedPos = s0;
+      s0 = peg$f21();
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -1395,37 +1333,42 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parseUnquotedOption() {
-    let s0, s1, s2;
+  function peg$parseAttributeFlag() {
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
-    s1 = [];
-    s2 = input.charAt(peg$currPos);
-    if (peg$r6.test(s2)) {
+    s1 = input.charAt(peg$currPos);
+    if (peg$r5.test(s1)) {
       peg$currPos++;
     } else {
-      s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e14); }
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e13); }
     }
-    if (s2 !== peg$FAILED) {
-      while (s2 !== peg$FAILED) {
-        s1.push(s2);
-        s2 = input.charAt(peg$currPos);
-        if (peg$r6.test(s2)) {
+    if (s1 !== peg$FAILED) {
+      s2 = [];
+      s3 = input.charAt(peg$currPos);
+      if (peg$r3.test(s3)) {
+        peg$currPos++;
+      } else {
+        s3 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e10); }
+      }
+      while (s3 !== peg$FAILED) {
+        s2.push(s3);
+        s3 = input.charAt(peg$currPos);
+        if (peg$r3.test(s3)) {
           peg$currPos++;
         } else {
-          s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e14); }
+          s3 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$e10); }
         }
       }
-    } else {
-      s1 = peg$FAILED;
-    }
-    if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f21(s1);
+      s0 = peg$f22();
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
     }
-    s0 = s1;
 
     return s0;
   }
@@ -1486,7 +1429,7 @@ function peg$parse(input, options) {
         }
       }
       peg$savedPos = s0;
-      s0 = peg$f22();
+      s0 = peg$f23();
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -1495,32 +1438,72 @@ function peg$parse(input, options) {
     return s0;
   }
 
+  function peg$parseExtendedIdentifier() {
+    let s0, s1, s2, s3;
 
-  function createNode(type, start, end, additionalProps) {
-    const node = {
-      type: type,
-      start: start,
-      end: end,
-      ...additionalProps
-    };
-    if (additionalProps.expression) {
-      node.expression = createNode('Identifier', additionalProps.expression.start, additionalProps.expression.end, {
-        name: additionalProps.expression.value,
-        loc: {
-          start: {
-            line: 1,
-            column: additionalProps.expression.start + 1
-          },
-          end: {
-            line: 1,
-            column: additionalProps.expression.start + 2
-          }
+    s0 = peg$currPos;
+    s1 = input.charAt(peg$currPos);
+    if (peg$r8.test(s1)) {
+      peg$currPos++;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e16); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = [];
+      s3 = input.charAt(peg$currPos);
+      if (peg$r9.test(s3)) {
+        peg$currPos++;
+      } else {
+        s3 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e17); }
+      }
+      while (s3 !== peg$FAILED) {
+        s2.push(s3);
+        s3 = input.charAt(peg$currPos);
+        if (peg$r9.test(s3)) {
+          peg$currPos++;
+        } else {
+          s3 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$e17); }
         }
-      });
+      }
+      peg$savedPos = s0;
+      s0 = peg$f24(s1, s2);
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
     }
-    return node;
+
+    return s0;
   }
 
+
+function createNode(type, start, end, additionalProps) {
+ const node = {
+ type: type,
+ start: start,
+ end: end,
+ ...additionalProps
+ };
+ if (additionalProps.expression) {
+ node.expression = createNode('Identifier', additionalProps.expression.start, additionalProps.expression.end, {
+  name: additionalProps.expression.value,
+  loc: {
+  start: {
+   line: 1,
+   column: additionalProps.expression.start + 1
+  },
+  end: {
+   line: 1,
+   column: additionalProps.expression.start + 2
+  }
+  }
+ });
+ }
+ return node;
+}
+
   peg$result = peg$startRuleFunction();
 
   const peg$success = (peg$result !== peg$FAILED && peg$currPos === input.length);
@@ -1559,18 +1542,10 @@ const peg$allowedStartRules = [
   "start"
 ];
 
-/*
-export {
-  peg$allowedStartRules as StartRules,
-  peg$SyntaxError as SyntaxError,
-  peg$parse as parse
-};
-
-*/
-
 export default {
   StartRules: ["start"],
   SyntaxError: peg$SyntaxError,
   parse: peg$parse
 };
 
+