Fix parser packaging

Blazebit · Feb 15, 2021 · 4f6c8d4 · 4f6c8d4
1 parent fead5d2
commit 4f6c8d4
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 49 deletions.
diff --git a/editor/monaco/package-lock.json b/editor/monaco/package-lock.json
diff --git a/editor/monaco/package.json b/editor/monaco/package.json
@@ -20,7 +20,6 @@
  "devDependencies": {
  "@types/chai": "^4.2.11",
  "@types/mocha": "^7.0.2",
- "blaze-expression-predicate": "file:./target/blaze-expression-predicate/",
  "chai": "4.1.2",
  "css-loader": "^3.5.3",
  "esm": "^3.2.25",

diff --git a/editor/monaco/pom.xml b/editor/monaco/pom.xml
@@ -76,11 +76,6 @@
  <include name="*.g4" />
  </fileset>
  </copy>
- <copy todir="${project.build.directory}/blaze-expression-predicate">
- <fileset dir="${project.basedir}/src/main/antlr4">
- <include name="*.json" />
- </fileset>
- </copy>
  </target>
  </configuration>
  <goals>
@@ -171,10 +166,13 @@
  <goal>copy-resources</goal>
  </goals>
  <configuration>
- <outputDirectory>${basedir}/dist/blaze-expression-predicate</outputDirectory>
+ <outputDirectory>${basedir}/dist</outputDirectory>
  <resources>
  <resource>
  <directory>${project.build.directory}/blaze-expression-predicate</directory>
+ <includes>
+ <include>**/*.js</include>
+ </includes>
  </resource>
  </resources>
  </configuration>

diff --git a/editor/monaco/src/main/antlr4/package.json b/editor/monaco/src/main/antlr4/package.json
diff --git a/editor/monaco/src/main/typescript/index.ts b/editor/monaco/src/main/typescript/index.ts
@@ -37,9 +37,9 @@ import {
 import {CommonTokenStream, error, InputStream, Parser, ParserRuleContext, Token} from 'antlr4/index.js'
 import {TerminalNode} from 'antlr4/tree/Tree.js'
 import {DefaultErrorStrategy} from 'antlr4/error/ErrorStrategy.js'
-import {BlazeExpressionLexer} from "blaze-expression-predicate/BlazeExpressionLexer.js"
-import {BlazeExpressionParser} from "blaze-expression-predicate/BlazeExpressionParser.js"
-import {BlazeExpressionParserVisitor} from "blaze-expression-predicate/BlazeExpressionParserVisitor.js"
+import {BlazeExpressionLexer} from "./BlazeExpressionLexer.js"
+import {BlazeExpressionParser} from "./BlazeExpressionParser.js"
+import {BlazeExpressionParserVisitor} from "./BlazeExpressionParserVisitor.js"
 
 let symbolTables: StringMap<SymbolTable> = {};
 
@@ -1114,15 +1114,15 @@ class CollectorErrorListener extends error.ErrorListener {
 
 }
 
-export function createLexer(input: String) {
+function createLexer(input: String) {
  const chars = new InputStream(input);
  const lexer = new BlazeExpressionLexer(chars);
  return lexer;
 }
 
-export function getTokens(input: String) : Token[] {
- return createLexer(input).getAllTokens()
-}
+// function getTokens(input: String) : Token[] {
+//  return createLexer(input).getAllTokens()
+// }
 
 function createParser(input) {
  const lexer = createLexer(input);
@@ -1140,19 +1140,19 @@ function parseTree(input) {
  return parser.parsePredicateOrExpression();
 }
 
-export function parseTreeStr(input) {
- const lexer = createLexer(input);
- lexer.removeErrorListeners();
- lexer.addErrorListener(new ConsoleErrorListener());
-
- const parser = createParserFromLexer(lexer);
- parser.removeErrorListeners();
- parser.addErrorListener(new ConsoleErrorListener());
-
- const tree = parser.parsePredicateOrExpression();
-
- return tree.toStringTree(parser.ruleNames);
-}
+// function parseTreeStr(input) {
+//  const lexer = createLexer(input);
+//  lexer.removeErrorListeners();
+//  lexer.addErrorListener(new ConsoleErrorListener());
+//
+//  const parser = createParserFromLexer(lexer);
+//  parser.removeErrorListeners();
+//  parser.addErrorListener(new ConsoleErrorListener());
+//
+//  const tree = parser.parsePredicateOrExpression();
+//
+//  return tree.toStringTree(parser.ruleNames);
+// }
 
 class BlazeExpressionErrorStrategy extends DefaultErrorStrategy {
 
@@ -1187,7 +1187,7 @@ class BlazeExpressionErrorStrategy extends DefaultErrorStrategy {
 
 }
 
-export function resolveType(input: string, symbolTable: SymbolTable) : DomainType {
+function resolveType(input: string, symbolTable: SymbolTable) : DomainType {
  const lexer = createLexer(input);
  lexer.removeErrorListeners();
  lexer.addErrorListener(new ConsoleErrorListener());
@@ -1204,7 +1204,7 @@ export function resolveType(input: string, symbolTable: SymbolTable) : DomainTyp
  }
 }
 
-export function validate(input: string, symbolTable: SymbolTable, expectedResultTypes: string[], errorMessage: string) : ErrorEntry[] {
+function validate(input: string, symbolTable: SymbolTable, expectedResultTypes: string[], errorMessage: string) : ErrorEntry[] {
  let errors : ErrorEntry[] = [];
 
  const lexer = createLexer(input);

diff --git a/editor/monaco/tsconfig.json b/editor/monaco/tsconfig.json
@@ -4,7 +4,10 @@
  "moduleResolution": "node",
  "declaration": true,
  "target": "es5",
- "outDir": "dist"
+ "outDir": "dist",
+ "rootDirs": [
+ "src/main/typescript", "target/blaze-expression-predicate"
+ ]
  },
  "exclude": [
  "node_modules",