Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .vscode/extensions.json

This file was deleted.

3 changes: 0 additions & 3 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,4 @@
"cmake.ignoreCMakeListsMissing": true,
"java.compile.nullAnalysis.mode": "automatic",
"java.configuration.updateBuildConfiguration": "automatic",
"jest.runMode": {
"type": "on-demand"
},
}
1 change: 1 addition & 0 deletions Lara-JS/.npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
engine-strict=true
2 changes: 1 addition & 1 deletion Lara-JS/api/LaraJoinPoint.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// This file is generated by build-LaraJoinPoint.ts //
//////////////////////////////////////////////////////

/* eslint-disable @typescript-eslint/no-explicit-any */
/* oxlint-disable typescript/no-explicit-any */

import JavaTypes from "./lara/util/JavaTypes.ts";

Expand Down
14 changes: 10 additions & 4 deletions Lara-JS/api/LegacyIntegrationTests - API.test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { WeaverLegacyTester } from "../jest/WeaverLegacyTester.ts";
import { WeaverLegacyTester } from "../vitest/WeaverLegacyTester.ts";
import path from "path";
import PrintOnce from "./lara/util/PrintOnce.ts";

/* eslint-disable jest/expect-expect */
/* oxlint-disable vitest/expect-expect */
describe("ApiTest", () => {
function newTester() {
return new WeaverLegacyTester(
Expand Down Expand Up @@ -29,7 +30,7 @@ describe("ApiTest", () => {
await newTester().test("LaraCoreTest.js");
});

it.failing("LocalFolder", async () => {
it.fails("LocalFolder", async () => {
await newTester().test("LocalFolderTest.js");
});

Expand Down Expand Up @@ -124,7 +125,12 @@ describe("ApiTest - Util", () => {
});

it("PrintOnce", async () => {
await newTester().test("PrintOnceTest.js");
{
await newTester().test("PrintOnceTest.js");
}

// Clear the PrintOnce messagesSet to avoid affecting other tests
PrintOnce.messagesSet.clear();
});

it("Random", async () => {
Expand Down
6 changes: 3 additions & 3 deletions Lara-JS/api/LegacyIntegrationTests - JsEngine.test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { WeaverLegacyTester } from "../jest/WeaverLegacyTester.ts";
import { WeaverLegacyTester } from "../vitest/WeaverLegacyTester.ts";
import path from "path";

/* eslint-disable jest/expect-expect */
/* oxlint-disable vitest/expect-expect */
describe("JsEngine", () => {
function newTester() {
return new WeaverLegacyTester(
Expand All @@ -22,7 +22,7 @@ describe("JsEngine", () => {
}

expect(err).toBeInstanceOf(Error);
// eslint-disable-next-line @typescript-eslint/no-explicit-any
// oxlint-disable-next-line typescript/no-explicit-any
expect((err as any).message).toContain("throwing exception in bar()");
});
});
4 changes: 2 additions & 2 deletions Lara-JS/api/LegacyIntegrationTests - Weaver.test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { WeaverLegacyTester } from "../jest/WeaverLegacyTester.ts";
import { WeaverLegacyTester } from "../vitest/WeaverLegacyTester.ts";
import path from "path";

/* eslint-disable jest/expect-expect */
/* oxlint-disable vitest/expect-expect */
describe("Weaver", () => {
function newTester() {
return new WeaverLegacyTester(
Expand Down
29 changes: 0 additions & 29 deletions Lara-JS/api/jest.config.ts

This file was deleted.

4 changes: 2 additions & 2 deletions Lara-JS/api/lara/benchmark/BenchmarkInstance.ts
Original file line number Diff line number Diff line change
Expand Up @@ -218,14 +218,14 @@ export default abstract class BenchmarkInstance {
*/
test(
worker: (instance: BenchmarkInstance) => boolean = (
// eslint-disable-next-line @typescript-eslint/no-unused-vars
// oxlint-disable-next-line typescript/no-unused-vars
_instance: BenchmarkInstance
) => {
return true;
},
executeCode: boolean = false,
outputProcessor: (executor: ProcessExecutor) => void = (
// eslint-disable-next-line @typescript-eslint/no-unused-vars
// oxlint-disable-next-line typescript/no-unused-vars
_executor: ProcessExecutor
) => {}
): boolean {
Expand Down
4 changes: 2 additions & 2 deletions Lara-JS/api/lara/benchmark/BenchmarkSet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,14 @@ export default abstract class BenchmarkSet {
*/
test(
worker: Parameters<BenchmarkInstance["test"]>[0] = (
// eslint-disable-next-line @typescript-eslint/no-unused-vars
// oxlint-disable-next-line typescript/no-unused-vars
_instance: BenchmarkInstance
) => {
return true;
},
executeCode: Parameters<BenchmarkInstance["test"]>[1] = false,
outputProcessor: Parameters<BenchmarkInstance["test"]>[2] = (
// eslint-disable-next-line @typescript-eslint/no-unused-vars
// oxlint-disable-next-line typescript/no-unused-vars
_executor: ProcessExecutor
) => {}
): string[] {
Expand Down
2 changes: 1 addition & 1 deletion Lara-JS/api/lara/metrics/FileSizeMetric.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export default class FileSizeMetric extends Metric {
super("File Size");
}

// eslint-disable-next-line @typescript-eslint/no-unused-vars
// oxlint-disable-next-line typescript/no-unused-vars
instrument($start: LaraJoinPoint, $end: LaraJoinPoint = $start) {}

// Override
Expand Down
2 changes: 1 addition & 1 deletion Lara-JS/api/lara/pass/AdapterPass.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class AdapterPass extends SimplePass {
}
}

// eslint-disable-next-line @typescript-eslint/no-namespace
// oxlint-disable-next-line typescript/no-namespace
namespace AdapterPass {
/**
* @param name - Name of the pass
Expand Down
2 changes: 1 addition & 1 deletion Lara-JS/api/lara/pass/results/PassResult.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ class PassResult {
}
}

// eslint-disable-next-line @typescript-eslint/no-namespace
// oxlint-disable-next-line typescript/no-namespace
namespace PassResult {
export interface PassResultParams {
/**
Expand Down
4 changes: 4 additions & 0 deletions Lara-JS/api/lara/util/IdGenerator.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
import IdGenerator, { IdGeneratorClass } from "./IdGenerator.ts";

describe("IdGenerator", () => {
afterEach(() => {
IdGenerator.idCounter.clear();
});

describe("IdGenerator", () => {
it("should generate ids with the correct sequence", () => {
const id1 = IdGenerator.next("test");
Expand Down
6 changes: 3 additions & 3 deletions Lara-JS/api/lara/util/JavaTypes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ import java from "java";

export const NodeJavaPrefix = "nodeJava_";

// eslint-disable-next-line @typescript-eslint/no-namespace
// oxlint-disable-next-line typescript/no-namespace
export namespace JavaClasses {
export interface JavaClass {
(...args: unknown[]): any;
new (...args: unknown[]): any;
[key: string]: any;
}

/* eslint-disable @typescript-eslint/no-empty-object-type */
/* oxlint-disable typescript/no-empty-object-type */
export interface LaraI extends JavaClass {}
export interface LaraApiTools extends JavaClass {}
export interface LaraSystemTools extends JavaClass {
Expand Down Expand Up @@ -71,7 +71,7 @@ export namespace JavaClasses {
}
export interface ProgressCounter extends JavaClasses.JavaClass {}
export interface LineStream extends JavaClasses.JavaClass {}
/* eslint-enable @typescript-eslint/no-empty-object-type */
/* oxlint-enable typescript/no-empty-object-type */
}

export default class JavaTypes {
Expand Down
6 changes: 4 additions & 2 deletions Lara-JS/api/lara/util/PrintOnce.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
import PrintOnce from "./PrintOnce.ts"

describe("PrintOnce", () => {
afterEach(() => {
PrintOnce.messagesSet.clear();
});

describe("message", () => {
it("prints the string it receives ignoring duplicates", () => {
const originalConsoleLog = console.log;
Expand All @@ -20,5 +24,3 @@ describe("PrintOnce", () => {
});
});
});


12 changes: 6 additions & 6 deletions Lara-JS/code/ChildProcessHandling.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { jest } from "@jest/globals";
import { vi } from "vitest";
import {
addActiveChildProcess,
handleExit,
Expand Down Expand Up @@ -36,16 +36,16 @@ describe("ChildProcessHandling", () => {
getActiveChildProcesses()[childProcess1.pid] = childProcess1;
getActiveChildProcesses()[childProcess2.pid] = childProcess2;

const childProcessKillSpy1 = jest
const childProcessKillSpy1 = vi
.spyOn(childProcess1, "kill")
.mockClear();
const childProcessOnceSpy1 = jest
const childProcessOnceSpy1 = vi
.spyOn(childProcess1, "once")
.mockClear();
const childProcessKillSpy2 = jest
const childProcessKillSpy2 = vi
.spyOn(childProcess2, "kill")
.mockClear();
const childProcessOnceSpy2 = jest
const childProcessOnceSpy2 = vi
.spyOn(childProcess2, "once")
.mockClear();

Expand All @@ -56,7 +56,7 @@ describe("ChildProcessHandling", () => {
expect(childProcessKillSpy2).toHaveBeenCalledTimes(1);
expect(childProcessOnceSpy2).toHaveBeenCalledTimes(1);

jest.restoreAllMocks();
vi.restoreAllMocks();
});
});
});
2 changes: 1 addition & 1 deletion Lara-JS/code/JavaError.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export default interface JavaError {
};
}

// eslint-disable-next-line @typescript-eslint/no-explicit-any
// oxlint-disable-next-line typescript/no-explicit-any
export function isJavaError(obj: any): obj is JavaError {
return obj.cause != undefined;
}
10 changes: 5 additions & 5 deletions Lara-JS/code/Weaver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ java.asyncOptions = {

export class Weaver {
private static debug: Debug.Debugger;
// eslint-disable-next-line @typescript-eslint/no-explicit-any
// oxlint-disable-next-line typescript/no-explicit-any
private static datastore: any;
// eslint-disable-next-line @typescript-eslint/no-explicit-any
// oxlint-disable-next-line typescript/no-explicit-any
private static javaWeaver: any;

static getDatastore(): any {
Expand Down Expand Up @@ -77,8 +77,8 @@ export class Weaver {
const JavaSpecsSystem = java.import("pt.up.fe.specs.util.SpecsSystem");
JavaSpecsSystem.programStandardInit();

/* eslint-disable */
// This code is intentionally ignored by eslint
/* oxlint-disable */
// This code is intentionally ignored by the linter
const JavaArrayList = java.import("java.util.ArrayList");
const JavaFile = java.import("java.io.File");
const JavaFileList = java.import(
Expand Down Expand Up @@ -155,7 +155,7 @@ export class Weaver {
for (const file of config.importForSideEffects ?? []) {
await import(file);
}
/* eslint-enable */
/* oxlint-enable */
}

static start() {
Expand Down
9 changes: 0 additions & 9 deletions Lara-JS/code/jest.config.ts

This file was deleted.

52 changes: 0 additions & 52 deletions Lara-JS/eslint.config.ts

This file was deleted.

18 changes: 0 additions & 18 deletions Lara-JS/jest.config.ts

This file was deleted.

Loading
Loading