Merge v1.4.x into master (v1.5.x)

Strumenta · Feb 27, 2024 · 69816ac · 69816ac
1 parent 9ad5372
commit 69816ac
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 All notable changes to this project from version 1.2.0 upwards are documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [1.5.8] – 2024-03-27
+
+Included all the changes in the 1.4.x branch (versions 1.4.7 and 1.4.8).
+
 ## [1.5.7] – 2024-01-15
 
 ### Added

diff --git a/jest.config.js b/jest.config.js
@@ -19,8 +19,8 @@ const config = {
     // Note: we have several deprecated functions that reduce coverage
     global: {
       statements: 88,
-      branches: 80,
-      functions: 77,
+      branches: 81,
+      functions: 76,
       lines: 88,
     },
   },

diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
 	"description": "AST building blocks for TypeScript/JavaScript, part of the *lasu family, with optional integrations with ANTLR4 and Ecore.",
 	"author": "Strumenta s.r.l.",
 	"publisher": "strumenta",
-	"version": "1.5.7",
+	"version": "1.5.8",
 	"license": "Apache-2.0",
 	"keywords": [
 		"antlr",

diff --git a/src/index.ts b/src/index.ts
@@ -3,9 +3,9 @@
  * may require additional dependencies.
  * @module core
  */
-export * from './model/position';
-export * from './model/model';
-export * from './model/errors';
+export * from "./model/position";
+export * from "./model/model";
+export * from "./model/errors";
 export * from "./model/naming";
 export * from "./model/processing";
 export * from "./traversing/structurally";

diff --git a/src/interop/ecore.ts b/src/interop/ecore.ts
@@ -388,7 +388,7 @@ Node.prototype[TO_EOBJECT_SYMBOL] = function(): ECore.EObject {
 }
 
 Position.prototype[TO_EOBJECT_SYMBOL] = function(): ECore.EObject {
-    const pos = THE_POSITION_ECLASS.create();
+    const pos = THE_POSITION_ECLASS.create({});
     pos.set("start", THE_POINT_ECLASS.create({
         line: this.start.line, column: this.start.column
     }));

diff --git a/src/interop/starlasu-v2-metamodel.ts b/src/interop/starlasu-v2-metamodel.ts
@@ -1,4 +1,4 @@
-import ECore from "ecore/dist/ecore";
+import ECore from "ecore";
 import {IssueSeverity, IssueType} from "../validation";
 import {addLiteral, getEPackage} from "./ecore-basic";
 
@@ -67,16 +67,16 @@ THE_ORIGIN_ECLASS.get("eStructuralFeatures").add(ECore.EReference.create({
     eType: THE_POSITION_ECLASS,
     containment: true
 }));
-export const THE_SIMPLE_ORIGIN_ECLASS = Ecore.EClass.create({
+export const THE_SIMPLE_ORIGIN_ECLASS = ECore.EClass.create({
     name: "SimpleOrigin"
 });
 THE_SIMPLE_ORIGIN_ECLASS.get("eSuperTypes").add(THE_ORIGIN_ECLASS);
-THE_SIMPLE_ORIGIN_ECLASS.get("eStructuralFeatures").add(Ecore.EAttribute.create({
+THE_SIMPLE_ORIGIN_ECLASS.get("eStructuralFeatures").add(ECore.EAttribute.create({
     name: "sourceText",
-    eType: Ecore.EString,
+    eType: ECore.EString,
     lowerBound: 0
 }));
-THE_SIMPLE_ORIGIN_ECLASS.get("eStructuralFeatures").add(Ecore.EReference.create({
+THE_SIMPLE_ORIGIN_ECLASS.get("eStructuralFeatures").add(ECore.EReference.create({
     name: "position",
     eType: THE_POSITION_ECLASS,
     lowerBound: 0,

diff --git a/tests/interop/workspace-transpilation-trace.test.ts b/tests/interop/workspace-transpilation-trace.test.ts
@@ -119,9 +119,8 @@ describe('Workspace Transpilation traces', function() {
             });
     it("Can load workspace transpilation trace produced by Kolasu with SimpleOrigin instances",
         function () {
-            this.timeout(0);
-            Ecore.EPackage.Registry.register(THE_AST_EPACKAGE);
-            Ecore.EPackage.Registry.register(TRANSPILATION_EPACKAGE);
+            ECore.EPackage.Registry.register(THE_AST_EPACKAGE);
+            ECore.EPackage.Registry.register(TRANSPILATION_EPACKAGE);
             const loader = new TranspilationTraceLoader({
                 name: "rpg2java",
                 uri: "file://tests/data/playground/rpg/rpg2java-metamodels.json",

diff --git a/tests/mapping.test.ts b/tests/mapping.test.ts
@@ -106,6 +106,7 @@ describe('ParseTreeToASTTransformer', function () {
         const code = "set foo = \ndisplay @@@";
         const lexer = new SimpleLangLexer(CharStreams.fromString(code));
         const parser = new SimpleLangParser(new CommonTokenStream(lexer));
+        parser.removeErrorListeners();
         const pt = parser.compilationUnit();
         expect(parser.numberOfSyntaxErrors).to.equal(2);
 

diff --git a/yarn.lock b/yarn.lock
@@ -737,7 +737,7 @@
   resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.11.tgz#e95050bf79a932cb7305dd130254ccdf9bde671c"
   integrity sha512-qQR1dr2rGIHYlJulmr8Ioq3De0Le9E4MJ5AiaeAETJJpndT1uUNHsGFK3L/UIu+rbkQSdj8J/w2bCsBZc/Y5fQ==
 
-"@types/ecore@^0.12.3":
+"@types/ecore@^0.12.5":
   version "0.12.5"
   resolved "https://registry.yarnpkg.com/@types/ecore/-/ecore-0.12.5.tgz#ca8b858dde9b6618d11a02fd2c6a90de52b56be6"
   integrity sha512-5jXAxP+QJzWct7P9w/5OFful/rQ/sqA6JuceVGgcubIIDd9HfwAujqPsIwxGZZj9N+BHf3kJmzCikK5OKF07UA==
@@ -2767,10 +2767,10 @@ shebang-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
-shiki@^0.14.1:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/shiki/-/shiki-0.14.5.tgz#375dd214e57eccb04f0daf35a32aa615861deb93"
-  integrity sha512-1gCAYOcmCFONmErGTrS1fjzJLA7MGZmKzrBNX7apqSwhyITJg2O102uFzXUeBxNnEkDA9vHIKLyeKq0V083vIw==
+shiki@^0.14.7:
+  version "0.14.7"
+  resolved "https://registry.yarnpkg.com/shiki/-/shiki-0.14.7.tgz#c3c9e1853e9737845f1d2ef81b31bcfb07056d4e"
+  integrity sha512-dNPAPrxSc87ua2sKJ3H5dQ/6ZaY8RNnaAqK+t0eG7p0Soi2ydiqbGOTaZCqaYvA/uZYfS1LJnemt3Q+mSfcPCg==
   dependencies:
     ansi-sequence-parser "^1.1.0"
     jsonc-parser "^3.2.0"
@@ -2989,15 +2989,15 @@ type-fest@^0.21.3:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
   integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
 
-typedoc@^0.25.4:
-  version "0.25.4"
-  resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.25.4.tgz#5c2c0677881f504e41985f29d9aef0dbdb6f1e6f"
-  integrity sha512-Du9ImmpBCw54bX275yJrxPVnjdIyJO/84co0/L9mwe0R3G4FSR6rQ09AlXVRvZEGMUg09+z/usc8mgygQ1aidA==
+typedoc@^0.25.7:
+  version "0.25.9"
+  resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.25.9.tgz#0fb6608feec994eedc1e3276154fa8a486218ed2"
+  integrity sha512-jVoGmfNw848iW0L313+jqHbsknepwDV6F9nzk1H30oWhKXkw65uaENgR6QtTw9a5KqRWEb6nwNd54KxffBJyWw==
   dependencies:
     lunr "^2.3.9"
     marked "^4.3.0"
     minimatch "^9.0.3"
-    shiki "^0.14.1"
+    shiki "^0.14.7"
 
 typescript@^5.3.2:
   version "5.3.3"