Add more expectations from minifying

Author: Igorbek

src/__tests__/baselines/minification/simple.ts.baseline

@@ -11,51 +11,67 @@ Source code:
   declare const placeholder2: any;
 
   // splits a line by potential comment starts and joins until one is an actual comment
+  // \`abc def\`
   styled.div\`abc def//ghi//jkl\`
 
   // ignores comment markers that are inside strings
+  // \`abc def"//"ghi\\'//\\'jkl\`
   styled.div\`abc def"//"ghi\\'//\\'jkl//the end\`
+  // \`abc def"//"\`
   styled.div\`abc def"//"\`
 
   // ignores comment markers that are inside parantheses
+  // \`bla (//) bla\`
   styled.div\`bla (//) bla//the end\`
 
   // ignores even unescaped URLs
+  // \`https://test.com\`
   styled.div\`https://test.com// comment//\`
 
   // removes multi-line comments
+  // \`this is a test\`
   styled.div\`this is a/* ignore me please */test\`
 
   // joins all lines of code
+  // \`this is a test\`
   styled.div\`this\\nis\\na/* ignore me \\n please */\\ntest\`
 
   // removes line comments filling an entire line
+  // \`line one line two\`
   styled.div\`line one
   // remove this comment
   line two\`
 
   // removes line comments at the end of lines of code
+  // \`valid line with out comments\`
   styled.div\`valid line with // a comment
   out comments\`
 
   // preserves multi-line comments starting with /*!
+  // \`this is a /*! dont ignore me please */ test\`
   styled.div\`this is a /*! dont ignore me please */ test/* but you can ignore me */\`
 
   // returns the indices of removed placeholders (expressions)
+  // \`this is some input with \${placeholder1} and //\${placeholder2}\`
   styled.div\`this is some\\ninput with \${placeholder1} and // ignored \${placeholder2}\`
 
   // works with raw escape codes
+  // \`this\\\\nis\\\\na \\\\ntest\`
   styled.div\`this\\\\nis\\\\na/* ignore me \\\\n please */\\\\ntest\`
+  // \`this\\nis\\na \\ntest\`
   styled.div\`this\\nis\\na/* ignore me \\n please */\\ntest\`
+  // \`this is a test\`
   styled.div\`this
   is
-  a/* ignore me \\n please *
-  ntest\`
+  a/* ignore me \\n please */
+  test\`
 
   // removes spaces around symbols
+  // \`;:{},;\`
   styled.div\`;  :  {  }  ,  ;  \`
 
   // ignores symbols inside strings
+  // \`;" : "\\' : \\';\`
   styled.div\`;   " : " \\' : \\' ;\`
 
 
@@ -65,33 +81,49 @@ TypeScript before transform:
   declare const placeholder1: any;
   declare const placeholder2: any;
   // splits a line by potential comment starts and joins until one is an actual comment
+  // \`abc def\`
   styled.div \`abc def//ghi//jkl\`;
   // ignores comment markers that are inside strings
+  // \`abc def"//"ghi\\'//\\'jkl\`
   styled.div \`abc def"//"ghi'//'jkl//the end\`;
+  // \`abc def"//"\`
   styled.div \`abc def"//"\`;
   // ignores comment markers that are inside parantheses
+  // \`bla (//) bla\`
   styled.div \`bla (//) bla//the end\`;
   // ignores even unescaped URLs
+  // \`https://test.com\`
   styled.div \`https://test.com// comment//\`;
   // removes multi-line comments
+  // \`this is a test\`
   styled.div \`this is a/* ignore me please */test\`;
   // joins all lines of code
+  // \`this is a test\`
   styled.div \`this\\nis\\na/* ignore me \\n please */\\ntest\`;
   // removes line comments filling an entire line
+  // \`line one line two\`
   styled.div \`line one\\n// remove this comment\\nline two\`;
   // removes line comments at the end of lines of code
+  // \`valid line with out comments\`
   styled.div \`valid line with // a comment\\nout comments\`;
   // preserves multi-line comments starting with /*!
+  // \`this is a /*! dont ignore me please */ test\`
   styled.div \`this is a /*! dont ignore me please */ test/* but you can ignore me */\`;
   // returns the indices of removed placeholders (expressions)
+  // \`this is some input with \${placeholder1} and //\${placeholder2}\`
   styled.div \`this is some\\ninput with \${placeholder1} and // ignored \${placeholder2}\`;
   // works with raw escape codes
+  // \`this\\\\nis\\\\na \\\\ntest\`
   styled.div \`this\\\\nis\\\\na/* ignore me \\\\n please */\\\\ntest\`;
+  // \`this\\nis\\na \\ntest\`
+  styled.div \`this\\nis\\na/* ignore me \\n please */\\ntest\`;
+  // \`this is a test\`
   styled.div \`this\\nis\\na/* ignore me \\n please */\\ntest\`;
-  styled.div \`this\\nis\\na/* ignore me \\n please *\\nntest\`;
   // removes spaces around symbols
+  // \`;:{},;\`
   styled.div \`;  :  {  }  ,  ;  \`;
   // ignores symbols inside strings
+  // \`;" : "\\' : \\';\`
   styled.div \`;   " : " ' : ' ;\`;
 
 
@@ -101,33 +133,49 @@ TypeScript after transform:
   declare const placeholder1: any;
   declare const placeholder2: any;
   // splits a line by potential comment starts and joins until one is an actual comment
-  styled.div \`abc def//\`;
+  // \`abc def\`
+  styled.div \`abc def\`;
   // ignores comment markers that are inside strings
-  styled.div \`abc def"//"ghi'//'jkl//\`;
+  // \`abc def"//"ghi\\'//\\'jkl\`
+  styled.div \`abc def"//"ghi'//'jkl\`;
+  // \`abc def"//"\`
   styled.div \`abc def"//"\`;
   // ignores comment markers that are inside parantheses
-  styled.div \`bla (//\`;
+  // \`bla (//) bla\`
+  styled.div \`bla (\`;
   // ignores even unescaped URLs
-  styled.div \`https://\`;
+  // \`https://test.com\`
+  styled.div \`https:\`;
   // removes multi-line comments
+  // \`this is a test\`
   styled.div \`this is atest\`;
   // joins all lines of code
+  // \`this is a test\`
   styled.div \`this is atest\`;
   // removes line comments filling an entire line
+  // \`line one line two\`
   styled.div \`line oneline two\`;
   // removes line comments at the end of lines of code
+  // \`valid line with out comments\`
   styled.div \`valid line without comments\`;
   // preserves multi-line comments starting with /*!
+  // \`this is a /*! dont ignore me please */ test\`
   styled.div \`this is atest\`;
   // returns the indices of removed placeholders (expressions)
+  // \`this is some input with \${placeholder1} and //\${placeholder2}\`
   styled.div \`this is some input with\${placeholder1} and//\${placeholder2}\`;
   // works with raw escape codes
+  // \`this\\\\nis\\\\na \\\\ntest\`
   styled.div \`this\\\\nis\\\\na\\\\ntest\`;
+  // \`this\\nis\\na \\ntest\`
+  styled.div \`this is atest\`;
+  // \`this is a test\`
   styled.div \`this is atest\`;
-  styled.div \`this is a/*\`;
   // removes spaces around symbols
+  // \`;:{},;\`
   styled.div \`;:{},;\`;
   // ignores symbols inside strings
+  // \`;" : "\\' : \\';\`
   styled.div \`;" : "' : ';\`;
 
 

src/__tests__/fixtures/minification/simple.ts

@@ -4,49 +4,65 @@ declare const placeholder1: any;
 declare const placeholder2: any;
 
 // splits a line by potential comment starts and joins until one is an actual comment
+// `abc def`
 styled.div`abc def//ghi//jkl`
 
 // ignores comment markers that are inside strings
