bobe 0.0.41 → 0.0.42

package/dist/index.d.ts

@@ -347,6 +347,7 @@ declare class Tokenizer {
     private dent;
     private shorterThanBaseDentEof;
     private identifier;
+    private getStr;
     private str;
     private number;
     private eof;

package/dist/index.umd.js

@@ -227,7 +227,7 @@
       if (!this.token) return false;
       return this.token.type & TokenType.Identifier && this.token.value === Tokenizer.EofId;
     }
-    setToken(type, value) {
+    setToken(type, value, dt = 1) {
       this.token = {
         type,
         typeName: TokenType[type],
@@ -330,23 +330,19 @@
     condExp() {
       let value = '';
       this.token = null;
-      try {
-        if (this.code[this.i] === '\n') {
-          this.setToken(TokenType.Identifier, true);
-          return this.token;
-        }
-        while (this.code[this.i + 1] !== '\n') {
-          value += this.code[this.i];
-          this.next();
+      let char = this.code[this.i];
+      while (char !== '\n') {
+        if (char === '"' || char === "'") {
+          value += char + this.getStr(char);
         }
         value += this.code[this.i];
-        const trimmed = value.replace(/\/\/[\s\S]+/, '').trim();
-        this.setToken(TokenType.Identifier, trimmed ? trimmed : true);
-        return this.token;
-      } finally {
         this.next();
-        this.handledTokens.push(this.token);
+        char = this.code[this.i];
       }
+      const trimmed = value.replace(/\/\/[\s\S]+/, '').trim();
+      this.setToken(TokenType.Identifier, trimmed ? trimmed : true, 0);
+      this.handledTokens.push(this.token);
+      return this.token;
     }
     isEol(i) {
       return this.code[i] === '\n' || this.code[i] === '/';
@@ -354,25 +350,18 @@
     jsExp() {
       this.token = null;
       let value = '';
-      try {
-        const char = this.code[this.i];
-        if (char === ';' || char === '\n') {
-          this.setToken(TokenType.Identifier, value);
-          return this.token;
-        }
-        let nextC = this.code[this.i + 1];
-        while (nextC !== ';' && nextC !== '\n') {
-          value += this.code[this.i];
-          this.next();
-          nextC = this.code[this.i + 1];
+      let char = this.code[this.i];
+      while (char !== ';' && char !== '\n') {
+        if (char === '"' || char === "'") {
+          value += char + this.getStr(char);
         }
         value += this.code[this.i];
-        this.setToken(TokenType.Identifier, value);
-        return this.token;
-      } finally {
         this.next();
-        this.handledTokens.push(this.token);
+        char = this.code[this.i];
       }
+      this.setToken(TokenType.Identifier, value, 0);
+      this.handledTokens.push(this.token);
+      return this.token;
     }
     peekChar() {
       let i = this.i;
@@ -430,10 +419,8 @@
         startLine = this.line,
         startCol = this.preCol;
       let inComment,
-        inString,
         count = 0,
-        value = '',
-        backslashCount = 0;
+        value = '';
       while (1) {
         const char = this.code[this.i];
         if (char === undefined) {
@@ -446,11 +433,6 @@
           inComment = null;
           value += this.code[this.i];
           this.next();
-        } else if (inString) {
-          if (char === inString && backslashCount % 2 === 0) {
-            inString = null;
-          }
-          backslashCount = char === '\\' ? backslashCount + 1 : 0;
         } else {
           if (char === '/' && nextChar === '/') {
             inComment = 'single';
@@ -460,15 +442,15 @@
             inComment = 'multi';
             value += this.code[this.i];
             this.next();
-          } else if (char === "'" || char === '"' || char === '`') {
-            inString = char;
+          } else if (char === "'" || char === '"') {
+            value += char + this.getStr(char);
           } else if (char === '{') {
             count++;
           } else if (char === '}') {
             count--;
           }
         }
-        if (count === 0 && inString == null && inComment == null) {
+        if (count === 0 && inComment == null) {
           return value.slice(1);
         }
         value += this.code[this.i];
@@ -664,7 +646,7 @@
       }
       this.setToken(tokenType, realValue);
     }
-    str(char) {
+    getStr(head, parseEscape = true) {
       const startOffset = this.preI,
         startLine = this.line,
         startCol = this.preCol;
@@ -683,11 +665,20 @@
           continuousBackslashCount = 0;
         }
         this.next();
-        if (nextC === char && memoCount % 2 === 0) {
+        if (nextC === head && memoCount % 2 === 0) {
           break;
         }
-        value += nextC;
+        const mapped = bobeShared.escapeMap[nextC];
+        if (parseEscape && mapped) {
+          value += mapped;
+        } else {
+          value += nextC;
+        }
       }
+      return value;
+    }
+    str(char) {
+      const value = this.getStr(char, false);
       this.setToken(TokenType.String, value);
     }
     number(char) {
@@ -1127,7 +1118,7 @@
     }
     parseLoopNode(node) {
       const forLoc = this.tokenizer.token.loc ?? this.tokenizer.emptyLoc();
-      this.tokenizer.nextToken();
+      this.tokenizer.jsExp();
       const collection = this.parseJsExp();
       if (!collection.value && collection.value !== 0) {
         this.addError(ParseErrorCode.MISSING_FOR_COLLECTION, '"for" 缺少集合表达式', forLoc, node);
@@ -1588,7 +1579,7 @@
       return _node;
     }
     forDeclaration() {
-      const arrExp = this.tokenizer.nextToken().value;
+      const arrExp = this.tokenizer.jsExp().value;
       this.tokenizer.nextToken();
       const itemToken = this.tokenizer.nextToken();
       const isDestruct = itemToken.type === TokenType.InsertionExp;