Merge pull request #26 from demike/fix/nomnoml-parser-error

fix: nomnoml parser error
demike · Jun 23, 2023 · 1631b66 · 1631b66
2 parents 1a7a5d5 + 3190590
commit 1631b66
Show file tree

Hide file tree

Showing 4 changed files with 86 additions and 78 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -8,14 +8,14 @@
   },
   "devDependencies": {
     "@types/node": "^18.11.18",
-    "@types/yargs": "^17.0.19"
+    "@types/yargs": "^17.0.24"
   },
   "dependencies": {
     "chalk": "^4.1.2",
-    "nomnoml": "^1.5.3",
-    "ts-morph": "^17.0.1",
-    "typescript": "^4.9.4",
-    "yargs": "^17.6.2"
+    "nomnoml": "^1.6.1",
+    "ts-morph": "^19.0.0",
+    "typescript": "^5.1.3",
+    "yargs": "^17.7.2"
   },
   "scripts": {
     "build": "tsc -p tsconfig.json",

diff --git a/src/core/emitter.ts b/src/core/emitter.ts
@@ -34,7 +34,7 @@ export function emitMemberAssociations(associations?: MemberAssociation[]) {
 
 // utility functions
 function escapeNomnoml(str: string) {
-    return str.replace(/[|\][]/g, '\\$&');
+    return str.replace(/[|\][\#]/g, '\\$&');
 }
 
 function xmlEncode(str: string) {

diff --git a/src/core/templates.ts b/src/core/templates.ts
@@ -85,7 +85,7 @@ function modifierTemplate(modifierFlags: ModifierFlags): string {
     if(modifierFlags & ModifierFlags.Private) {
         retVal = "-" + retVal;
     } else if(modifierFlags & ModifierFlags.Protected) {
-        retVal = "#" + retVal;
+        retVal = "\\#" + retVal;
     } else {
         retVal = "+" + retVal;
     }