@wdprlib/parser 2.0.4 → 2.0.7

package/dist/index.cjs

@@ -167,6 +167,14 @@ class Lexer {
     }
     return result;
   }
+  lastNonWhitespaceTokenType() {
+    for (let i = this.state.tokens.length - 1;i >= 0; i--) {
+      const t = this.state.tokens[i];
+      if (t.type !== "WHITESPACE")
+        return t.type;
+    }
+    return null;
+  }
   addToken(type, value) {
     const startPos = import_ast.createPoint(this.state.line, this.state.column - value.length, this.state.pos - value.length);
     const endPos = import_ast.createPoint(this.state.line, this.state.column, this.state.pos);
@@ -436,15 +444,21 @@ class Lexer {
       return;
     }
     if (char === '"') {
-      let quoted = this.advance();
-      while (!this.isAtEnd() && this.current() !== '"' && this.current() !== `
+      const lastNonWs = this.lastNonWhitespaceTokenType();
+      if (lastNonWs === "EQUALS") {
+        let quoted = this.advance();
+        while (!this.isAtEnd() && this.current() !== '"' && this.current() !== `
 `) {
-        quoted += this.advance();
-      }
-      if (this.current() === '"') {
-        quoted += this.advance();
+          quoted += this.advance();
+        }
+        if (this.current() === '"') {
+          quoted += this.advance();
+        }
+        this.addToken("QUOTED_STRING", quoted);
+        return;
       }
-      this.addToken("QUOTED_STRING", quoted);
+      this.advance();
+      this.addToken("TEXT", '"');
       return;
     }
     if (char === ":") {
@@ -5891,10 +5905,9 @@ var linkTripleRule = {
       };
     }
     let finalTarget = trimmedTarget;
-    if (trimmedTarget === "*" && foundPipe) {
-      finalTarget = "";
-    }
-    if (trimmedTarget.startsWith("*") && !foundPipe) {
+    let hasStar = false;
+    if (trimmedTarget.startsWith("*")) {
+      hasStar = true;
       finalTarget = trimmedTarget.slice(1);
     }
     const { linkType, link } = determineLinkTypeAndLocation(finalTarget);
@@ -5904,7 +5917,7 @@ var linkTripleRule = {
       displayText = trimmedLabel || finalTarget;
     } else {
       const colonIdx = trimmedTarget.indexOf(":");
-      if (colonIdx !== -1 && !trimmedTarget.startsWith("http")) {
+      if (colonIdx !== -1 && !trimmedTarget.startsWith("http") && !trimmedTarget.startsWith("*")) {
         displayText = trimmedTarget.slice(colonIdx + 1).trim();
       } else {
         displayText = trimmedTarget;
@@ -5921,7 +5934,7 @@ var linkTripleRule = {
             link,
             extra: null,
             label,
-            target: null
+            target: hasStar && linkType === "direct" ? "new-tab" : null
           }
         }
       ],

package/dist/index.d.cts

@@ -110,6 +110,10 @@ declare class Lexer {
 	*/
 	private advance;
 	/**
+	* Returns the type of the last non-whitespace token, or null if none.
+	*/
+	private lastNonWhitespaceTokenType;
+	/**
 	* Add token
 	*/
 	private addToken;

package/dist/index.d.ts

@@ -110,6 +110,10 @@ declare class Lexer {
 	*/
 	private advance;
 	/**
+	* Returns the type of the last non-whitespace token, or null if none.
+	*/
+	private lastNonWhitespaceTokenType;
+	/**
 	* Add token
 	*/
 	private addToken;

package/dist/index.js

@@ -112,6 +112,14 @@ class Lexer {
     }
     return result;
   }
+  lastNonWhitespaceTokenType() {
+    for (let i = this.state.tokens.length - 1;i >= 0; i--) {
+      const t = this.state.tokens[i];
+      if (t.type !== "WHITESPACE")
+        return t.type;
+    }
+    return null;
+  }
   addToken(type, value) {
     const startPos = createPoint(this.state.line, this.state.column - value.length, this.state.pos - value.length);
     const endPos = createPoint(this.state.line, this.state.column, this.state.pos);
@@ -381,15 +389,21 @@ class Lexer {
       return;
     }
     if (char === '"') {
-      let quoted = this.advance();
-      while (!this.isAtEnd() && this.current() !== '"' && this.current() !== `
+      const lastNonWs = this.lastNonWhitespaceTokenType();
+      if (lastNonWs === "EQUALS") {
+        let quoted = this.advance();
+        while (!this.isAtEnd() && this.current() !== '"' && this.current() !== `
 `) {
-        quoted += this.advance();
-      }
-      if (this.current() === '"') {
-        quoted += this.advance();
+          quoted += this.advance();
+        }
+        if (this.current() === '"') {
+          quoted += this.advance();
+        }
+        this.addToken("QUOTED_STRING", quoted);
+        return;
       }
-      this.addToken("QUOTED_STRING", quoted);
+      this.advance();
+      this.addToken("TEXT", '"');
       return;
     }
     if (char === ":") {
@@ -5836,10 +5850,9 @@ var linkTripleRule = {
       };
     }
     let finalTarget = trimmedTarget;
-    if (trimmedTarget === "*" && foundPipe) {
-      finalTarget = "";
-    }
-    if (trimmedTarget.startsWith("*") && !foundPipe) {
+    let hasStar = false;
+    if (trimmedTarget.startsWith("*")) {
+      hasStar = true;
       finalTarget = trimmedTarget.slice(1);
     }
     const { linkType, link } = determineLinkTypeAndLocation(finalTarget);
@@ -5849,7 +5862,7 @@ var linkTripleRule = {
       displayText = trimmedLabel || finalTarget;
     } else {
       const colonIdx = trimmedTarget.indexOf(":");
-      if (colonIdx !== -1 && !trimmedTarget.startsWith("http")) {
+      if (colonIdx !== -1 && !trimmedTarget.startsWith("http") && !trimmedTarget.startsWith("*")) {
         displayText = trimmedTarget.slice(colonIdx + 1).trim();
       } else {
         displayText = trimmedTarget;
@@ -5866,7 +5879,7 @@ var linkTripleRule = {
             link,
             extra: null,
             label,
-            target: null
+            target: hasStar && linkType === "direct" ? "new-tab" : null
           }
         }
       ],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wdprlib/parser",
-  "version": "2.0.4",
+  "version": "2.0.7",
   "description": "Parser for Wikidot markup",
   "keywords": [
     "ast",