Skip to content

Commit 7ddf9ae

Browse files
committed
#65 properly export assertASTsAreEqual
1 parent db40528 commit 7ddf9ae

File tree

4 files changed

+19
-15
lines changed

4 files changed

+19
-15
lines changed

package.json

+11-5
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,14 @@
3535
"types": "./dist/types/parsing/index.d.ts"
3636
},
3737
"./mapping": {
38-
"import": "./dist/esm/mapping.js",
39-
"require": "./dist/cjs/mapping.js",
40-
"types": "./dist/types/mapping.d.ts"
38+
"import": "./dist/esm/mapping/mapping.js",
39+
"require": "./dist/cjs/mapping/mapping.js",
40+
"types": "./dist/types/mapping/mapping.d.ts"
41+
},
42+
"./testing": {
43+
"import": "./dist/esm/testing/testing.js",
44+
"require": "./dist/cjs/testing/testing.js",
45+
"types": "./dist/types/testing/testing.d.ts"
4146
},
4247
"./interop/ecore": {
4348
"import": "./dist/esm/interop/ecore.js",
@@ -63,7 +68,8 @@
6368
"typesVersions": {
6469
"*": {
6570
"parsing": ["dist/types/parsing/index.d.ts"],
66-
"mapping": ["dist/types/mapping.d.ts"],
71+
"mapping": ["dist/types/mapping/mapping.d.ts"],
72+
"testing": ["dist/types/testing/testing.d.ts"],
6773
"interop/ecore": ["dist/types/interop/ecore.d.ts"],
6874
"interop/lionweb": ["dist/types/interop/lionweb.d.ts"],
6975
"interop/ecore-enabled-parser": ["dist/types/interop/ecore-enabled-parser.d.ts"],
@@ -106,7 +112,7 @@
106112
"build": "yarn run build:esm && yarn run build:cjs",
107113
"build:esm": "tsc --module es6 --outDir dist/esm",
108114
"build:cjs": "tsc --module commonjs --outDir dist/cjs",
109-
"extract-docs": "typedoc --out dist/docs src/index.ts src/parsing/index.ts src/mapping.ts src/interop/ecore.ts src/interop/ecore-enabled-parser.ts src/interop/lionweb.ts",
115+
"extract-docs": "typedoc --out dist/docs src/index.ts src/parsing/index.ts src/mapping/mapping.ts src/testing/testing.ts src/interop/ecore.ts src/interop/ecore-enabled-parser.ts src/interop/lionweb.ts",
110116
"lint": "eslint src tests",
111117
"build-test-parser": "antlr4ng -Dlanguage=TypeScript -o tests/parser -Xexact-output-dir -visitor tests/grammar/SimpleLangLexer.g4 tests/grammar/SimpleLangParser.g4",
112118
"test": "yarn run build-test-parser && node --experimental-vm-modules node_modules/jest/bin/jest.js",

src/interop/antlr4.ts

+2-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,5 @@
22
* ANTLR4 interoperability module. Requires the antlr4ng implementation.
33
* @module interop/antlr4
44
*/
5-
export * from '../parsing/parse-tree';
6-
export * from '../parsing/parsing';
7-
export * from "../mapping";
8-
export {TylasuParser} from "../parsing";
5+
export * from '../parsing';
6+
export * from "../mapping/mapping";

src/mapping.ts src/mapping/mapping.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import {ParserRuleContext, TerminalNode} from "antlr4ng";
2-
import {Node, Origin} from "./model/model";
3-
import {ASTTransformer} from "./transformation/transformation";
4-
import {ParseTreeOrigin} from "./parsing";
5-
import {Issue} from "./validation";
6-
import {Source} from "./model/position";
2+
import {Node, Origin} from "../model/model";
3+
import {ASTTransformer} from "../transformation/transformation";
4+
import {ParseTreeOrigin} from "../parsing";
5+
import {Issue} from "../validation";
6+
import {Source} from "../model/position";
77

88

99
/**

tests/mapping.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {SimpleLangLexer} from "./parser/SimpleLangLexer";
55
import {CharStream, CommonTokenStream, ParserRuleContext} from "antlr4ng";
66
import {CompilationUnitContext, DisplayStmtContext, SetStmtContext, SimpleLangParser} from "./parser/SimpleLangParser";
77
import {ParseTreeOrigin} from "../src/parsing";
8-
import {ParseTreeToASTTransformer} from "../src/mapping";
8+
import {ParseTreeToASTTransformer} from "../src/mapping/mapping";
99
import {assertASTsAreEqual} from "../src/testing/testing";
1010

1111
class MySetStatement extends Node {

0 commit comments

Comments
 (0)