Merge pull request #152 from Igorbek/tab-minification

Fix tab minification

Author: Igorbek

src/__tests__/baselines/minification-only/issue142.tsx.baseline

@@ -0,0 +1,40 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`issue142.tsx 1`] = `
+
+File: issue142.tsx
+Source code:
+
+  declare const styled: any;
+  
+  const Header = styled.div\`
+  	display: flex;
+  \\t  align-items: center;
+  	justify-content: space-between;
+  \\t \\t font-weight: 600;
+  	padding: 0.8em 1.6em;\\t \\t
+  	background: peachpuff;
+  \`;
+  
+
+TypeScript before transform:
+
+  declare const styled: any;
+  const Header = styled.div \`
+  	display: flex;
+  \\t  align-items: center;
+  	justify-content: space-between;
+  \\t \\t font-weight: 600;
+  	padding: 0.8em 1.6em;\\t \\t
+  	background: peachpuff;
+  \`;
+  
+
+TypeScript after transform:
+
+  declare const styled: any;
+  const Header = styled.div \`display:flex;align-items:center;justify-content:space-between;font-weight:600;padding:0.8em 1.6em;background:peachpuff;\`;
+  
+
+
+`;

src/__tests__/baselines/minification/issue142.tsx.baseline

@@ -0,0 +1,40 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`issue142.tsx 1`] = `
+
+File: issue142.tsx
+Source code:
+
+  declare const styled: any;
+  
+  const Header = styled.div\`
+  	display: flex;
+  \\t  align-items: center;
+  	justify-content: space-between;
+  \\t \\t font-weight: 600;
+  	padding: 0.8em 1.6em;\\t \\t
+  	background: peachpuff;
+  \`;
+  
+
+TypeScript before transform:
+
+  declare const styled: any;
+  const Header = styled.div \`
+  	display: flex;
+  \\t  align-items: center;
+  	justify-content: space-between;
+  \\t \\t font-weight: 600;
+  	padding: 0.8em 1.6em;\\t \\t
+  	background: peachpuff;
+  \`;
+  
+
+TypeScript after transform:
+
+  declare const styled: any;
+  const Header = styled.div.withConfig({ displayName: "Header" }) \`display:flex;align-items:center;justify-content:space-between;font-weight:600;padding:0.8em 1.6em;background:peachpuff;\`;
+  
+
+
+`;

src/__tests__/fixtures/minification/issue142.tsx

@@ -0,0 +1,10 @@
+declare const styled: any;
+
+const Header = styled.div`
+	display: flex;
+\t  align-items: center;
+	justify-content: space-between;
+\t \t font-weight: 600;
+	padding: 0.8em 1.6em;\t \t
+	background: peachpuff;
+`;

src/minify.ts

@@ -14,11 +14,15 @@ function isSymbol(ch: string) {
     return ch == ';' || ch == ':' || ch == '{' || ch == '}' || ch == ',';
 }
 
+function isSpace(ch: string) {
+    return ch == ' ' || ch == '\n' || ch == '\r' || ch == '\t';
+}
+
 const stateMachine: StateMachine = {
     ';': {
         next(ch) {
             if (ch == '\'' || ch == '"' || ch == '(') return { state: ch }
-            if (ch == ' ' || ch == '\n' || ch == '\r') return { skipEmit: true }
+            if (isSpace(ch)) return { skipEmit: true }
             if (ch == '/') return { state: ';/', skipEmit: true }
             if (isSymbol(ch)) return;
             return { state: 'x' }
@@ -30,7 +34,7 @@ const stateMachine: StateMachine = {
     ';$': { // after placeholder
         next(ch) {
             if (ch == '\'' || ch == '"' || ch == '(') return { state: ch }
-            if (ch == ' ' || ch == '\n' || ch == '\r') return { skipEmit: true, state: ' ' } // we may need a space
+            if (isSpace(ch)) return { skipEmit: true, state: ' ' } // we may need a space
             if (ch == '/') return { state: '/', skipEmit: true }
             if (isSymbol(ch)) return { state: ';' };
             return { state: 'x' }
@@ -39,15 +43,15 @@ const stateMachine: StateMachine = {
     'x': {
         next(ch) {
             if (ch == '\'' || ch == '"' || ch == '(') return { state: ch }
-            if (ch == ' ' || ch == '\n' || ch == '\r') return { state: ' ', skipEmit: true }
+            if (isSpace(ch)) return { state: ' ', skipEmit: true }
             if (ch == '/') return { state: '/', skipEmit: true }
             if (isSymbol(ch)) return { state: ';' };
         }
     },
     ' ': { // may need space
         next(ch) {
             if (ch == '\'' || ch == '"' || ch == '(') return { state: ch, emit: ' ' + ch }
-            if (ch == ' ' || ch == '\n' || ch == '\r') return { state: ' ', skipEmit: true }
+            if (isSpace(ch)) return { state: ' ', skipEmit: true }
             if (ch == '/') return { state: '/', skipEmit: true }
             if (isSymbol(ch)) return { state: ';' };
             return { state: 'x', emit: ' ' + ch };
@@ -59,7 +63,7 @@ const stateMachine: StateMachine = {
     '\n': { // may need new line
         next(ch) {
             if (ch == '\'' || ch == '"' || ch == '(') return { state: ch, emit: '\n' + ch }
-            if (ch == ' ' || ch == '\n' || ch == '\r') return { state: '\n', skipEmit: true }
+            if (isSpace(ch)) return { state: '\n', skipEmit: true }
             if (ch == '/') return { state: '/', emit: '\n' }
             if (isSymbol(ch)) return { state: ';', emit: '\n' + ch };
             return { state: 'x', emit: '\n' + ch };