feat: improve line handling in lexer and update snapshots

Fixes #10

Author: KeJunMao

src/core/context/generator.ts

@@ -8,7 +8,7 @@ export class Generator {
   walk(node: SimpleNode): string | void {
     switch (node.type) {
       case 'Program':
-        return node.body.map(this.walk.bind(this)).filter((n: any) => !!n).join('\n')
+        return node.body.map(this.walk.bind(this)).filter((n: any) => !!n && n !== '\r\n').join('')
       case 'CodeStatement':
         return node.value
     }

src/core/context/lexer.ts

@@ -13,11 +13,37 @@ export class Lexer {
     scanner:
     while (this.current < code.length) {
       const startIndex = this.current
-      let endIndex = code.indexOf('\n', startIndex + 1)
-      if (endIndex === -1)
+      // 查找最近的换行符(\r\n, \n, \r)
+      const nextCR = code.indexOf('\r', startIndex)
+      const nextLF = code.indexOf('\n', startIndex)
+      let endIndex: number
+
+      if (nextCR === -1 && nextLF === -1) {
+        // 没有找到换行符，说明是最后一行
         endIndex = code.length
+      }
+      else if (nextCR === -1) {
+        // 只有 \n
+        endIndex = nextLF
+      }
+      else if (nextLF === -1) {
+        // 只有 \r
+        endIndex = nextCR
+      }
+      else if (nextCR < nextLF) {
+        // 如果是 \r\n，跳过 \n
+        endIndex = nextCR
+        if (nextLF === nextCR + 1) {
+          endIndex += 2
+        }
+      }
+      else {
+        // \n
+        endIndex = nextLF
+      }
 
-      const line = code.slice(startIndex, endIndex).trim()
+      const rawLine = code.slice(startIndex, endIndex)
+      const line = rawLine.trim()
       if (isComment(line)) {
         for (const lex of this.lexers) {
           const comment = parseComment(line)
@@ -32,7 +58,7 @@ export class Lexer {
       }
       this.tokens.push({
         type: 'code',
-        value: line,
+        value: rawLine,
       } as CodeToken)
       this.current = endIndex
     }

test/__snapshots__/if.test.ts.snap

@@ -4,64 +4,95 @@ exports[`if > should parse if.css, dev = false 1`] = `
 "body {
 }
 body {
-content: "!DEV";
+  content: "!DEV";
 }
 body {
-content: "!DEV";
+  content: "!DEV";
 }
 body {
-}"
+}
+"
 `;
 
 exports[`if > should parse if.css, dev = true 1`] = `
 "body {
-content: "DEV";
+  content: "DEV";
 }
 body {
-content: "!DEV else";
+  content: "!DEV else";
 }
 body {
-content: "TEST";
+  content: "TEST";
 }
 body {
-content: "else";
-}"
+    content: "else";
+}
+"
 `;
 
 exports[`if > should parse if.html, dev = false 1`] = `
 "<div>!DEV</div>
-<div>!DEV</div>"
+<div>!DEV</div>
+"
 `;
 
 exports[`if > should parse if.html, dev = true 1`] = `
 "<div>DEV</div>
 <div>!DEV else</div>
 <div>TEST</div>
 <div>
-<div>else</div>
-</div>"
+  <div>else</div>
+</div>
+"
 `;
 
 exports[`if > should parse if.js, dev = false 1`] = `
 "console.log('!DEV')
-console.log('!DEV')"
+console.log('!DEV')
+"
 `;
 
 exports[`if > should parse if.js, dev = true 1`] = `
 "console.log('DEV')
 console.log('!DEV else')
 console.log('TEST')
-console.log('else')"
+console.log('else')
+"
 `;
 
 exports[`if > should parse if.jsx, dev = false 1`] = `
 "const Component = () => <div>
-</div>;"
+</div>;
+"
 `;
 
 exports[`if > should parse if.jsx, dev = true 1`] = `
 "const Component = () => <div>
-DEV
-DEV=true
-</div>;"
+    DEV
+    DEV=true
+</div>;
+"
+`;
+
+exports[`if > should parse if.vue, dev = false 1`] = `
+"<script setup lang="ts">
+</script>
+<template>
+    <pre>{
+}</pre>
+</template>
+<style>
+</style>"
+`;
+
+exports[`if > should parse if.vue, dev = true 1`] = `
+"<script setup lang="ts">
+</script>
+<template>
+    <pre>{
+  "data": 'value' // comment
+}</pre>
+</template>
+<style>
+</style>"
 `;

test/fixtures/if.vue

@@ -0,0 +1,15 @@
+<script setup lang="ts">
+
+</script>
+
+<template>
+    <pre>{
+// #if DEV
+  "data": 'value' // comment
+// #endif
+}</pre>
+</template>
+
+<style>
+
+</style>