+// `abc def"//"ghi\'//\'jkl`
 styled.div`abc def"//"ghi\'//\'jkl//the end`
+// `abc def"//"`
 styled.div`abc def"//"`
 
 // ignores comment markers that are inside parantheses
+// `bla (//) bla`
 styled.div`bla (//) bla//the end`
 
 // ignores even unescaped URLs
+// `https://test.com`
 styled.div`https://test.com// comment//`
 
 // removes multi-line comments
+// `this is a test`
 styled.div`this is a/* ignore me please */test`
 
 // joins all lines of code
+// `this is a test`
 styled.div`this\nis\na/* ignore me \n please */\ntest`
 
 // removes line comments filling an entire line
+// `line one line two`
 styled.div`line one
 // remove this comment
 line two`
 
 // removes line comments at the end of lines of code
+// `valid line with out comments`
 styled.div`valid line with // a comment
 out comments`
 
 // preserves multi-line comments starting with /*!
+// `this is a /*! dont ignore me please */ test`
 styled.div`this is a /*! dont ignore me please */ test/* but you can ignore me */`
 
 // returns the indices of removed placeholders (expressions)
+// `this is some input with ${placeholder1} and //${placeholder2}`
 styled.div`this is some\ninput with ${placeholder1} and // ignored ${placeholder2}`
 
 // works with raw escape codes
