fix: upgrade to @hikerpig/moo to solve parser state corruption when…

… parse multiple times
hikerpig · Jan 5, 2022 · dbe9f97 · dbe9f97
1 parent 3e80969
commit dbe9f97
Show file tree

Hide file tree

Showing 8 changed files with 65 additions and 48 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -51,15 +51,28 @@
     "npmClient": "npm",
     "pipeline": {
       "compile": {
-        "dependsOn": ["^compile"],
-        "outputs": ["lib/**", "dist/*"]
+        "dependsOn": [
+          "^compile"
+        ],
+        "outputs": [
+          "lib/**",
+          "dist/*"
+        ]
       },
       "build": {
-        "outputs": ["dist/*", "build/*"]
+        "outputs": [
+          "dist/*",
+          "build/*"
+        ]
       },
       "watch": {
-        "dependsOn": ["^watch"],
-        "outputs": ["lib/**", "dist/*"],
+        "dependsOn": [
+          "^watch"
+        ],
+        "outputs": [
+          "lib/**",
+          "dist/*"
+        ],
         "cache": false
       }
     }

diff --git a/packages/pintora-diagrams/package.json b/packages/pintora-diagrams/package.json
@@ -23,6 +23,7 @@
     "coverage": "npx jest --collect-coverage"
   },
   "dependencies": {
+    "@hikerpig/moo": "^0.5.2-beta.2",
     "@pintora/core": "^0.1.0-alpha.14",
     "@pintora/dagre": "^0.10.0-alpha.0",
     "@pintora/graphlib": "2.2.2",

diff --git a/packages/pintora-diagrams/src/activity/parser.ts b/packages/pintora-diagrams/src/activity/parser.ts
@@ -1,13 +1,10 @@
 import { db } from './db'
-import grammar, { setYY, reset } from './parser/activityDiagram'
+import grammar, { setYY } from './parser/activityDiagram'
 import { genParserWithRules } from '../util/parser-util'
 
 setYY(db)
 
 export const parse = genParserWithRules(grammar, {
-  prepare() {
-    reset()
-  },
   postProcess(results) {
     db.apply(results as any)
     return results

diff --git a/packages/pintora-diagrams/src/activity/parser/activityDiagram.ne b/packages/pintora-diagrams/src/activity/parser/activityDiagram.ne
@@ -1,5 +1,5 @@
 @{%
-import * as moo from 'moo'
+import * as moo from '@hikerpig/moo'
 import { tv, textToCaseInsensitiveRegex, VALID_TEXT_REGEXP, COLOR_REGEXP } from '../../util/parser-shared'
 
 let lexer = moo.compile({
@@ -24,12 +24,6 @@ let yy
 export function setYY(v) {
   yy = v
 }
-
-export function reset() {
-  if (lexer.queuedText) {
-    lexer.queuedText = ''; // this is a tweak for moo.js bug
-  }
-}
 %}
 
 @preprocessor typescript

diff --git a/packages/pintora-diagrams/src/component/parser/componentDiagram.ne b/packages/pintora-diagrams/src/component/parser/componentDiagram.ne
@@ -1,5 +1,5 @@
 @{%
-import * as moo from 'moo'
+import * as moo from '@hikerpig/moo'
 import { tv, VALID_TEXT_REGEXP } from '../../util/parser-shared'
 
 const commonTopRules = {

diff --git a/packages/pintora-diagrams/src/er/parser/erDiagram.ne b/packages/pintora-diagrams/src/er/parser/erDiagram.ne
@@ -1,5 +1,5 @@
 @{%
-import * as moo from 'moo'
+import * as moo from '@hikerpig/moo'
 import { tv, VALID_TEXT_REGEXP } from '../../util/parser-shared'
 
 let lexer = moo.compile({

diff --git a/packages/pintora-diagrams/src/sequence/parser/sequenceDiagram.ne b/packages/pintora-diagrams/src/sequence/parser/sequenceDiagram.ne
@@ -1,5 +1,5 @@
 @{%
-import * as moo from 'moo'
+import * as moo from '@hikerpig/moo'
 import { tv, textToCaseInsensitiveRegex, VALID_TEXT_REGEXP, COLOR_REGEXP } from '../../util/parser-shared'
 
 let lexer = moo.states({