From 537d5e6ffaa020276c868d721a4cc98103d21a4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Bispo?= Date: Wed, 12 Aug 2026 15:28:16 +0100 Subject: [PATCH 1/2] Moves WeaverConfiguration from jest config to LARA WeaverConfiguration.ts (gpt-5.6-sol high) --- Lara-JS/src-api/jest.config.js | 15 +-------------- Lara-JS/src-code/WeaverConfiguration.ts | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/Lara-JS/src-api/jest.config.js b/Lara-JS/src-api/jest.config.js index 45bf1ead4..c318a5469 100644 --- a/Lara-JS/src-api/jest.config.js +++ b/Lara-JS/src-api/jest.config.js @@ -1,17 +1,4 @@ -import path from "path"; -import { fileURLToPath } from "url"; - -export const weaverConfig = { - weaverName: "DefaultWeaver", - weaverPrettyName: "Default Weaver", - weaverFileName: "@specs-feup/lara/code/Weaver.js", - jarPath: path.join( - path.dirname(path.dirname(path.dirname(fileURLToPath(import.meta.url)))), - "./DefaultWeaver/build/install/DefaultWeaver" - ), - javaWeaverQualifiedName: "org.lara.interpreter.weaver.defaultweaver.DefaultWeaver", -}; - +import { weaverConfig } from "../code/WeaverConfiguration.js"; const config = { preset: "ts-jest/presets/default-esm", diff --git a/Lara-JS/src-code/WeaverConfiguration.ts b/Lara-JS/src-code/WeaverConfiguration.ts index 77fed7965..f18eb58b8 100644 --- a/Lara-JS/src-code/WeaverConfiguration.ts +++ b/Lara-JS/src-code/WeaverConfiguration.ts @@ -1,3 +1,6 @@ +import path from "path"; +import { fileURLToPath } from "url"; + export default interface WeaverConfiguration { /** * Name of the weaver. @@ -35,3 +38,18 @@ export default interface WeaverConfiguration { */ importForSideEffects?: string[]; } + +/** + * Default configuration for packages that require a Lara weaver during setup. + */ +export const weaverConfig: WeaverConfiguration = { + weaverName: "DefaultWeaver", + weaverPrettyName: "Default Weaver", + weaverFileName: "@specs-feup/lara/code/Weaver.js", + jarPath: path.join( + path.dirname(path.dirname(path.dirname(fileURLToPath(import.meta.url)))), + "./DefaultWeaver/build/install/DefaultWeaver" + ), + javaWeaverQualifiedName: + "org.lara.interpreter.weaver.defaultweaver.DefaultWeaver", +}; From c4928c7ec1a1b2c5ccd2cbb16644c63d9b2d0d57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Bispo?= Date: Wed, 12 Aug 2026 15:30:00 +0100 Subject: [PATCH 2/2] Updates Lara-JS version to 3.5.2 --- Lara-JS/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lara-JS/package.json b/Lara-JS/package.json index 3ff4f117e..181d82bc2 100644 --- a/Lara-JS/package.json +++ b/Lara-JS/package.json @@ -1,6 +1,6 @@ { "name": "@specs-feup/lara", - "version": "3.5.1", + "version": "3.5.2", "description": "A js port of the popular framework for building source-to-source compilers", "type": "module", "bin": {