Merge branch 'master' into dependabot/npm_and_yarn/types/node-20.3.3

Author: lhstrh

__tests__/Adder.test.ts

@@ -29,7 +29,7 @@ class MyAdder extends Adder {
     }
   }
 
-  public getProxy(port: IOPort<unknown>) {
+  public getProxy<T>(port: IOPort<T>) {
     return this.writable(port);
   }
 }

__tests__/HierarchicalSingleEvent.test.ts

@@ -12,7 +12,7 @@ import {Logger} from "../src/share/Logger";
 
 class SEContainer extends Reactor {
   // Made these public to accommodate the test below.
-  public o: OutPort<any> = new OutPort<any>(this);
+  public o: OutPort<string> = new OutPort(this);
 
   public child = new SingleEvent<string>(this, new Parameter("Foo"));
 
@@ -24,7 +24,7 @@ class SEContainer extends Reactor {
 
 class LogContainer extends Reactor {
   // Made these public to accommodate the test below.
-  public i: InPort<any> = new InPort<any>(this);
+  public i: InPort<string> = new InPort(this);
 
   public child: Logger = new Logger(this, "Foo");
 

__tests__/SingleEvent.test.ts

@@ -3,7 +3,7 @@ import {SingleEvent} from "../src/share/SingleEvent";
 import {Logger} from "../src/share/Logger";
 
 class SETest extends App {
-  singleEvent: SingleEvent<any>;
+  singleEvent: SingleEvent<string>;
 
   logger: Logger;
 

__tests__/dependencies.ts

@@ -1,12 +1,11 @@
-import {Priority, Sortable, ReactionGraph} from "../src/core/internal";
+import {Priority, Sortable, ReactionGraph, dontIndent} from "../src/core/internal";
 import {
   Reactor,
   App,
   InPort,
   SortablePrecedenceGraph,
   PrioritySet,
   Log,
-  StringUtil
 } from "../src/core/internal";
 
 // Log.setGlobalLevel(Log.levels.DEBUG);
@@ -94,7 +93,7 @@ describe("Manually constructed precedence graphs", () => {
     expect(graph.size()[0]).toEqual(6); // V
     expect(graph.size()[1]).toEqual(7); // E
     expect(graph.toString()).toBe(
-      StringUtil.dontIndent`graph
+      dontIndent`graph
         0["app.R[R3]"]
         1["app.R[R5]"]
         2["app.R[R4]"]
@@ -126,7 +125,7 @@ describe("Manually constructed precedence graphs", () => {
     expect(graph.size()[0]).toEqual(6); // V
     expect(graph.size()[1]).toEqual(6); // E
     expect(graph.toString()).toBe(
-      StringUtil.dontIndent`graph
+      dontIndent`graph
       0["app.R[R3]"]
       1["app.R[R5]"]
       2["app.R[R4]"]
@@ -148,7 +147,7 @@ describe("Manually constructed precedence graphs", () => {
     expect(graph.size()[1]).toEqual(3); // E
     Log.global.debug(graph.toString());
     expect(graph.toString()).toBe(
-      StringUtil.dontIndent`graph
+      dontIndent`graph
         0["app.R[R3]"]
         1["app.R[R5]"]
         2["app.R[R4]"]
@@ -168,7 +167,7 @@ describe("Manually constructed precedence graphs", () => {
     expect(graph.size()[1]).toEqual(4); // E
     Log.global.debug(graph.toString());
     expect(graph.toString()).toBe(
-      StringUtil.dontIndent`graph
+      dontIndent`graph
         0["app.R[R3]"]
         1["app.R[R5]"]
         2["app.R[R4]"]

__tests__/graph.test.ts

@@ -1,7 +1,7 @@
 import {PrioritySet, PrioritySetElement} from "../src/core/queue";
 import type {Sortable} from "../src/core/types";
 import {PrecedenceGraph, SortablePrecedenceGraph} from "../src/core/graph";
-import {StringUtil} from "../src/core/strings";
+
 /**
  * The tests below test the functionality of the hasCycle() utility function on various
  * dependency graphs, in combination with various graph manipulation utilities

__tests__/simple.ts

@@ -1,4 +1,4 @@
-import {Reactor, App, InPort, OutPort, StringUtil} from "../src/core/internal";
+import {Reactor, App, InPort, OutPort, dontIndent} from "../src/core/internal";
 
 class MyActor extends Reactor {
   a = new InPort<{t: number}>(this);
@@ -18,7 +18,7 @@ class MyActor2 extends Reactor {
 
 describe("Test names for contained reactors", () => {
   class myApp extends App {
-    port: InPort<any> = new InPort<any>(this);
+    port: InPort<unknown> = new InPort(this);
 
     x = new MyActor(this);
 
@@ -68,7 +68,7 @@ describe("Test names for contained reactors", () => {
 
       it("graph before connect", () => {
         expect(this._getPrecedenceGraph().toString()).toBe(
-          StringUtil.dontIndent`graph
+          dontIndent`graph
           0["myApp.x[M0]"]
           1["myApp[M0]"]
           2["myApp.y[M0]"]
@@ -91,7 +91,7 @@ describe("Test names for contained reactors", () => {
 
       it("graph after connect and before disconnect", () => {
         expect(this._getPrecedenceGraph().toString()).toBe(
-          StringUtil.dontIndent`graph
+          dontIndent`graph
             0["myApp.x.a"]
             1["myApp.y.b"]
             2["myApp.x[M0]"]
@@ -106,7 +106,7 @@ describe("Test names for contained reactors", () => {
       it("graph after disconnect", () => {
         this._disconnect(this.y.b, this.x.a);
         expect(this._getPrecedenceGraph().toString()).toBe(
-          StringUtil.dontIndent`graph
+          dontIndent`graph
             0["myApp.x.a"]
             1["myApp.y.b"]
             2["myApp.x[M0]"]

lingua-franca-ref.txt

@@ -1 +1,2 @@
-master
+ts-never
+