feat: Support escaped characters in composed class names (#755)

tivac · May 7, 2020 · 6cd4d8a · 6cd4d8a
1 parent e3519b1
commit 6cd4d8a
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 1 deletion.
diff --git a/packages/processor/test/__snapshots__/composition.test.js.snap b/packages/processor/test/__snapshots__/composition.test.js.snap
@@ -64,3 +64,12 @@ Object {
  },
 }
 `;
+
+exports[`/processor.js composition should compose with escaped classes 1`] = `
+Object {
+ "escaped-classes.css": Object {
+ "c": "sm:foo c",
+ "sm:foo": "sm:foo",
+ },
+}
+`;
diff --git a/packages/processor/test/composition.test.js b/packages/processor/test/composition.test.js
@@ -188,5 +188,21 @@ describe("/processor.js", () => {
 
  expect(compositions).toMatchSnapshot();
  });
+
+ it("should compose with escaped classes", async () => {
+ await processor.string(
+ "./escaped-classes.css",
+ dedent(`
+ .sm\\:foo { color: red; }
+ .c {
+ composes: sm\\:foo;
+ }
+ `)
+ );
+
+ const { compositions } = await processor.output();
+
+ expect(compositions).toMatchSnapshot();
+ });
  });
 });
diff --git a/parsers/shared.pegjs b/parsers/shared.pegjs
@@ -6,11 +6,33 @@ s "string"
  = "\"" chars:[^\"\r\n]* "\"" { return chars.join(""); }
  / "\'" chars:[^\'\r\n]* "\'" { return chars.join(""); }
 
+
+hex_digit
+ = [0-9a-f]i
+
+nonascii
+ = [\x80-\uFFFF]
+
+unicode
+ = "\\" digits:$(hex_digit hex_digit? hex_digit? hex_digit? hex_digit? hex_digit?) ("\r\n" / [ \t\r\n\f])? {
+ return String.fromCharCode(parseInt(digits, 16));
+ }
+
+escape
+ = unicode
+ / "\\" char:[^\r\n\f0-9a-f]i { return char; }
+
+nmchar
+ = [_a-z0-9-]i
+ / nonascii
+ / escape
+
+
 // Partials
 
 // wooga
 ident "identifier"
- = chars:[a-z0-9-_]i+ { return chars.join(""); }
+ = chars:nmchar+ { return chars.join(""); }
 
 global_keyword "global"
  = "global"