Merge of #4231

apps/wing-console/console/server/src/expressServer.ts

@@ -1,6 +1,6 @@
 import * as trpcExpress from "@trpc/server/adapters/express";
 import { applyWSSHandler } from "@trpc/server/adapters/ws";
-import { testing } from "@winglang/sdk";
+import { simulator } from "@winglang/sdk";
 import cors from "cors";
 import type Emittery from "emittery";
 import express from "express";
@@ -22,7 +22,7 @@ import { getWingVersion } from "./utils/getWingVersion.js";
 import type { LogInterface } from "./utils/LogInterface.js";
 
 export interface CreateExpressServerOptions {
-  simulatorInstance(): Promise<testing.Simulator>;
+  simulatorInstance(): Promise<simulator.Simulator>;
   consoleLogger: ConsoleLogger;
   errorMessage(): string | undefined;
   emitter: Emittery<{

apps/wing-console/console/server/src/utils/createRouter.ts

@@ -1,5 +1,5 @@
 import { initTRPC } from "@trpc/server";
-import { testing } from "@winglang/sdk";
+import { simulator } from "@winglang/sdk";
 import type Emittery from "emittery";
 
 import { Config } from "../config.js";
@@ -75,7 +75,7 @@ export interface FileLink {
 }
 
 export interface RouterContext {
-  simulator(): Promise<testing.Simulator>;
+  simulator(): Promise<simulator.Simulator>;
   appDetails(): Promise<{
     wingVersion: string | undefined;
   }>;

apps/wing-console/console/server/src/utils/simulator.ts

@@ -1,20 +1,20 @@
-import { testing } from "@winglang/sdk";
+import { simulator } from "@winglang/sdk";
 import Emittery from "emittery";
 
 import type { Trace } from "../types.js";
 
 import { formatWingError } from "./format-wing-error.js";
 
 export interface SimulatorEvents {
-  starting: { instance: testing.Simulator };
+  starting: { instance: simulator.Simulator };
   started: undefined;
   error: Error;
   stopping: undefined;
   trace: Trace;
 }
 
 export interface Simulator {
-  instance(): Promise<testing.Simulator>;
+  instance(): Promise<simulator.Simulator>;
   start(simfile: string): Promise<void>;
   stop(): Promise<void>;
   on<T extends keyof SimulatorEvents>(
@@ -23,7 +23,7 @@ export interface Simulator {
   ): void;
 }
 
-const stopSilently = async (simulator: testing.Simulator) => {
+const stopSilently = async (simulator: simulator.Simulator) => {
   try {
     await simulator.stop();
   } catch (error) {
@@ -40,15 +40,15 @@ const stopSilently = async (simulator: testing.Simulator) => {
 
 export const createSimulator = (): Simulator => {
   const events = new Emittery<SimulatorEvents>();
-  let instance: testing.Simulator | undefined;
+  let instance: simulator.Simulator | undefined;
   const start = async (simfile: string) => {
     try {
       if (instance) {
         await events.emit("stopping");
         await stopSilently(instance);
       }
 
-      instance = new testing.Simulator({ simfile });
+      instance = new simulator.Simulator({ simfile });
       instance.onTrace({
         callback(trace) {
           events.emit("trace", trace);

apps/wing-console/console/server/src/wingsdk.ts

@@ -2,7 +2,7 @@ export {
   Simulator,
   type WingSimulatorSchema,
   type BaseResourceSchema,
-} from "@winglang/sdk/lib/testing/index.js";
+} from "@winglang/sdk/lib/simulator/index.js";
 
 export { Json } from "@winglang/sdk/lib/std/json.js";
 

apps/wing/src/commands/test.ts

@@ -1,7 +1,7 @@
 import { basename, resolve, sep } from "path";
 import { compile, CompileOptions } from "./compile";
 import chalk from "chalk";
-import { std, testing } from "@winglang/sdk";
+import { std, simulator } from "@winglang/sdk";
 import * as cp from "child_process";
 import debug from "debug";
 import { promisify } from "util";
@@ -247,7 +247,7 @@ function noCleanUp(synthDir: string) {
 }
 
 async function testSimulator(synthDir: string, options: TestOptions) {
-  const s = new testing.Simulator({ simfile: synthDir });
+  const s = new simulator.Simulator({ simfile: synthDir });
   const { clean } = options;
   await s.start();
 

libs/wingsdk/src/index.ts

@@ -6,6 +6,6 @@ export * as http from "./http";
 export * as math from "./math";
 export * as regex from "./regex";
 export * as aws from "./shared-aws";
+export * as simulator from "./simulator";
 export * as std from "./std";
-export * as testing from "./testing";
 export * as util from "./util";

libs/wingsdk/src/target-sim/api.inflight.ts

@@ -17,11 +17,11 @@ import {
   parseHttpMethod,
   sanitizeParamLikeObject,
 } from "../cloud";
-import { TraceType } from "../std";
 import {
   ISimulatorContext,
   ISimulatorResourceInstance,
-} from "../testing/simulator";
+} from "../simulator/simulator";
+import { TraceType } from "../std";
 
 const LOCALHOST_ADDRESS = "127.0.0.1";
 

libs/wingsdk/src/target-sim/api.ts

@@ -6,8 +6,8 @@ import { ApiSchema, API_TYPE, ApiRoute } from "./schema-resources";
 import { simulatorAttrToken } from "./tokens";
 import { bindSimulatorResource, makeSimulatorJsClient } from "./util";
 import * as cloud from "../cloud";
+import { BaseResourceSchema } from "../simulator/simulator";
 import { IInflightHost, Node, SDK_SOURCE_MODULE } from "../std";
-import { BaseResourceSchema } from "../testing/simulator";
 
 /**
  * Simulator implementation of `cloud.Api`.

libs/wingsdk/src/target-sim/app.ts

@@ -35,8 +35,8 @@ import { SDK_VERSION } from "../constants";
 import * as core from "../core";
 import { preSynthesizeAllConstructs } from "../core/app";
 import { TABLE_FQN, REDIS_FQN, DYNAMODB_TABLE_FQN } from "../ex";
+import { WingSimulatorSchema } from "../simulator/simulator";
 import { TEST_RUNNER_FQN } from "../std";
-import { WingSimulatorSchema } from "../testing/simulator";
 
 /**
  * Path of the simulator configuration file in every .wsim tarball.

libs/wingsdk/src/target-sim/bucket.inflight.ts

@@ -10,11 +10,11 @@ import {
   IBucketClient,
   ITopicClient,
 } from "../cloud";
-import { Json } from "../std";
 import {
   ISimulatorContext,
   ISimulatorResourceInstance,
-} from "../testing/simulator";
+} from "../simulator/simulator";
+import { Json } from "../std";
 
 export class Bucket implements IBucketClient, ISimulatorResourceInstance {
   private readonly objectKeys: Set<string>;

libs/wingsdk/src/target-sim/bucket.ts

@@ -5,8 +5,8 @@ import { BucketSchema, BUCKET_TYPE } from "./schema-resources";
 import { simulatorHandleToken } from "./tokens";
 import { bindSimulatorResource, makeSimulatorJsClient } from "./util";
 import * as cloud from "../cloud";
+import { BaseResourceSchema } from "../simulator/simulator";
 import { IInflightHost } from "../std";
-import { BaseResourceSchema } from "../testing/simulator";
 
 /**
  * Simulator implementation of `cloud.Bucket`.

libs/wingsdk/src/target-sim/counter.inflight.ts

@@ -3,7 +3,7 @@ import { ICounterClient } from "../cloud";
 import {
   ISimulatorContext,
   ISimulatorResourceInstance,
-} from "../testing/simulator";
+} from "../simulator/simulator";
 
 export class Counter implements ICounterClient, ISimulatorResourceInstance {
   private values: Map<string, number>;

libs/wingsdk/src/target-sim/counter.ts

@@ -3,8 +3,8 @@ import { ISimulatorResource } from "./resource";
 import { CounterSchema, COUNTER_TYPE } from "./schema-resources";
 import { bindSimulatorResource, makeSimulatorJsClient } from "./util";
 import * as cloud from "../cloud";
+import { BaseResourceSchema } from "../simulator/simulator";
 import { IInflightHost } from "../std";
-import { BaseResourceSchema } from "../testing/simulator";
 
 /**
  * Simulator implementation of `cloud.Counter`.

libs/wingsdk/src/target-sim/dynamodb-table.inflight.ts

@@ -9,7 +9,7 @@ import { runCommand, runDockerImage } from "../shared/misc";
 import {
   ISimulatorContext,
   ISimulatorResourceInstance,
-} from "../testing/simulator";
+} from "../simulator/simulator";
 
 const MAX_CREATE_TABLE_COMMAND_ATTEMPTS = 50;
 

libs/wingsdk/src/target-sim/dynamodb-table.ts

@@ -3,8 +3,8 @@ import { ISimulatorResource } from "./resource";
 import { DynamodbTableSchema, DYNAMODB_TABLE_TYPE } from "./schema-resources";
 import { bindSimulatorResource, makeSimulatorJsClient } from "./util";
 import * as ex from "../ex";
+import { BaseResourceSchema } from "../simulator/simulator";
 import { IInflightHost } from "../std";
-import { BaseResourceSchema } from "../testing/simulator";
 
 /**
  * Simulator implementation of `ex.DynamodbTable`.

libs/wingsdk/src/target-sim/event-mapping.inflight.ts

@@ -6,8 +6,8 @@ import {
   FunctionHandle,
   PublisherHandle,
 } from "./schema-resources";
-import { ISimulatorContext } from "../testing";
-import { ISimulatorResourceInstance } from "../testing/simulator";
+import { ISimulatorContext } from "../simulator";
+import { ISimulatorResourceInstance } from "../simulator/simulator";
 
 export class EventMapping implements ISimulatorResourceInstance {
   private readonly publisher: PublisherHandle;

libs/wingsdk/src/target-sim/event-mapping.ts

@@ -9,11 +9,11 @@ import {
 import { simulatorHandleToken } from "./tokens";
 import { bindSimulatorResource, makeSimulatorJsClient } from "./util";
 import { fqnForType } from "../constants";
-import { IInflightHost, IResource, Node, Resource } from "../std";
 import {
   BaseResourceSchema,
   ISimulatorResourceInstance,
-} from "../testing/simulator";
+} from "../simulator/simulator";
+import { IInflightHost, IResource, Node, Resource } from "../std";
 
 /**
  * Interface shared by all event publishing simulator resources.

libs/wingsdk/src/target-sim/factory.inflight.ts

@@ -21,7 +21,7 @@ import type {
   ISimulatorFactory,
   ISimulatorContext,
   ISimulatorResourceInstance,
-} from "../testing/simulator";
+} from "../simulator/simulator";
 
 export class DefaultSimulatorFactory implements ISimulatorFactory {
   /**

libs/wingsdk/src/target-sim/function.inflight.ts

@@ -10,11 +10,11 @@ import {
 } from "./schema-resources";
 import { IFunctionClient } from "../cloud";
 import { Bundle, createBundle } from "../shared/bundling";
-import { TraceType } from "../std";
 import {
   ISimulatorContext,
   ISimulatorResourceInstance,
-} from "../testing/simulator";
+} from "../simulator/simulator";
+import { TraceType } from "../std";
 
 export class Function implements IFunctionClient, ISimulatorResourceInstance {
   private readonly filename: string;

libs/wingsdk/src/target-sim/function.ts

@@ -5,9 +5,9 @@ import { FunctionSchema, FUNCTION_TYPE } from "./schema-resources";
 import { bindSimulatorResource, makeSimulatorJsClient } from "./util";
 import * as cloud from "../cloud";
 import { App } from "../core";
+import { BaseResourceSchema } from "../simulator/simulator";
 import { IInflightHost } from "../std";
 import { Duration } from "../std/duration";
-import { BaseResourceSchema } from "../testing/simulator";
 
 export const ENV_WING_SIM_INFLIGHT_RESOURCE_PATH =
   "WING_SIM_INFLIGHT_RESOURCE_PATH";

libs/wingsdk/src/target-sim/on-deploy.inflight.ts

@@ -3,7 +3,7 @@ import { IFunctionClient, IOnDeployClient } from "../cloud";
 import {
   ISimulatorContext,
   ISimulatorResourceInstance,
-} from "../testing/simulator";
+} from "../simulator/simulator";
 
 export class OnDeploy implements IOnDeployClient, ISimulatorResourceInstance {
   private functionHandle: string;

libs/wingsdk/src/target-sim/on-deploy.ts

@@ -3,8 +3,8 @@ import { ON_DEPLOY_TYPE, OnDeploySchema } from "./schema-resources";
 import { simulatorHandleToken } from "./tokens";
 import { bindSimulatorResource, makeSimulatorJsClient } from "./util";
 import * as cloud from "../cloud";
+import { BaseResourceSchema } from "../simulator";
 import { IInflightHost, Node, SDK_SOURCE_MODULE } from "../std";
-import { BaseResourceSchema } from "../testing";
 
 export class OnDeploy extends cloud.OnDeploy {
   private readonly fn: cloud.Function;

libs/wingsdk/src/target-sim/queue.inflight.ts

@@ -8,11 +8,11 @@ import {
   FunctionHandle,
 } from "./schema-resources";
 import { IFunctionClient, IQueueClient } from "../cloud";
-import { TraceType } from "../std";
 import {
   ISimulatorContext,
   ISimulatorResourceInstance,
-} from "../testing/simulator";
+} from "../simulator/simulator";
+import { TraceType } from "../std";
 
 export class Queue
   implements IQueueClient, ISimulatorResourceInstance, IEventPublisher

libs/wingsdk/src/target-sim/queue.ts

@@ -7,8 +7,8 @@ import { QueueSchema, QUEUE_TYPE } from "./schema-resources";
 import { bindSimulatorResource, makeSimulatorJsClient } from "./util";
 import * as cloud from "../cloud";
 import { convertBetweenHandlers } from "../shared/convert";
+import { BaseResourceSchema } from "../simulator/simulator";
 import { Duration, IInflightHost, Node, SDK_SOURCE_MODULE } from "../std";
-import { BaseResourceSchema } from "../testing/simulator";
 
 /**
  * Simulator implementation of `cloud.Queue`.

libs/wingsdk/src/target-sim/redis.inflight.ts

@@ -6,7 +6,7 @@ import { runCommand, runDockerImage } from "../shared/misc";
 import {
   ISimulatorContext,
   ISimulatorResourceInstance,
-} from "../testing/simulator";
+} from "../simulator/simulator";
 
 export class Redis
   extends RedisClientBase

libs/wingsdk/src/target-sim/redis.ts

@@ -3,8 +3,8 @@ import { ISimulatorResource } from "./resource";
 import { RedisSchema, REDIS_TYPE } from "./schema-resources";
 import { bindSimulatorResource, makeSimulatorJsClient } from "./util";
 import * as ex from "../ex";
+import { BaseResourceSchema } from "../simulator/simulator";
 import { IInflightHost } from "../std";
-import { BaseResourceSchema } from "../testing/simulator";
 
 /**
  * Simulator implementation of `redis.Redis`.

libs/wingsdk/src/target-sim/resource.ts

@@ -1,5 +1,5 @@
+import { BaseResourceSchema } from "../simulator/simulator";
 import { IResource } from "../std";
-import { BaseResourceSchema } from "../testing/simulator";
 
 /**
  * Interfaces shared by all polycon implementations (preflight classes)

libs/wingsdk/src/target-sim/schedule.inflight.ts

@@ -8,8 +8,8 @@ import {
   ScheduleTask,
 } from "./schema-resources";
 import { IFunctionClient, IScheduleClient } from "../cloud";
+import { ISimulatorContext, ISimulatorResourceInstance } from "../simulator";
 import { TraceType } from "../std";
-import { ISimulatorContext, ISimulatorResourceInstance } from "../testing";
 
 export class Schedule
   implements IScheduleClient, ISimulatorResourceInstance, IEventPublisher

libs/wingsdk/src/target-sim/schedule.ts

@@ -11,8 +11,8 @@ import {
 } from "./util";
 import * as cloud from "../cloud";
 import { convertBetweenHandlers } from "../shared/convert";
+import { BaseResourceSchema } from "../simulator";
 import { IInflightHost, Node, SDK_SOURCE_MODULE } from "../std";
-import { BaseResourceSchema } from "../testing";
 
 /**
  * Simulator implementation of `cloud.Schedule`.

libs/wingsdk/src/target-sim/schema-resources.ts

@@ -1,10 +1,10 @@
 import { CorsHeaders, HttpMethod, OpenApiSpec } from "../cloud";
 import { ColumnType } from "../ex";
-import { Json } from "../std";
 import {
   BaseResourceAttributes,
   BaseResourceSchema,
-} from "../testing/simulator";
+} from "../simulator/simulator";
+import { Json } from "../std";
 
 export const API_TYPE = "wingsdk.cloud.Api";
 export const QUEUE_TYPE = "wingsdk.cloud.Queue";

libs/wingsdk/src/target-sim/secret.inflight.ts

@@ -7,11 +7,11 @@ import {
   SecretSchema,
 } from "./schema-resources";
 import { ISecretClient } from "../cloud";
-import { Json, TraceType } from "../std";
 import {
   ISimulatorContext,
   ISimulatorResourceInstance,
-} from "../testing/simulator";
+} from "../simulator/simulator";
+import { Json, TraceType } from "../std";
 
 export class Secret implements ISecretClient, ISimulatorResourceInstance {
   private readonly context: ISimulatorContext;

libs/wingsdk/src/target-sim/secret.ts

@@ -4,8 +4,8 @@ import { SECRET_TYPE, SecretSchema } from "./schema-resources";
 import { bindSimulatorResource, makeSimulatorJsClient } from "./util";
 import * as cloud from "../cloud";
 import { ResourceNames } from "../shared/resource-names";
+import { BaseResourceSchema } from "../simulator/simulator";
 import { IInflightHost } from "../std";
-import { BaseResourceSchema } from "../testing/simulator";
 
 /**
  * Simulator implementation of `cloud.Secret`