+// `this\\nis\\na \\ntest`
 styled.div`this\\nis\\na/* ignore me \\n please */\\ntest`
+// `this\nis\na \ntest`
 styled.div`this\nis\na/* ignore me \n please */\ntest`
+// `this is a test`
 styled.div`this
 is
-a/* ignore me \n please *
-ntest`
+a/* ignore me \n please */
+test`
 
 // removes spaces around symbols
+// `;:{},;`
 styled.div`;  :  {  }  ,  ;  `
 
 // ignores symbols inside strings
+// `;" : "\' : \';`
 styled.div`;   " : " \' : \' ;`

src/minify.ts

@@ -6,7 +6,7 @@ type ReducerResult = { emit?: string; skipEmit?: boolean; state?: State } | void
 type StateMachine = {
     [K in State]: {
         next?(ch: string): ReducerResult;
-        flush?(): ReducerResult;
+        flush?(last: boolean): ReducerResult;
     }
 };
 
@@ -66,7 +66,8 @@ const stateMachine: StateMachine = {
             if (ch == '\n') return { state: ';', skipEmit: true }
             return { skipEmit: true };
         },
-        flush() {
+        flush(last) {
+            if (last) return { skipEmit: true }
             return { state: '//$', emit: '//' }
         }
     },
@@ -82,7 +83,8 @@ const stateMachine: StateMachine = {
             if (ch == '*') return { state: '/**', skipEmit: true }
             return { skipEmit: true };
         },
-        flush() {
+        flush(last) {
+            if (last) return { skipEmit: true }
             return { state: '/*$', emit: '/*' }
         }
     },
@@ -106,10 +108,10 @@ const stateMachine: StateMachine = {
     }
 };
 
-function createMinifier(): (next: string, middle?: boolean) => string {
+function createMinifier(): (next: string, last?: boolean) => string {
     let state: State = ';';
 
-    return (next, middle = false) => {
+    return (next, last = false) => {
         let minified = '';
 
         function apply(result: ReducerResult, ch?: string) {
@@ -135,7 +137,7 @@ function createMinifier(): (next: string, middle?: boolean) => string {
         }
 
         const reducer = stateMachine[state];
-        apply(reducer.flush && reducer.flush());
+        apply(reducer.flush && reducer.flush(last));
 
         return minified;
     }
@@ -153,19 +155,17 @@ export function minifyTemplate(templateLiteral: ts.TemplateLiteral) {
     const minifier = createMinifier();
 
     if (isNoSubstitutionTemplateLiteral(templateLiteral)) {
-        // const sourceMapRange = ts.getSourceMapRange(templateLiteral);
-        const node = ts.createNoSubstitutionTemplateLiteral(minifier(templateLiteral.text));
-        // ts.setSourceMapRange(node, sourceMapRange);
+        const node = ts.createNoSubstitutionTemplateLiteral(minifier(templateLiteral.text, true));
         return node;
     } else if (isTemplateExpression(templateLiteral)) {
         const head = ts.createTemplateHead(minifier(templateLiteral.head.text));
         const templateSpans = templateLiteral.templateSpans.map(span => ts.createTemplateSpan(span.expression,
             span.literal.kind === ts.SyntaxKind.TemplateMiddle
-                ? ts.createTemplateMiddle(minifier(span.literal.text, true))
-                : ts.createTemplateTail(minifier(span.literal.text))));
+                ? ts.createTemplateMiddle(minifier(span.literal.text))
+                : ts.createTemplateTail(minifier(span.literal.text, true))));
         const node = ts.createTemplateExpression(head, templateSpans);
         return node;
     }
 
     return templateLiteral;
-}
+}